about summary refs log tree commit diff
path: root/nixpkgs/pkgs/test/cross/default.nix
diff options
context:
space:
mode:
authorAlyssa Ross <hi@alyssa.is>2019-05-07 17:46:11 +0000
committerAlyssa Ross <hi@alyssa.is>2019-05-07 17:46:11 +0000
commit0a67dc6d2aa5f6ac3d08a12eb5e26d5fda5734ea (patch)
treead528e0ffd64d471f2bf250670c0732bff57e86b /nixpkgs/pkgs/test/cross/default.nix
parent373507e28edeacd168b5c240840db2dac854882a (diff)
parent2ec5e9595becf05b052ce4c61a05d87ce95d19af (diff)
downloadnixlib-0a67dc6d2aa5f6ac3d08a12eb5e26d5fda5734ea.tar
nixlib-0a67dc6d2aa5f6ac3d08a12eb5e26d5fda5734ea.tar.gz
nixlib-0a67dc6d2aa5f6ac3d08a12eb5e26d5fda5734ea.tar.bz2
nixlib-0a67dc6d2aa5f6ac3d08a12eb5e26d5fda5734ea.tar.lz
nixlib-0a67dc6d2aa5f6ac3d08a12eb5e26d5fda5734ea.tar.xz
nixlib-0a67dc6d2aa5f6ac3d08a12eb5e26d5fda5734ea.tar.zst
nixlib-0a67dc6d2aa5f6ac3d08a12eb5e26d5fda5734ea.zip
Merge commit '2ec5e9595becf05b052ce4c61a05d87ce95d19af'
Diffstat (limited to 'nixpkgs/pkgs/test/cross/default.nix')
-rw-r--r--nixpkgs/pkgs/test/cross/default.nix9
1 files changed, 4 insertions, 5 deletions
diff --git a/nixpkgs/pkgs/test/cross/default.nix b/nixpkgs/pkgs/test/cross/default.nix
index 5d9c120c501a..6c31a16f2fd5 100644
--- a/nixpkgs/pkgs/test/cross/default.nix
+++ b/nixpkgs/pkgs/test/cross/default.nix
@@ -93,8 +93,7 @@ let
 
   };
 
-in (lib.mapAttrs (_: mapMultiPlatformTest builtins.id) tests)
-// (lib.mapAttrs' (name: test: {
-    name = "${name}-llvm";
-    value = mapMultiPlatformTest (system: system // {useLLVM = true;}) test;
-  }) tests)
+in {
+  gcc = (lib.mapAttrs (_: mapMultiPlatformTest (system: system // {useLLVM = false;})) tests);
+  llvm = (lib.mapAttrs (_: mapMultiPlatformTest (system: system // {useLLVM = true;})) tests);
+}