diff options
| author | Graham Christensen <graham@grahamc.com> | 2017-01-18 08:54:08 -0500 |
|---|---|---|
| committer | Robin Gloster <mail@glob.in> | 2017-01-23 00:08:21 +0100 |
| commit | 13d6681ce72ac265f03013247f60ab3d001779e0 (patch) | |
| tree | e1002be12994b014bb393b4a47f3d62c8fb2d638 /pkgs/top-level/release.nix | |
| parent | 121b8d23af62cc0decf89eed52a467b8373f6c7b (diff) | |
release.nix: Only build Only build bootstrap tools when their system is supported
Diffstat (limited to 'pkgs/top-level/release.nix')
| -rw-r--r-- | pkgs/top-level/release.nix | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/pkgs/top-level/release.nix b/pkgs/top-level/release.nix index 2052957edd61..c301ceb1530d 100644 --- a/pkgs/top-level/release.nix +++ b/pkgs/top-level/release.nix @@ -67,13 +67,13 @@ let jobs.vim.x86_64-darwin ] ++ lib.collect lib.isDerivation jobs.stdenvBootstrapTools; }; - + } // (lib.optionalAttrs (builtins.elem "i686-linux" supportedSystems) { stdenvBootstrapTools.i686-linux = { inherit (import ../stdenv/linux/make-bootstrap-tools.nix { system = "i686-linux"; }) dist test; }; - + }) // (lib.optionalAttrs (builtins.elem "x86_64-linux" supportedSystems) { stdenvBootstrapTools.x86_64-linux = { inherit (import ../stdenv/linux/make-bootstrap-tools.nix { system = "x86_64-linux"; }) dist test; }; - + }) // (lib.optionalAttrs (builtins.elem "x86_64-darwin" supportedSystems) { stdenvBootstrapTools.x86_64-darwin = let bootstrap = import ../stdenv/darwin/make-bootstrap-tools.nix { system = "x86_64-darwin"; }; @@ -83,8 +83,7 @@ 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; |