diff options
| author | Dennis Gosnell <cdep.illabout@gmail.com> | 2022-05-01 16:19:55 +0900 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-05-01 16:19:55 +0900 |
| commit | 7be18af83c4c9af46b3cd1787b6d79ae150eb303 (patch) | |
| tree | 3b40820d8cc614626377a9916391c405233f916e /pkgs/top-level | |
| parent | 5e831c7d4d85b385bf3a49942a32a05294afc772 (diff) | |
| parent | 5dce602f0628ccef4dac62dfa85a36091fb58333 (diff) | |
Merge pull request #169513 from NixOS/haskell-updates
haskellPackages: update stackage and hackage
Diffstat (limited to 'pkgs/top-level')
| -rw-r--r-- | pkgs/top-level/release-haskell.nix | 23 |
1 files changed, 12 insertions, 11 deletions
diff --git a/pkgs/top-level/release-haskell.nix b/pkgs/top-level/release-haskell.nix index 972bb02ca7fea..88b53f6b636a8 100644 --- a/pkgs/top-level/release-haskell.nix +++ b/pkgs/top-level/release-haskell.nix @@ -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 ; }; }; @@ -361,6 +363,9 @@ let ghc-lib = released; ghc-lib-parser = released; ghc-lib-parser-ex = released; + spectacle = [ + compilerNames.ghc8107 + ]; }) { mergeable = pkgs.releaseTools.aggregate { @@ -446,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 ]; }; } |