diff options
| author | Ryan Hendrickson <ryan.hendrickson@alum.mit.edu> | 2023-09-26 19:13:19 -0400 |
|---|---|---|
| committer | sternenseemann <sternenseemann@systemli.org> | 2023-09-28 15:28:23 +0200 |
| commit | 1d78ad9ea4fe35bfeb42df910220f0b5b82f6750 (patch) | |
| tree | 12254f2c1a94428eedf902e7584c0ee14ceb53c6 /pkgs/top-level/haskell-packages.nix | |
| parent | 6982839dbfbfda6b2f2776498dae8022733f2969 (diff) | |
| download | nixlib-1d78ad9ea4fe35bfeb42df910220f0b5b82f6750.tar nixlib-1d78ad9ea4fe35bfeb42df910220f0b5b82f6750.tar.gz nixlib-1d78ad9ea4fe35bfeb42df910220f0b5b82f6750.tar.bz2 nixlib-1d78ad9ea4fe35bfeb42df910220f0b5b82f6750.tar.lz nixlib-1d78ad9ea4fe35bfeb42df910220f0b5b82f6750.tar.xz nixlib-1d78ad9ea4fe35bfeb42df910220f0b5b82f6750.tar.zst nixlib-1d78ad9ea4fe35bfeb42df910220f0b5b82f6750.zip | |
haskell.compiler.ghc96: 9.6.2 -> 9.6.3
https://www.haskell.org/ghc/blog/20230925-ghc-9.6.3-released.html
Diffstat (limited to 'pkgs/top-level/haskell-packages.nix')
| -rw-r--r-- | pkgs/top-level/haskell-packages.nix | 29 |
1 files changed, 27 insertions, 2 deletions
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index c57302ccaa8b..71d3f7a7869c 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -27,6 +27,7 @@ let "ghc94" "ghc96" "ghc962" + "ghc963" "ghcHEAD" ]; @@ -47,6 +48,7 @@ let "ghc946" "ghc96" "ghc962" + "ghc963" "ghcHEAD" ]; @@ -350,7 +352,25 @@ in { buildTargetLlvmPackages = pkgsBuildTarget.llvmPackages_15; llvmPackages = pkgs.llvmPackages_15; }; - ghc96 = compiler.ghc962; + ghc963 = callPackage ../development/compilers/ghc/9.6.3.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; + 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.ghc963; ghcHEAD = callPackage ../development/compilers/ghc/head.nix { bootPkgs = # For GHC 9.2 no armv7l bindists are available. @@ -503,7 +523,12 @@ in { ghc = bh.compiler.ghc962; compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-9.6.x.nix { }; }; - ghc96 = packages.ghc962; + ghc963 = callPackage ../development/haskell-modules { + buildHaskellPackages = bh.packages.ghc963; + ghc = bh.compiler.ghc963; + compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-9.6.x.nix { }; + }; + ghc96 = packages.ghc963; ghcHEAD = callPackage ../development/haskell-modules { buildHaskellPackages = bh.packages.ghcHEAD; ghc = bh.compiler.ghcHEAD; |