diff options
Diffstat (limited to 'nixpkgs/pkgs/top-level/release-haskell.nix')
| -rw-r--r-- | nixpkgs/pkgs/top-level/release-haskell.nix | 30 |
1 files changed, 16 insertions, 14 deletions
diff --git a/nixpkgs/pkgs/top-level/release-haskell.nix b/nixpkgs/pkgs/top-level/release-haskell.nix index f1b5645e52b6..376aa60cd14c 100644 --- a/nixpkgs/pkgs/top-level/release-haskell.nix +++ b/nixpkgs/pkgs/top-level/release-haskell.nix @@ -62,7 +62,6 @@ let released = with compilerNames; [ ghc8107 ghc902 - ghc924 ghc925 ghc926 ghc927 @@ -70,7 +69,7 @@ let ghc945 ghc946 ghc947 - ghc962 + ghc948 ghc963 ghc981 ]; @@ -415,7 +414,7 @@ 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) + # Use native-bignum to avoid GMP linking problems (LGPL) pkgsStatic = removePlatforms [ @@ -437,8 +436,8 @@ let ; }; - haskell.packages.native-bignum.ghc928 = { - inherit (packagePlatforms pkgs.pkgsStatic.haskell.packages.native-bignum.ghc928) + haskell.packages.native-bignum.ghc948 = { + inherit (packagePlatforms pkgs.pkgsStatic.haskell.packages.native-bignum.ghc948) hello lens random @@ -448,6 +447,15 @@ let xhtml # isn't bundled for cross ; }; + + haskell.packages.native-bignum.ghc981 = { + inherit (packagePlatforms pkgs.pkgsStatic.haskell.packages.native-bignum.ghc981) + hello + random + QuickCheck + terminfo # isn't bundled for cross + ; + }; }; pkgsCross.ghcjs = @@ -498,16 +506,12 @@ let haskell-language-server = lib.subtractLists [ # Support ceased as of 2.3.0.0 compilerNames.ghc8107 - # Not yet supported - compilerNames.ghc981 ] released; hoogle = lib.subtractLists [ - compilerNames.ghc962 compilerNames.ghc963 compilerNames.ghc981 ] released; hlint = lib.subtractLists [ - compilerNames.ghc962 compilerNames.ghc963 compilerNames.ghc981 ] released; @@ -559,7 +563,6 @@ let weeder = [ compilerNames.ghc8107 compilerNames.ghc902 - compilerNames.ghc924 compilerNames.ghc925 compilerNames.ghc926 compilerNames.ghc927 @@ -567,7 +570,7 @@ let compilerNames.ghc945 compilerNames.ghc946 compilerNames.ghc947 - compilerNames.ghc962 + compilerNames.ghc948 compilerNames.ghc963 ]; }) @@ -644,7 +647,6 @@ let jobs.pkgsMusl.haskell.compiler.ghc8107Binary jobs.pkgsMusl.haskell.compiler.ghc8107 jobs.pkgsMusl.haskell.compiler.ghc902 - jobs.pkgsMusl.haskell.compiler.ghc924 jobs.pkgsMusl.haskell.compiler.ghc925 jobs.pkgsMusl.haskell.compiler.ghc926 jobs.pkgsMusl.haskell.compiler.ghc927 @@ -652,7 +654,6 @@ let jobs.pkgsMusl.haskell.compiler.ghcHEAD jobs.pkgsMusl.haskell.compiler.integer-simple.ghc8107 jobs.pkgsMusl.haskell.compiler.native-bignum.ghc902 - jobs.pkgsMusl.haskell.compiler.native-bignum.ghc924 jobs.pkgsMusl.haskell.compiler.native-bignum.ghc925 jobs.pkgsMusl.haskell.compiler.native-bignum.ghc926 jobs.pkgsMusl.haskell.compiler.native-bignum.ghc927 @@ -671,8 +672,9 @@ let ]; }; constituents = accumulateDerivations [ + jobs.pkgsStatic.haskell.packages.native-bignum.ghc948 # non-hadrian jobs.pkgsStatic.haskellPackages - jobs.pkgsStatic.haskell.packages.native-bignum.ghc928 + jobs.pkgsStatic.haskell.packages.native-bignum.ghc981 ]; }; } |