public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

release.nix: resurrect stdenvBootstrapTools

Browse Source 
13d6681ce7 crippled it unintentionally.
Also remove the incorrect/non-existing stdenv.i686-linux;
building the bootstrap tools should be a good-enough test anyway.
This commit is contained in:
Vladimír Čunát 2017-08-06 12:35:34 +02:00
parent 145be4e340
commit 332a60cbd1
No known key found for this signature in database
GPG Key ID: E747DF1F9575A3AA
1 changed files with 21 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
pkgs/top-level/release.nix
View File

@ -58,7 +58,6 @@ let
jobs.manual jobs.manual
jobs.lib-tests jobs.lib-tests
jobs.stdenv.x86_64-linux jobs.stdenv.x86_64-linux
jobs.stdenv.i686-linux # most basic sanity check
jobs.stdenv.x86_64-darwin jobs.stdenv.x86_64-darwin
jobs.linux.x86_64-linux jobs.linux.x86_64-linux
jobs.python.x86_64-linux jobs.python.x86_64-linux
@ -79,17 +78,16 @@ let
jobs.vim.x86_64-darwin jobs.vim.x86_64-darwin
] ++ lib.collect lib.isDerivation jobs.stdenvBootstrapTools; ] ++ lib.collect lib.isDerivation jobs.stdenvBootstrapTools;
}; };
} // (lib.optionalAttrs (builtins.elem "i686-linux" systemsWithAnySupport) {
stdenvBootstrapTools.i686-linux = stdenvBootstrapTools = with lib;
{ inherit (import ../stdenv/linux/make-bootstrap-tools.nix { system = "i686-linux"; }) dist test; }; genAttrs systemsWithAnySupport
}) // (lib.optionalAttrs (builtins.elem "x86_64-linux" systemsWithAnySupport) { (system: {
stdenvBootstrapTools.x86_64-linux = inherit (import ../stdenv/linux/make-bootstrap-tools.nix { inherit system; })
{ inherit (import ../stdenv/linux/make-bootstrap-tools.nix { system = "x86_64-linux"; }) dist test; }; dist test;
}) // (lib.optionalAttrs (builtins.elem "aarch64-linux" systemsWithAnySupport) { })
stdenvBootstrapTools.aarch64-linux = # darwin is special in this
{ inherit (import ../stdenv/linux/make-bootstrap-tools.nix { system = "aarch64-linux"; }) dist test; }; // optionalAttrs (builtins.elem "x86_64-darwin" systemsWithAnySupport) {
}) // (lib.optionalAttrs (builtins.elem "x86_64-darwin" systemsWithAnySupport) { x86_64-darwin =
stdenvBootstrapTools.x86_64-darwin =
let let
bootstrap = import ../stdenv/darwin/make-bootstrap-tools.nix { system = "x86_64-darwin"; }; bootstrap = import ../stdenv/darwin/make-bootstrap-tools.nix { system = "x86_64-darwin"; };
in { in {
@ -98,7 +96,9 @@ let
# Test a full stdenv bootstrap from the bootstrap tools definition # Test a full stdenv bootstrap from the bootstrap tools definition
inherit (bootstrap.test-pkgs) stdenv; inherit (bootstrap.test-pkgs) stdenv;
}; };
}) // (mapTestOn ((packagePlatforms pkgs) // rec { };
} // (mapTestOn ((packagePlatforms pkgs) // rec {
haskell.compiler = packagePlatforms pkgs.haskell.compiler; haskell.compiler = packagePlatforms pkgs.haskell.compiler;
haskellPackages = packagePlatforms pkgs.haskellPackages; haskellPackages = packagePlatforms pkgs.haskellPackages;