diff options
Diffstat (limited to 'pkgs/top-level/haskell-packages.nix')
| -rw-r--r-- | pkgs/top-level/haskell-packages.nix | 27 |
1 files changed, 25 insertions, 2 deletions
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index ddfd8146b53d0..ec050d7431780 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -290,7 +290,25 @@ in { buildTargetLlvmPackages = pkgsBuildTarget.llvmPackages_15; llvmPackages = pkgs.llvmPackages_15; }; - ghc96 = compiler.ghc964; + ghc965 = callPackage ../development/compilers/ghc/9.6.5.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.ghc965; ghc981 = callPackage ../development/compilers/ghc/9.8.1.nix { bootPkgs = # For GHC 9.6 no armv7l bindists are available. @@ -490,7 +508,12 @@ in { ghc = bh.compiler.ghc964; compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-9.6.x.nix { }; }; - ghc96 = packages.ghc964; + ghc965 = callPackage ../development/haskell-modules { + buildHaskellPackages = bh.packages.ghc965; + ghc = bh.compiler.ghc965; + compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-9.6.x.nix { }; + }; + ghc96 = packages.ghc965; ghc981 = callPackage ../development/haskell-modules { buildHaskellPackages = bh.packages.ghc981; ghc = bh.compiler.ghc981; |