dotnet: use fallback target packages from current binary sdk
This was using the bootstrap SDK, which doesn't match the version of the source-built SDK. This will still be a problem if the binary and source-built SDKs don't have the same version.
This commit is contained in:
@@ -5,4 +5,5 @@
|
||||
releaseInfoFile = ./release-info.json;
|
||||
bootstrapSdkFile = ./bootstrap-sdk.nix;
|
||||
depsFile = ./deps.nix;
|
||||
fallbackTargetPackages = dotnetCorePackages.sdk_8_0.targetPackages;
|
||||
}
|
||||
|
||||
@@ -6,4 +6,5 @@
|
||||
bootstrapSdkFile = ./bootstrap-sdk.nix;
|
||||
allowPrerelease = true;
|
||||
depsFile = ./deps.nix;
|
||||
fallbackTargetPackages = dotnetCorePackages.sdk_9_0.targetPackages;
|
||||
}
|
||||
|
||||
@@ -8,6 +8,7 @@
|
||||
bootstrapSdkFile,
|
||||
allowPrerelease ? false,
|
||||
depsFile,
|
||||
fallbackTargetPackages,
|
||||
pkgsBuildHost,
|
||||
buildDotnetSdk,
|
||||
}:
|
||||
@@ -25,6 +26,7 @@ let
|
||||
releaseManifestFile
|
||||
tarballHash
|
||||
depsFile
|
||||
fallbackTargetPackages
|
||||
;
|
||||
bootstrapSdk = (buildDotnetSdk bootstrapSdkFile).sdk.unwrapped.overrideAttrs (old: {
|
||||
passthru = old.passthru or { } // {
|
||||
|
||||
@@ -17,6 +17,7 @@
|
||||
releaseManifestFile,
|
||||
tarballHash,
|
||||
depsFile,
|
||||
fallbackTargetPackages,
|
||||
bootstrapSdk,
|
||||
}:
|
||||
|
||||
|
||||
@@ -7,6 +7,7 @@
|
||||
tarballHash,
|
||||
depsFile,
|
||||
bootstrapSdk,
|
||||
fallbackTargetPackages,
|
||||
}@args:
|
||||
|
||||
let
|
||||
@@ -33,8 +34,7 @@ let
|
||||
|
||||
in
|
||||
mkPackages {
|
||||
inherit vmr;
|
||||
fallbackTargetPackages = bootstrapSdk.targetPackages;
|
||||
inherit vmr fallbackTargetPackages;
|
||||
}
|
||||
// {
|
||||
stage0 = lib.dontRecurseIntoAttrs stage0;
|
||||
|
||||
Reference in New Issue
Block a user