haskellPackages: bump default GHC to 9.2.x
This commit is contained in:
@@ -4655,7 +4655,7 @@ with pkgs;
|
||||
|
||||
nixel = callPackage ../tools/nix/nixel { };
|
||||
|
||||
nix-output-monitor = callPackage ../tools/nix/nix-output-monitor { haskellPackages = haskell.packages.ghc92; };
|
||||
nix-output-monitor = callPackage ../tools/nix/nix-output-monitor { };
|
||||
|
||||
nix-template = callPackage ../tools/package-management/nix-template {
|
||||
inherit (darwin.apple_sdk.frameworks) Security;
|
||||
@@ -14242,13 +14242,11 @@ with pkgs;
|
||||
|
||||
haskell = callPackage ./haskell-packages.nix { };
|
||||
|
||||
# Please update doc/languages-frameworks/haskell.section.md, “Our
|
||||
# current default compiler is”, if you bump this:
|
||||
haskellPackages = dontRecurseIntoAttrs
|
||||
# Prefer native-bignum to avoid linking issues with gmp
|
||||
(if stdenv.hostPlatform.isStatic
|
||||
then haskell.packages.native-bignum.ghc90
|
||||
else haskell.packages.ghc90);
|
||||
then haskell.packages.native-bignum.ghc92
|
||||
else haskell.packages.ghc92);
|
||||
|
||||
# haskellPackages.ghc is build->host (it exposes the compiler used to build the
|
||||
# set, similarly to stdenv.cc), but pkgs.ghc should be host->target to be more
|
||||
@@ -14261,8 +14259,8 @@ with pkgs;
|
||||
ghc = targetPackages.haskellPackages.ghc or
|
||||
# Prefer native-bignum to avoid linking issues with gmp
|
||||
(if stdenv.targetPlatform.isStatic
|
||||
then haskell.compiler.native-bignum.ghc90
|
||||
else haskell.compiler.ghc90);
|
||||
then haskell.compiler.native-bignum.ghc92
|
||||
else haskell.compiler.ghc92);
|
||||
|
||||
cabal-install = haskell.lib.compose.justStaticExecutables haskellPackages.cabal-install;
|
||||
|
||||
|
||||
Reference in New Issue
Block a user