public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #122212 from sternenseemann/haskell-updates-recursive-update

Browse Source 
top-level/release-haskell.nix: merge jobs using lib.recursiveUpdate
This commit is contained in:
maralorn 2021-05-09 01:44:18 +02:00 committed by GitHub
commit 4fc931999b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 188 additions and 182 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
pkgs/top-level/release-haskell.nix
View File

@ -75,7 +75,10 @@ let
_: v: builtins.length (v.meta.maintainers or []) > 0 _: v: builtins.length (v.meta.maintainers or []) > 0
) set); ) set);
jobs = mapTestOn { recursiveUpdateMany = builtins.foldl' lib.recursiveUpdate {};
jobs = mapTestOn (recursiveUpdateMany [
{
haskellPackages = packagePlatforms pkgs.haskellPackages; haskellPackages = packagePlatforms pkgs.haskellPackages;
haskell.compiler = packagePlatforms pkgs.haskell.compiler; haskell.compiler = packagePlatforms pkgs.haskell.compiler;
@ -191,7 +194,8 @@ let
; ;
elmPackages.elm = pkgsPlatforms.elmPackages.elm; elmPackages.elm = pkgsPlatforms.elmPackages.elm;
} // versionedCompilerJobs { }
(versionedCompilerJobs {
# Packages which should be checked on more than the # Packages which should be checked on more than the
# default GHC version. This list can be used to test # default GHC version. This list can be used to test
# the state of the package set with newer compilers # the state of the package set with newer compilers
@ -208,7 +212,8 @@ let
language-nix = all; language-nix = all;
nix-paths = all; nix-paths = all;
titlecase = all; titlecase = all;
} // { })
{
mergeable = pkgs.releaseTools.aggregate { mergeable = pkgs.releaseTools.aggregate {
name = "haskell-updates-mergeable"; name = "haskell-updates-mergeable";
meta = { meta = {
@ -260,6 +265,7 @@ let
(name: jobs.haskellPackages."${name}") (name: jobs.haskellPackages."${name}")
(maintainedPkgNames pkgs.haskellPackages)); (maintainedPkgNames pkgs.haskellPackages));
}; };
}; }
]);
in jobs in jobs