JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions 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 committed by Robin Gloster
parent 2bbfac7b97
commit b679e148bd
No known key found for this signature in database
GPG Key ID: 5E4C836C632C2882
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.lib-tests
jobs.stdenv.x86_64-linux
jobs.stdenv.i686-linux # most basic sanity check
jobs.stdenv.x86_64-darwin
jobs.linux.x86_64-linux
jobs.python.x86_64-linux
@ -79,17 +78,16 @@ let
jobs.vim.x86_64-darwin
] ++ lib.collect lib.isDerivation jobs.stdenvBootstrapTools;
};
} // (lib.optionalAttrs (builtins.elem "i686-linux" systemsWithAnySupport) {
stdenvBootstrapTools.i686-linux =
{ inherit (import ../stdenv/linux/make-bootstrap-tools.nix { system = "i686-linux"; }) dist test; };
}) // (lib.optionalAttrs (builtins.elem "x86_64-linux" systemsWithAnySupport) {
stdenvBootstrapTools.x86_64-linux =
{ inherit (import ../stdenv/linux/make-bootstrap-tools.nix { system = "x86_64-linux"; }) dist test; };
}) // (lib.optionalAttrs (builtins.elem "aarch64-linux" systemsWithAnySupport) {
stdenvBootstrapTools.aarch64-linux =
{ inherit (import ../stdenv/linux/make-bootstrap-tools.nix { system = "aarch64-linux"; }) dist test; };
}) // (lib.optionalAttrs (builtins.elem "x86_64-darwin" systemsWithAnySupport) {
stdenvBootstrapTools.x86_64-darwin =
stdenvBootstrapTools = with lib;
genAttrs systemsWithAnySupport
(system: {
inherit (import ../stdenv/linux/make-bootstrap-tools.nix { inherit system; })
dist test;
})
# darwin is special in this
// optionalAttrs (builtins.elem "x86_64-darwin" systemsWithAnySupport) {
x86_64-darwin =
let
bootstrap = import ../stdenv/darwin/make-bootstrap-tools.nix { system = "x86_64-darwin"; };
in {
@ -98,7 +96,9 @@ let
# Test a full stdenv bootstrap from the bootstrap tools definition
inherit (bootstrap.test-pkgs) stdenv;
};
}) // (mapTestOn ((packagePlatforms pkgs) // rec {
};
} // (mapTestOn ((packagePlatforms pkgs) // rec {
haskell.compiler = packagePlatforms pkgs.haskell.compiler;
haskellPackages = packagePlatforms pkgs.haskellPackages;