From f170298c9aa07cbd08af414ea16723af3122cb9e Mon Sep 17 00:00:00 2001 From: sternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org> Date: Sun, 9 May 2021 01:49:17 +0200 Subject: [PATCH] top-level/release.nix: fix evaluation of jobset MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit We need to merge the set of complete jobs not of platforms to test on since our aggregate jobs will always be “proper” jobs. --- pkgs/top-level/release-haskell.nix | 8 ++++---- 1 file 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