diff options
| -rw-r--r-- | pkgs/top-level/release.nix | 42 |
1 files changed, 21 insertions, 21 deletions
diff --git a/pkgs/top-level/release.nix b/pkgs/top-level/release.nix index 90f1c92d8e0..f59b2debe86 100644 --- a/pkgs/top-level/release.nix +++ b/pkgs/top-level/release.nix @@ -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,26 +78,27 @@ 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 = - let - bootstrap = import ../stdenv/darwin/make-bootstrap-tools.nix { system = "x86_64-darwin"; }; - in { - # Lightweight distribution and test - inherit (bootstrap) dist test; - # Test a full stdenv bootstrap from the bootstrap tools definition - inherit (bootstrap.test-pkgs) stdenv; - }; - }) // (mapTestOn ((packagePlatforms pkgs) // rec { + + 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 { + # Lightweight distribution and test + inherit (bootstrap) dist test; + # Test a full stdenv bootstrap from the bootstrap tools definition + inherit (bootstrap.test-pkgs) stdenv; + }; + }; + + } // (mapTestOn ((packagePlatforms pkgs) // rec { haskell.compiler = packagePlatforms pkgs.haskell.compiler; haskellPackages = packagePlatforms pkgs.haskellPackages; |