diff options
author | maralorn <mail@maralorn.de> | 2023-06-28 20:03:53 +0200 |
---|---|---|
committer | maralorn <mail@maralorn.de> | 2023-06-28 20:03:53 +0200 |
commit | 59e94be9fea7441abd0fef034b019e3f392bd89f (patch) | |
tree | 9283700ef1f5a17f49856dd07b82d940d6da3097 | |
parent | ff11be7cbff74717137360c919fd0ee8859d56cd (diff) | |
download | nixpkgs-59e94be9fea7441abd0fef034b019e3f392bd89f.tar nixpkgs-59e94be9fea7441abd0fef034b019e3f392bd89f.tar.gz nixpkgs-59e94be9fea7441abd0fef034b019e3f392bd89f.tar.bz2 nixpkgs-59e94be9fea7441abd0fef034b019e3f392bd89f.tar.lz nixpkgs-59e94be9fea7441abd0fef034b019e3f392bd89f.tar.xz nixpkgs-59e94be9fea7441abd0fef034b019e3f392bd89f.tar.zst nixpkgs-59e94be9fea7441abd0fef034b019e3f392bd89f.zip |
ghc: update default version 9.2.x -> 9.4.x
-rw-r--r-- | pkgs/development/tools/haskell/haskell-language-server/withWrapper.nix | 2 | ||||
-rw-r--r-- | pkgs/top-level/all-packages.nix | 10 |
2 files changed, 6 insertions, 6 deletions
diff --git a/pkgs/development/tools/haskell/haskell-language-server/withWrapper.nix b/pkgs/development/tools/haskell/haskell-language-server/withWrapper.nix index 48a473be169..a6f287c37b3 100644 --- a/pkgs/development/tools/haskell/haskell-language-server/withWrapper.nix +++ b/pkgs/development/tools/haskell/haskell-language-server/withWrapper.nix @@ -1,6 +1,6 @@ { lib , stdenv -, supportedGhcVersions ? [ "92" ] +, supportedGhcVersions ? [ "94" ] , dynamic ? true , haskellPackages , haskell diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 68e8b889c1d..bd2447f0913 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -15685,8 +15685,8 @@ with pkgs; 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.ghc92 - else haskell.packages.ghc92); + then haskell.packages.native-bignum.ghc94 + else haskell.packages.ghc94); # 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 @@ -15699,8 +15699,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.ghc92 - else haskell.compiler.ghc92); + then haskell.compiler.native-bignum.ghc94 + else haskell.compiler.ghc94); alex = haskell.lib.compose.justStaticExecutables haskellPackages.alex; @@ -17261,7 +17261,7 @@ with pkgs; stdenv = clangStdenv; }; - jacinda = haskell.lib.compose.justStaticExecutables haskell.packages.ghc92.jacinda; + jacinda = haskell.lib.compose.justStaticExecutables haskellPackages.jacinda; janet = callPackage ../development/interpreters/janet { }; |