ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-11-11 15:27:20 +03:00
Code Issues Projects Releases Wiki Activity

release-haskell.nix: clean up testing of static haskell packages

Browse Source 
* Test the default pkgsStatic.haskellPackages set, as it should be
  working properly now.

* Instead of GHC 8.10.7 which hasn't gotten some workarounds applied,
  test GHC 9.2.2 additionally which should work as well as GHC 9.0.

* Test building an actual executable, cabal2nix.

* Simplify aggregate job definition.

* Make sure GHC 9.2 lens gets built on Hydra.
This commit is contained in:
sternenseemann 2022-04-29 11:21:18 +02:00
parent b42bd1a3d2
commit c2fe259aa6
2 changed files with 10 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/development/haskell-modules/configuration-ghc-9.2.x.nix
View File

@ -171,7 +171,7 @@ self: super: {
];
# lens >= 5.1 supports 9.2.1
lens = super.lens_5_1;
lens = doDistribute self.lens_5_1;
# Syntax error in tests fixed in https://github.com/simonmar/alex/commit/84b29475e057ef744f32a94bc0d3954b84160760
alex = dontCheck super.alex;

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

@ -304,27 +304,29 @@ let
# Test some statically linked packages to catch regressions
# and get some cache going for static compilation with GHC.
# Use integer-simple to avoid GMP linking problems (LGPL)
pkgsStatic.haskell.packages =
pkgsStatic =
removePlatforms
[
"aarch64-linux" # times out on Hydra
"x86_64-darwin" # TODO: reenable when static libiconv works on darwin
] {
integer-simple.ghc8107 = {
inherit (packagePlatforms pkgs.pkgsStatic.haskell.packages.integer-simple.ghc8107)
haskellPackages = {
inherit (packagePlatforms pkgs.pkgsStatic.haskellPackages)
hello
lens
random
QuickCheck
cabal2nix
;
};
native-bignum.ghc902 = {
inherit (packagePlatforms pkgs.pkgsStatic.haskell.packages.native-bignum.ghc902)
haskell.packages.native-bignum.ghc922 = {
inherit (packagePlatforms pkgs.pkgsStatic.haskell.packages.native-bignum.ghc922)
hello
lens
random
QuickCheck
cabal2nix
;
};
};
@ -449,12 +451,8 @@ let
];
};
constituents = accumulateDerivations [
jobs.pkgsStatic.haskell.packages.integer-simple.ghc8107.hello
jobs.pkgsStatic.haskell.packages.integer-simple.ghc8107.lens
jobs.pkgsStatic.haskell.packages.integer-simple.ghc8107.random
jobs.pkgsStatic.haskell.packages.native-bignum.ghc902.hello
jobs.pkgsStatic.haskell.packages.native-bignum.ghc902.lens
jobs.pkgsStatic.haskell.packages.native-bignum.ghc902.random
jobs.pkgsStatic.haskellPackages
jobs.pkgsStatic.haskell.packages.native-bignum.ghc922
];
};
}