diff --git a/pkgs/development/compilers/ghc/9.6.3.nix b/pkgs/development/compilers/ghc/9.6.3.nix new file mode 100644 index 000000000000..35bbf020acbf --- /dev/null +++ b/pkgs/development/compilers/ghc/9.6.3.nix @@ -0,0 +1,4 @@ +import ./common-hadrian.nix rec { + version = "9.6.3"; + sha256 = "1xbpxchmvm9gswrwwz1rsvx9kjaxhc2q3fx9l6wa0l5599xydkfz"; +} 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; diff --git a/pkgs/top-level/release-haskell.nix b/pkgs/top-level/release-haskell.nix index 3365032f4188..3f2425453829 100644 --- a/pkgs/top-level/release-haskell.nix +++ b/pkgs/top-level/release-haskell.nix @@ -71,6 +71,7 @@ let ghc945 ghc946 ghc962 + ghc963 ]; # packagePlatforms applied to `haskell.packages.*` @@ -493,9 +494,11 @@ let ] released; hoogle = lib.subtractLists [ compilerNames.ghc962 + compilerNames.ghc963 ] released; hlint = lib.subtractLists [ compilerNames.ghc962 + compilerNames.ghc963 ] released; hpack = released; hsdns = released; @@ -537,6 +540,7 @@ let compilerNames.ghc945 compilerNames.ghc946 compilerNames.ghc962 + compilerNames.ghc963 ]; hashable = released; primitive = released; @@ -551,6 +555,7 @@ let compilerNames.ghc945 compilerNames.ghc946 compilerNames.ghc962 + compilerNames.ghc963 ]; }) {