diff options
| author | sternenseemann <sternenseemann@systemli.org> | 2024-01-16 21:40:36 +0100 |
|---|---|---|
| committer | sternenseemann <sternenseemann@systemli.org> | 2024-01-23 21:05:01 +0100 |
| commit | 0e756e65d5b1134e1364a731b583e233385ac7ae (patch) | |
| tree | 5ad97e797c52c93ea9ceb8ad306ed39fcb986c07 /pkgs/top-level/haskell-packages.nix | |
| parent | 3624e2d44e62306c23cec6e4bd558dbc6822eeb5 (diff) | |
| download | nixlib-0e756e65d5b1134e1364a731b583e233385ac7ae.tar nixlib-0e756e65d5b1134e1364a731b583e233385ac7ae.tar.gz nixlib-0e756e65d5b1134e1364a731b583e233385ac7ae.tar.bz2 nixlib-0e756e65d5b1134e1364a731b583e233385ac7ae.tar.lz nixlib-0e756e65d5b1134e1364a731b583e233385ac7ae.tar.xz nixlib-0e756e65d5b1134e1364a731b583e233385ac7ae.tar.zst nixlib-0e756e65d5b1134e1364a731b583e233385ac7ae.zip | |
haskell.compiler.ghc96: 9.6.3 -> 9.6.4
https://www.haskell.org/ghc/blog/20240109-ghc-9.6.4-released.html Co-authored-by: Ben Gamari <ben@smart-cactus.org>
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 7bf0431130fb..9d27972bdf98 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -24,6 +24,7 @@ let "ghc948" "ghc96" "ghc963" + "ghc964" "ghc98" "ghc981" "ghcHEAD" @@ -278,7 +279,25 @@ in { buildTargetLlvmPackages = pkgsBuildTarget.llvmPackages_15; llvmPackages = pkgs.llvmPackages_15; }; - ghc96 = compiler.ghc963; + ghc964 = callPackage ../development/compilers/ghc/9.6.4.nix { + bootPkgs = + # For GHC 9.2 no armv7l bindists are available. + if stdenv.hostPlatform.isAarch32 then + packages.ghc928 + else if stdenv.hostPlatform.isPower64 && stdenv.hostPlatform.isLittleEndian then + packages.ghc928 + else + packages.ghc924Binary; + 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; + # Support range >= 11 && < 16 + buildTargetLlvmPackages = pkgsBuildTarget.llvmPackages_15; + llvmPackages = pkgs.llvmPackages_15; + }; + ghc96 = compiler.ghc964; ghc981 = callPackage ../development/compilers/ghc/9.8.1.nix { # No bindist packaged for 9.4.* yet bootPkgs = packages.ghc947; @@ -421,7 +440,12 @@ in { ghc = bh.compiler.ghc963; compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-9.6.x.nix { }; }; - ghc96 = packages.ghc963; + ghc964 = callPackage ../development/haskell-modules { + buildHaskellPackages = bh.packages.ghc964; + ghc = bh.compiler.ghc964; + compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-9.6.x.nix { }; + }; + ghc96 = packages.ghc964; ghc981 = callPackage ../development/haskell-modules { buildHaskellPackages = bh.packages.ghc981; ghc = bh.compiler.ghc981; |