diff options
Diffstat (limited to 'pkgs/top-level/haskell-packages.nix')
| -rw-r--r-- | pkgs/top-level/haskell-packages.nix | 72 |
1 files changed, 41 insertions, 31 deletions
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index b924a29f26162..6193d9d217ae9 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -78,7 +78,8 @@ in { packages.ghc865Binary else packages.ghc8107Binary; - inherit (buildPackages.python3Packages) sphinx; + inherit (buildPackages.python311Packages) sphinx; # a distutils issue with 3.12 + python3 = buildPackages.python311; # so that we don't have two of them # 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. @@ -94,7 +95,8 @@ in { packages.ghc810 else packages.ghc8107Binary; - inherit (buildPackages.python3Packages) sphinx; + inherit (buildPackages.python311Packages) sphinx; # a distutils issue with 3.12 + python3 = buildPackages.python311; # so that we don't have two of them inherit (buildPackages.darwin) autoSignDarwinBinariesHook xattr; buildTargetLlvmPackages = pkgsBuildTarget.llvmPackages_12; llvmPackages = pkgs.llvmPackages_12; @@ -106,7 +108,8 @@ in { packages.ghc810 else packages.ghc8107Binary; - inherit (buildPackages.python3Packages) sphinx; + inherit (buildPackages.python311Packages) sphinx; # a distutils issue with 3.12 + python3 = buildPackages.python311; # so that we don't have two of them # 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. @@ -120,7 +123,8 @@ in { packages.ghc810 else packages.ghc8107Binary; - inherit (buildPackages.python3Packages) sphinx; + inherit (buildPackages.python311Packages) sphinx; # a distutils issue with 3.12 + python3 = buildPackages.python311; # so that we don't have two of them # 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. @@ -134,7 +138,8 @@ in { packages.ghc810 else packages.ghc8107Binary; - inherit (buildPackages.python3Packages) sphinx; + inherit (buildPackages.python311Packages) sphinx; # a distutils issue with 3.12 + python3 = buildPackages.python311; # so that we don't have two of them # 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. @@ -148,7 +153,8 @@ in { packages.ghc810 else packages.ghc8107Binary; - inherit (buildPackages.python3Packages) sphinx; + inherit (buildPackages.python311Packages) sphinx; # a distutils issue with 3.12 + python3 = buildPackages.python311; # so that we don't have two of them # 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. @@ -172,7 +178,8 @@ in { packages.ghc902 else packages.ghc8107Binary; - inherit (buildPackages.python3Packages) sphinx; + inherit (buildPackages.python311Packages) sphinx; # a distutils issue with 3.12 + python3 = buildPackages.python311; # so that we don't have two of them # 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. @@ -196,7 +203,8 @@ in { packages.ghc902 else packages.ghc8107Binary; - inherit (buildPackages.python3Packages) sphinx; + inherit (buildPackages.python311Packages) sphinx; # a distutils issue with 3.12 + python3 = buildPackages.python311; # so that we don't have two of them # 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. @@ -308,7 +316,25 @@ in { buildTargetLlvmPackages = pkgsBuildTarget.llvmPackages_15; llvmPackages = pkgs.llvmPackages_15; }; - ghc96 = compiler.ghc965; + ghc966 = callPackage ../development/compilers/ghc/9.6.6.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.ghc966; ghc981 = callPackage ../development/compilers/ghc/9.8.1.nix { bootPkgs = # For GHC 9.6 no armv7l bindists are available. @@ -316,13 +342,6 @@ in { packages.ghc963 else if stdenv.hostPlatform.isPower64 && stdenv.hostPlatform.isLittleEndian then packages.ghc963 - else if stdenv.hostPlatform.isDarwin then - # it seems like the GHC 9.6.* bindists are built with a different - # toolchain than we are using (which I'm guessing from the fact - # that 9.6.4 bindists pass linker flags our ld doesn't support). - # With both 9.6.3 and 9.6.4 binary it is impossible to link against - # the clock package (probably a hsc2hs problem). - packages.ghc963 else packages.ghc963Binary; inherit (buildPackages.python3Packages) sphinx; @@ -341,13 +360,6 @@ in { packages.ghc963 else if stdenv.hostPlatform.isPower64 && stdenv.hostPlatform.isLittleEndian then packages.ghc963 - else if stdenv.hostPlatform.isDarwin then - # it seems like the GHC 9.6.* bindists are built with a different - # toolchain than we are using (which I'm guessing from the fact - # that 9.6.4 bindists pass linker flags our ld doesn't support). - # With both 9.6.3 and 9.6.4 binary it is impossible to link against - # the clock package (probably a hsc2hs problem). - packages.ghc963 else packages.ghc963Binary; inherit (buildPackages.python3Packages) sphinx; @@ -393,13 +405,6 @@ in { packages.ghc963 else if stdenv.hostPlatform.isPower64 && stdenv.hostPlatform.isLittleEndian then packages.ghc963 - else if stdenv.hostPlatform.isDarwin then - # it seems like the GHC 9.6.* bindists are built with a different - # toolchain than we are using (which I'm guessing from the fact - # that 9.6.4 bindists pass linker flags our ld doesn't support). - # With both 9.6.3 and 9.6.4 binary it is impossible to link against - # the clock package (probably a hsc2hs problem). - packages.ghc963 else packages.ghc963Binary; inherit (buildPackages.python3Packages) sphinx; @@ -539,7 +544,12 @@ in { ghc = bh.compiler.ghc965; compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-9.6.x.nix { }; }; - ghc96 = packages.ghc965; + ghc966 = callPackage ../development/haskell-modules { + buildHaskellPackages = bh.packages.ghc966; + ghc = bh.compiler.ghc966; + compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-9.6.x.nix { }; + }; + ghc96 = packages.ghc966; ghc981 = callPackage ../development/haskell-modules { buildHaskellPackages = bh.packages.ghc981; ghc = bh.compiler.ghc981; |