haskell.compiler.ghc96: 9.6.2 -> 9.6.3

https://www.haskell.org/ghc/blog/20230925-ghc-9.6.3-released.html
This commit is contained in:
Ryan Hendrickson
2023-09-26 19:13:19 -04:00
committed by sternenseemann
parent 6982839dbf
commit 1d78ad9ea4
3 changed files with 36 additions and 2 deletions

View File

@@ -0,0 +1,4 @@
import ./common-hadrian.nix rec {
version = "9.6.3";
sha256 = "1xbpxchmvm9gswrwwz1rsvx9kjaxhc2q3fx9l6wa0l5599xydkfz";
}

View File

@@ -27,6 +27,7 @@ let
"ghc94" "ghc94"
"ghc96" "ghc96"
"ghc962" "ghc962"
"ghc963"
"ghcHEAD" "ghcHEAD"
]; ];
@@ -47,6 +48,7 @@ let
"ghc946" "ghc946"
"ghc96" "ghc96"
"ghc962" "ghc962"
"ghc963"
"ghcHEAD" "ghcHEAD"
]; ];
@@ -350,7 +352,25 @@ in {
buildTargetLlvmPackages = pkgsBuildTarget.llvmPackages_15; buildTargetLlvmPackages = pkgsBuildTarget.llvmPackages_15;
llvmPackages = pkgs.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 { ghcHEAD = callPackage ../development/compilers/ghc/head.nix {
bootPkgs = bootPkgs =
# For GHC 9.2 no armv7l bindists are available. # For GHC 9.2 no armv7l bindists are available.
@@ -503,7 +523,12 @@ in {
ghc = bh.compiler.ghc962; ghc = bh.compiler.ghc962;
compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-9.6.x.nix { }; 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 { ghcHEAD = callPackage ../development/haskell-modules {
buildHaskellPackages = bh.packages.ghcHEAD; buildHaskellPackages = bh.packages.ghcHEAD;
ghc = bh.compiler.ghcHEAD; ghc = bh.compiler.ghcHEAD;

View File

@@ -71,6 +71,7 @@ let
ghc945 ghc945
ghc946 ghc946
ghc962 ghc962
ghc963
]; ];
# packagePlatforms applied to `haskell.packages.*` # packagePlatforms applied to `haskell.packages.*`
@@ -493,9 +494,11 @@ let
] released; ] released;
hoogle = lib.subtractLists [ hoogle = lib.subtractLists [
compilerNames.ghc962 compilerNames.ghc962
compilerNames.ghc963
] released; ] released;
hlint = lib.subtractLists [ hlint = lib.subtractLists [
compilerNames.ghc962 compilerNames.ghc962
compilerNames.ghc963
] released; ] released;
hpack = released; hpack = released;
hsdns = released; hsdns = released;
@@ -537,6 +540,7 @@ let
compilerNames.ghc945 compilerNames.ghc945
compilerNames.ghc946 compilerNames.ghc946
compilerNames.ghc962 compilerNames.ghc962
compilerNames.ghc963
]; ];
hashable = released; hashable = released;
primitive = released; primitive = released;
@@ -551,6 +555,7 @@ let
compilerNames.ghc945 compilerNames.ghc945
compilerNames.ghc946 compilerNames.ghc946
compilerNames.ghc962 compilerNames.ghc962
compilerNames.ghc963
]; ];
}) })
{ {