diff options
author | sternenseemann <sternenseemann@systemli.org> | 2023-10-21 12:35:29 +0200 |
---|---|---|
committer | sternenseemann <sternenseemann@systemli.org> | 2023-11-06 15:26:58 +0100 |
commit | 2ec6f635344b634beb6b58137a78df83ab18f95e (patch) | |
tree | 48166f604881fd3c026114c690a73e975a19b2de /pkgs/top-level | |
parent | fd8a8c9160438e002bf471fe2be3411559836060 (diff) | |
download | nixlib-2ec6f635344b634beb6b58137a78df83ab18f95e.tar nixlib-2ec6f635344b634beb6b58137a78df83ab18f95e.tar.gz nixlib-2ec6f635344b634beb6b58137a78df83ab18f95e.tar.bz2 nixlib-2ec6f635344b634beb6b58137a78df83ab18f95e.tar.lz nixlib-2ec6f635344b634beb6b58137a78df83ab18f95e.tar.xz nixlib-2ec6f635344b634beb6b58137a78df83ab18f95e.tar.zst nixlib-2ec6f635344b634beb6b58137a78df83ab18f95e.zip |
haskell.compiler.ghcHEAD: 9.7.20230527 -> 9.9.20231014
Diffstat (limited to 'pkgs/top-level')
-rw-r--r-- | pkgs/top-level/haskell-packages.nix | 17 |
1 files changed, 5 insertions, 12 deletions
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 6b129e6aca01..0b970cb44f04 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -415,22 +415,15 @@ in { }; ghc98 = compiler.ghc981; ghcHEAD = callPackage ../development/compilers/ghc/head.nix { - bootPkgs = - # For GHC 9.2 no armv7l bindists are available. - if stdenv.hostPlatform.isAarch32 then - packages.ghc924 - else if stdenv.hostPlatform.isPower64 && stdenv.hostPlatform.isLittleEndian then - packages.ghc924 - else - packages.ghc924Binary; + bootPkgs = packages.ghc963; inherit (buildPackages.python3Packages) sphinx; # Need to use apple's patched xattr until # https://github.com/xattr/xattr/issues/44 and # https://github.com/xattr/xattr/issues/55 are solved. inherit (buildPackages.darwin) xattr autoSignDarwinBinariesHook; - # 2023-01-15: Support range >= 10 && < 15 - buildTargetLlvmPackages = pkgsBuildTarget.llvmPackages_14; - llvmPackages = pkgs.llvmPackages_14; + # 2023-01-15: Support range >= 11 && < 16 + buildTargetLlvmPackages = pkgsBuildTarget.llvmPackages_15; + llvmPackages = pkgs.llvmPackages_15; }; ghcjs = compiler.ghcjs810; @@ -586,7 +579,7 @@ in { ghcHEAD = callPackage ../development/haskell-modules { buildHaskellPackages = bh.packages.ghcHEAD; ghc = bh.compiler.ghcHEAD; - compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-9.8.x.nix { }; + compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-9.10.x.nix { }; }; ghcjs = packages.ghcjs810; |