dotnet: add suffix to stage0 package names
This commit is contained in:
parent
031e1d90b7
commit
8bf19672de
@ -7,6 +7,7 @@
|
|||||||
strip-nondeterminism,
|
strip-nondeterminism,
|
||||||
zip,
|
zip,
|
||||||
nugetPackageHook,
|
nugetPackageHook,
|
||||||
|
baseName ? "dotnet",
|
||||||
fallbackTargetPackages ? { },
|
fallbackTargetPackages ? { },
|
||||||
}:
|
}:
|
||||||
|
|
||||||
@ -93,7 +94,7 @@ let
|
|||||||
};
|
};
|
||||||
|
|
||||||
sdk = mkCommon "sdk" rec {
|
sdk = mkCommon "sdk" rec {
|
||||||
pname = "dotnet-sdk";
|
pname = "${baseName}-sdk";
|
||||||
version = releaseManifest.sdkVersion;
|
version = releaseManifest.sdkVersion;
|
||||||
|
|
||||||
src = vmr;
|
src = vmr;
|
||||||
@ -147,7 +148,7 @@ let
|
|||||||
};
|
};
|
||||||
|
|
||||||
runtime = mkCommon "runtime" rec {
|
runtime = mkCommon "runtime" rec {
|
||||||
pname = "dotnet-runtime";
|
pname = "${baseName}-runtime";
|
||||||
version = releaseManifest.runtimeVersion;
|
version = releaseManifest.runtimeVersion;
|
||||||
|
|
||||||
src = vmr;
|
src = vmr;
|
||||||
@ -172,7 +173,7 @@ let
|
|||||||
};
|
};
|
||||||
|
|
||||||
aspnetcore = mkCommon "aspnetcore" rec {
|
aspnetcore = mkCommon "aspnetcore" rec {
|
||||||
pname = "dotnet-aspnetcore-runtime";
|
pname = "${baseName}-aspnetcore-runtime";
|
||||||
version = releaseManifest.aspNetCoreVersion or releaseManifest.runtimeVersion;
|
version = releaseManifest.aspNetCoreVersion or releaseManifest.runtimeVersion;
|
||||||
|
|
||||||
src = vmr;
|
src = vmr;
|
||||||
|
@ -12,6 +12,7 @@
|
|||||||
patchNupkgs,
|
patchNupkgs,
|
||||||
symlinkJoin,
|
symlinkJoin,
|
||||||
|
|
||||||
|
baseName ? "dotnet",
|
||||||
releaseManifestFile,
|
releaseManifestFile,
|
||||||
tarballHash,
|
tarballHash,
|
||||||
depsFile,
|
depsFile,
|
||||||
@ -34,7 +35,12 @@ let
|
|||||||
|
|
||||||
vmr =
|
vmr =
|
||||||
(mkVMR {
|
(mkVMR {
|
||||||
inherit releaseManifestFile tarballHash bootstrapSdk;
|
inherit
|
||||||
|
baseName
|
||||||
|
releaseManifestFile
|
||||||
|
tarballHash
|
||||||
|
bootstrapSdk
|
||||||
|
;
|
||||||
}).overrideAttrs
|
}).overrideAttrs
|
||||||
(old: rec {
|
(old: rec {
|
||||||
prebuiltPackages = mkNugetDeps {
|
prebuiltPackages = mkNugetDeps {
|
||||||
@ -138,4 +144,4 @@ let
|
|||||||
};
|
};
|
||||||
});
|
});
|
||||||
in
|
in
|
||||||
mkPackages { inherit vmr; }
|
mkPackages { inherit baseName vmr; }
|
||||||
|
@ -13,7 +13,12 @@ let
|
|||||||
mkPackages = callPackage ./packages.nix;
|
mkPackages = callPackage ./packages.nix;
|
||||||
mkVMR = callPackage ./vmr.nix;
|
mkVMR = callPackage ./vmr.nix;
|
||||||
|
|
||||||
stage0 = callPackage ./stage0.nix args;
|
stage0 = callPackage ./stage0.nix (
|
||||||
|
args
|
||||||
|
// {
|
||||||
|
baseName = "dotnet-stage0";
|
||||||
|
}
|
||||||
|
);
|
||||||
|
|
||||||
vmr =
|
vmr =
|
||||||
(mkVMR {
|
(mkVMR {
|
||||||
|
@ -28,6 +28,7 @@
|
|||||||
unzip,
|
unzip,
|
||||||
yq,
|
yq,
|
||||||
|
|
||||||
|
baseName ? "dotnet",
|
||||||
bootstrapSdk,
|
bootstrapSdk,
|
||||||
releaseManifestFile,
|
releaseManifestFile,
|
||||||
tarballHash,
|
tarballHash,
|
||||||
@ -63,7 +64,7 @@ let
|
|||||||
|
|
||||||
in
|
in
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "dotnet-vmr";
|
pname = "${baseName}-vmr";
|
||||||
version = release;
|
version = release;
|
||||||
|
|
||||||
# TODO: fix this in the binary sdk packages
|
# TODO: fix this in the binary sdk packages
|
||||||
|
Loading…
Reference in New Issue
Block a user