Skip to content

Commit

Permalink
Merge pull request #124025 from sternenseemann/haskell-static-hydra
Browse files Browse the repository at this point in the history
top-level/release-haskell.nix: test static linking as well
  • Loading branch information
cdepillabout authored May 22, 2021
2 parents 7559b35 + 0fddf5b commit 18a832e
Showing 1 changed file with 24 additions and 0 deletions.
24 changes: 24 additions & 0 deletions pkgs/top-level/release-haskell.nix
Original file line number Diff line number Diff line change
Expand Up @@ -81,6 +81,9 @@ let

recursiveUpdateMany = builtins.foldl' lib.recursiveUpdate {};

staticHaskellPackagesPlatforms =
packagePlatforms pkgs.pkgsStatic.haskellPackages;

jobs = recursiveUpdateMany [
(mapTestOn {
haskellPackages = packagePlatforms pkgs.haskellPackages;
Expand All @@ -93,6 +96,16 @@ let
writers = testPlatforms.writers;
};

# test some statically linked packages to catch regressions
# and get some cache going for static compilation with GHC
pkgsStatic.haskellPackages = {
inherit (staticHaskellPackagesPlatforms)
hello
random
lens
;
};

# top-level packages that depend on haskellPackages
inherit (pkgsPlatforms)
agda
Expand Down Expand Up @@ -273,6 +286,17 @@ let
(name: jobs.haskellPackages."${name}")
(maintainedPkgNames pkgs.haskellPackages));
};
staticHaskellPackages = pkgs.releaseTools.aggregate {
name = "static-haskell-packages";
meta = {
description = "Static haskell builds using the pkgsStatic infrastructure";
maintainers = [
lib.maintainers.sternenseemann
lib.maintainers.rnhmjoj
];
};
constituents = accumulateDerivations [ jobs.pkgsStatic ];
};
}
];

Expand Down

0 comments on commit 18a832e

Please sign in to comment.