Merge #154506: release.nix: fix eval with aarch64-
... in case when no x86_64-darwin is supported
This commit is contained in:
commit
9822f31f0b
1 changed files with 8 additions and 5 deletions
|
@ -25,7 +25,10 @@ let
|
|||
|
||||
systemsWithAnySupport = supportedSystems ++ limitedSupportedSystems;
|
||||
|
||||
supportDarwin = builtins.elem "x86_64-darwin" systemsWithAnySupport;
|
||||
supportDarwin = lib.genAttrs [
|
||||
"x86_64"
|
||||
"aarch64"
|
||||
] (arch: builtins.elem "${arch}-darwin" systemsWithAnySupport);
|
||||
|
||||
jobs =
|
||||
{ tarball = import ./make-tarball.nix { inherit pkgs nixpkgs officialRelease supportedSystems; };
|
||||
|
@ -36,7 +39,7 @@ let
|
|||
lib-tests = import ../../lib/tests/release.nix { inherit pkgs; };
|
||||
pkgs-lib-tests = import ../pkgs-lib/tests { inherit pkgs; };
|
||||
|
||||
darwin-tested = if supportDarwin then pkgs.releaseTools.aggregate
|
||||
darwin-tested = if supportDarwin.x86_64 then pkgs.releaseTools.aggregate
|
||||
{ name = "nixpkgs-darwin-${jobs.tarball.version}";
|
||||
meta.description = "Release-critical builds for the Nixpkgs darwin channel";
|
||||
constituents =
|
||||
|
@ -130,7 +133,7 @@ let
|
|||
*/
|
||||
]
|
||||
++ lib.collect lib.isDerivation jobs.stdenvBootstrapTools
|
||||
++ lib.optionals supportDarwin [
|
||||
++ lib.optionals supportDarwin.x86_64 [
|
||||
jobs.stdenv.x86_64-darwin
|
||||
jobs.cargo.x86_64-darwin
|
||||
jobs.go.x86_64-darwin
|
||||
|
@ -171,7 +174,7 @@ let
|
|||
dist test;
|
||||
})
|
||||
# darwin is special in this
|
||||
// optionalAttrs supportDarwin {
|
||||
// optionalAttrs supportDarwin.x86_64 {
|
||||
x86_64-darwin =
|
||||
let
|
||||
bootstrap = import ../stdenv/darwin/make-bootstrap-tools.nix { system = "x86_64-darwin"; };
|
||||
|
@ -181,7 +184,7 @@ let
|
|||
# Test a full stdenv bootstrap from the bootstrap tools definition
|
||||
inherit (bootstrap.test-pkgs) stdenv;
|
||||
};
|
||||
|
||||
} // optionalAttrs supportDarwin.aarch64 {
|
||||
# Cross compiled bootstrap tools
|
||||
aarch64-darwin =
|
||||
let
|
||||
|
|
Loading…
Reference in a new issue