summary refs log tree commit diff
diff options
context:
space:
mode:
authorsternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org>2021-05-09 01:49:17 +0200
committersternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org>2021-05-09 01:49:17 +0200
commitf170298c9aa07cbd08af414ea16723af3122cb9e (patch)
tree076e2a3f6c0bdea1c9d22728dde60ec3f506ade4
parent4fc931999bfc1e9df337662eaa79fa03375b07cf (diff)
downloadnixpkgs-f170298c9aa07cbd08af414ea16723af3122cb9e.tar
nixpkgs-f170298c9aa07cbd08af414ea16723af3122cb9e.tar.gz
nixpkgs-f170298c9aa07cbd08af414ea16723af3122cb9e.tar.bz2
nixpkgs-f170298c9aa07cbd08af414ea16723af3122cb9e.tar.lz
nixpkgs-f170298c9aa07cbd08af414ea16723af3122cb9e.tar.xz
nixpkgs-f170298c9aa07cbd08af414ea16723af3122cb9e.tar.zst
nixpkgs-f170298c9aa07cbd08af414ea16723af3122cb9e.zip
top-level/release.nix: fix evaluation of jobset
We need to merge the set of complete jobs not of platforms to test on
since our aggregate jobs will always be “proper” jobs.
-rw-r--r--pkgs/top-level/release-haskell.nix8
1 files changed, 4 insertions, 4 deletions
diff --git a/pkgs/top-level/release-haskell.nix b/pkgs/top-level/release-haskell.nix
index 0fe5f730dc2..a4ce43859ce 100644
--- a/pkgs/top-level/release-haskell.nix
+++ b/pkgs/top-level/release-haskell.nix
@@ -77,8 +77,8 @@ let
 
   recursiveUpdateMany = builtins.foldl' lib.recursiveUpdate {};
 
-  jobs = mapTestOn (recursiveUpdateMany [
-    {
+  jobs = recursiveUpdateMany [
+    (mapTestOn {
       haskellPackages = packagePlatforms pkgs.haskellPackages;
       haskell.compiler = packagePlatforms pkgs.haskell.compiler;
 
@@ -194,7 +194,7 @@ let
         ;
 
       elmPackages.elm = pkgsPlatforms.elmPackages.elm;
-    }
+    })
     (versionedCompilerJobs {
       # Packages which should be checked on more than the
       # default GHC version. This list can be used to test
@@ -266,6 +266,6 @@ let
             (maintainedPkgNames pkgs.haskellPackages));
       };
     }
-  ]);
+  ];
 
 in jobs