diff --git a/doc/languages-frameworks/haskell.section.md b/doc/languages-frameworks/haskell.section.md index b0b5f5c3bb2f..c6e5ae5af0e2 100644 --- a/doc/languages-frameworks/haskell.section.md +++ b/doc/languages-frameworks/haskell.section.md @@ -110,7 +110,7 @@ Each of those compiler versions has a corresponding attribute set built using it. However, the non-standard package sets are not tested regularly and, as a result, contain fewer working packages. The corresponding package set for GHC 9.4.5 is `haskell.packages.ghc945`. In fact `haskellPackages` is just an alias -for `haskell.packages.ghc927`: +for `haskell.packages.ghc963`: ```console $ nix-env -f '' -qaP -A haskell.packages.ghc927 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8ab7f9f663dd..6c178e53d1ef 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -16235,13 +16235,11 @@ with pkgs; haskell = callPackage ./haskell-packages.nix { }; haskellPackages = dontRecurseIntoAttrs - # JS backend is only available for GHC >= 9.6 - (if stdenv.hostPlatform.isGhcjs - then haskell.packages.native-bignum.ghc96 - # Prefer native-bignum to avoid linking issues with gmp - else if stdenv.hostPlatform.isStatic - then haskell.packages.native-bignum.ghc94 - else haskell.packages.ghc94) + # Prefer native-bignum to avoid linking issues with gmp + # JS backend can't use gmp + (if stdenv.hostPlatform.isStatic || stdenv.hostPlatform.isGhcjs + then haskell.packages.native-bignum.ghc96 + else haskell.packages.ghc96) // { __recurseIntoDerivationForReleaseJobs = true; }; # haskellPackages.ghc is build->host (it exposes the compiler used to build the @@ -16254,9 +16252,10 @@ with pkgs; # plain, cross-compiled compiler (which is only theoretical at the moment). ghc = targetPackages.haskellPackages.ghc or # Prefer native-bignum to avoid linking issues with gmp - (if stdenv.targetPlatform.isStatic - then haskell.compiler.native-bignum.ghc94 - else haskell.compiler.ghc94); + # JS backend can't use GMP + (if stdenv.targetPlatform.isStatic || stdenv.targetPlatform.isGhcjs + then haskell.compiler.native-bignum.ghc96 + else haskell.compiler.ghc96); alex = haskell.lib.compose.justStaticExecutables haskellPackages.alex; @@ -20723,8 +20722,7 @@ with pkgs; c-blosc = callPackage ../development/libraries/c-blosc { }; # justStaticExecutables is needed due to https://github.com/NixOS/nix/issues/2990 - # ghc94: https://discourse.haskell.org/t/facing-mmap-4096-bytes-at-nil-cannot-allocate-memory-youre-not-alone/6259 - cachix = haskell.lib.justStaticExecutables haskell.packages.ghc94.cachix; + cachix = haskell.lib.compose.justStaticExecutables haskellPackages.cachix; calcium = callPackage ../development/libraries/calcium { };