diff options
author | sternenseemann <sternenseemann@systemli.org> | 2023-02-11 18:06:36 +0100 |
---|---|---|
committer | sternenseemann <sternenseemann@systemli.org> | 2023-02-13 15:32:09 +0100 |
commit | 75cdc109f0462ec83af02cb8c458a239dcb8f5db (patch) | |
tree | 703ff3eb1e0e1162b9aacd6f92872ddac223fc7c /pkgs/top-level/haskell-packages.nix | |
parent | 4f7c02e890f8c04f734220801797ef5cdfa75161 (diff) |
haskellPackages.ghc: 9.2.4 -> 9.2.6
https://www.haskell.org/ghc/blog/20230210-ghc-9.2.6-released.html
Diffstat (limited to 'pkgs/top-level/haskell-packages.nix')
-rw-r--r-- | pkgs/top-level/haskell-packages.nix | 28 |
1 files changed, 26 insertions, 2 deletions
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 6a1c4bcf5db90..6a2ed917c3088 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -18,6 +18,7 @@ let "ghc90" "ghc924" "ghc925" + "ghc926" "ghc92" "ghc942" "ghc943" @@ -32,6 +33,7 @@ let "ghc92" "ghc924" "ghc925" + "ghc926" "ghc94" "ghc942" "ghc943" @@ -187,7 +189,24 @@ in { buildTargetLlvmPackages = pkgsBuildTarget.llvmPackages_12; llvmPackages = pkgs.llvmPackages_12; }; - ghc92 = ghc924; + ghc926 = callPackage ../development/compilers/ghc/9.2.6.nix { + bootPkgs = + # aarch64 ghc8107Binary exceeds max output size on hydra + if stdenv.hostPlatform.isAarch then + packages.ghc8107BinaryMinimal + else if stdenv.hostPlatform.isPower64 && stdenv.hostPlatform.isLittleEndian then + packages.ghc810 + else + packages.ghc8107Binary; + 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; + buildTargetLlvmPackages = pkgsBuildTarget.llvmPackages_12; + llvmPackages = pkgs.llvmPackages_12; + }; + ghc92 = ghc926; ghc942 = callPackage ../development/compilers/ghc/9.4.2.nix { bootPkgs = # Building with 9.2 is broken due to @@ -386,7 +405,12 @@ in { ghc = bh.compiler.ghc925; compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-9.2.x.nix { }; }; - ghc92 = ghc924; + ghc926 = callPackage ../development/haskell-modules { + buildHaskellPackages = bh.packages.ghc926; + ghc = bh.compiler.ghc926; + compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-9.2.x.nix { }; + }; + ghc92 = ghc926; ghc942 = callPackage ../development/haskell-modules { buildHaskellPackages = bh.packages.ghc942; ghc = bh.compiler.ghc942; |