diff options
| -rw-r--r-- | pkgs/development/compilers/ghc/9.6.5.nix | 4 | ||||
| -rw-r--r-- | pkgs/top-level/haskell-packages.nix | 23 | ||||
| -rw-r--r-- | pkgs/top-level/release-haskell.nix | 1 |
3 files changed, 28 insertions, 0 deletions
diff --git a/pkgs/development/compilers/ghc/9.6.5.nix b/pkgs/development/compilers/ghc/9.6.5.nix new file mode 100644 index 0000000000000..0f1ac5022f8bf --- /dev/null +++ b/pkgs/development/compilers/ghc/9.6.5.nix @@ -0,0 +1,4 @@ +import ./common-hadrian.nix { + version = "9.6.5"; + sha256 = "87b389924f98c1a26c205122757338c8dab33ad1fcf670faa22622742432b93c"; +} diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index ddfd8146b53d0..3a5481f45a905 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -290,6 +290,24 @@ in { buildTargetLlvmPackages = pkgsBuildTarget.llvmPackages_15; llvmPackages = pkgs.llvmPackages_15; }; + 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.ghc964; ghc981 = callPackage ../development/compilers/ghc/9.8.1.nix { bootPkgs = @@ -490,6 +508,11 @@ in { ghc = bh.compiler.ghc964; compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-9.6.x.nix { }; }; + 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.ghc964; ghc981 = callPackage ../development/haskell-modules { buildHaskellPackages = bh.packages.ghc981; diff --git a/pkgs/top-level/release-haskell.nix b/pkgs/top-level/release-haskell.nix index a4c523e9fe6f2..ed1d3240d1cf7 100644 --- a/pkgs/top-level/release-haskell.nix +++ b/pkgs/top-level/release-haskell.nix @@ -71,6 +71,7 @@ let ghc948 ghc963 ghc964 + ghc965 ghc981 ghc982 ]; |