mirror of
https://github.com/NixOS/nixpkgs.git
synced 2025-11-09 16:18:34 +01:00
ghc: 9.10.2 -> 9.10.3
https://www.haskell.org/ghc/blog/20250910-ghc-9.10.3-released.html
This commit is contained in:
parent
f6660bb07a
commit
ed65db9c51
|
|
@ -58,7 +58,7 @@ Each of those compiler versions has a corresponding attribute set `packages` bui
|
||||||
it. However, the non-standard package sets are not tested regularly and, as a
|
it. However, the non-standard package sets are not tested regularly and, as a
|
||||||
result, contain fewer working packages. The corresponding package set for GHC
|
result, contain fewer working packages. The corresponding package set for GHC
|
||||||
9.4.8 is `haskell.packages.ghc948`. In fact, `haskellPackages` (at the time of writing) is just an alias
|
9.4.8 is `haskell.packages.ghc948`. In fact, `haskellPackages` (at the time of writing) is just an alias
|
||||||
for `haskell.packages.ghc9102`:
|
for `haskell.packages.ghc9103`.
|
||||||
|
|
||||||
Every package set also re-exposes the GHC used to build its packages as `haskell.packages.*.ghc`.
|
Every package set also re-exposes the GHC used to build its packages as `haskell.packages.*.ghc`.
|
||||||
|
|
||||||
|
|
|
||||||
4
pkgs/development/compilers/ghc/9.10.3.nix
Normal file
4
pkgs/development/compilers/ghc/9.10.3.nix
Normal file
|
|
@ -0,0 +1,4 @@
|
||||||
|
import ./common-hadrian.nix rec {
|
||||||
|
version = "9.10.3";
|
||||||
|
sha256 = "d266864b9e0b7b741abe8c9d6a790d7c01c21cf43a1419839119255878ebc59a";
|
||||||
|
}
|
||||||
|
|
@ -175,11 +175,31 @@ in
|
||||||
buildTargetLlvmPackages = pkgsBuildTarget.llvmPackages_15;
|
buildTargetLlvmPackages = pkgsBuildTarget.llvmPackages_15;
|
||||||
llvmPackages = pkgs.llvmPackages_15;
|
llvmPackages = pkgs.llvmPackages_15;
|
||||||
};
|
};
|
||||||
ghc910 = compiler.ghc9102;
|
ghc9103 = callPackage ../development/compilers/ghc/9.10.3.nix {
|
||||||
|
bootPkgs =
|
||||||
|
if stdenv.buildPlatform.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).
|
||||||
|
bb.packages.ghc963
|
||||||
|
else
|
||||||
|
bb.packages.ghc963Binary;
|
||||||
|
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;
|
||||||
|
# 2023-01-15: Support range >= 11 && < 16
|
||||||
|
buildTargetLlvmPackages = pkgsBuildTarget.llvmPackages_15;
|
||||||
|
llvmPackages = pkgs.llvmPackages_15;
|
||||||
|
};
|
||||||
|
ghc910 = compiler.ghc9103;
|
||||||
ghc9121 = callPackage ../development/compilers/ghc/9.12.1.nix {
|
ghc9121 = callPackage ../development/compilers/ghc/9.12.1.nix {
|
||||||
bootPkgs =
|
bootPkgs =
|
||||||
# No suitable bindist packaged yet
|
# No suitable bindist packaged yet
|
||||||
bb.packages.ghc9102;
|
bb.packages.ghc9103;
|
||||||
inherit (buildPackages.python3Packages) sphinx;
|
inherit (buildPackages.python3Packages) sphinx;
|
||||||
# Need to use apple's patched xattr until
|
# Need to use apple's patched xattr until
|
||||||
# https://github.com/xattr/xattr/issues/44 and
|
# https://github.com/xattr/xattr/issues/44 and
|
||||||
|
|
@ -192,7 +212,7 @@ in
|
||||||
ghc9122 = callPackage ../development/compilers/ghc/9.12.2.nix {
|
ghc9122 = callPackage ../development/compilers/ghc/9.12.2.nix {
|
||||||
bootPkgs =
|
bootPkgs =
|
||||||
# No suitable bindist packaged yet
|
# No suitable bindist packaged yet
|
||||||
bb.packages.ghc9102;
|
bb.packages.ghc9103;
|
||||||
inherit (buildPackages.python3Packages) sphinx;
|
inherit (buildPackages.python3Packages) sphinx;
|
||||||
# Need to use apple's patched xattr until
|
# Need to use apple's patched xattr until
|
||||||
# https://github.com/xattr/xattr/issues/44 and
|
# https://github.com/xattr/xattr/issues/44 and
|
||||||
|
|
@ -305,7 +325,12 @@ in
|
||||||
ghc = bh.compiler.ghc9102;
|
ghc = bh.compiler.ghc9102;
|
||||||
compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-9.10.x.nix { };
|
compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-9.10.x.nix { };
|
||||||
};
|
};
|
||||||
ghc910 = packages.ghc9102;
|
ghc9103 = callPackage ../development/haskell-modules {
|
||||||
|
buildHaskellPackages = bh.packages.ghc9103;
|
||||||
|
ghc = bh.compiler.ghc9103;
|
||||||
|
compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-9.10.x.nix { };
|
||||||
|
};
|
||||||
|
ghc910 = packages.ghc9103;
|
||||||
ghc9121 = callPackage ../development/haskell-modules {
|
ghc9121 = callPackage ../development/haskell-modules {
|
||||||
buildHaskellPackages = bh.packages.ghc9121;
|
buildHaskellPackages = bh.packages.ghc9121;
|
||||||
ghc = bh.compiler.ghc9121;
|
ghc = bh.compiler.ghc9121;
|
||||||
|
|
|
||||||
|
|
@ -69,6 +69,7 @@ let
|
||||||
ghc984
|
ghc984
|
||||||
ghc9101
|
ghc9101
|
||||||
ghc9102
|
ghc9102
|
||||||
|
ghc9103
|
||||||
# exclude ghc9121 due to severe miscompilation bug
|
# exclude ghc9121 due to severe miscompilation bug
|
||||||
ghc9122
|
ghc9122
|
||||||
];
|
];
|
||||||
|
|
@ -431,8 +432,8 @@ let
|
||||||
;
|
;
|
||||||
};
|
};
|
||||||
|
|
||||||
haskell.packages.native-bignum.ghc9102 = {
|
haskell.packages.native-bignum.ghc9103 = {
|
||||||
inherit (packagePlatforms pkgs.pkgsStatic.haskell.packages.native-bignum.ghc9102)
|
inherit (packagePlatforms pkgs.pkgsStatic.haskell.packages.native-bignum.ghc9103)
|
||||||
hello
|
hello
|
||||||
random
|
random
|
||||||
QuickCheck
|
QuickCheck
|
||||||
|
|
@ -554,12 +555,14 @@ let
|
||||||
# for 9.10, test that using filepath (instead of filepath-bytestring) works.
|
# for 9.10, test that using filepath (instead of filepath-bytestring) works.
|
||||||
compilerNames.ghc9101
|
compilerNames.ghc9101
|
||||||
compilerNames.ghc9102
|
compilerNames.ghc9102
|
||||||
|
compilerNames.ghc9103
|
||||||
];
|
];
|
||||||
haskell-language-server = released;
|
haskell-language-server = released;
|
||||||
hoogle = released;
|
hoogle = released;
|
||||||
hlint = lib.subtractLists [
|
hlint = lib.subtractLists [
|
||||||
compilerNames.ghc9101
|
compilerNames.ghc9101
|
||||||
compilerNames.ghc9102
|
compilerNames.ghc9102
|
||||||
|
compilerNames.ghc9103
|
||||||
compilerNames.ghc9122
|
compilerNames.ghc9122
|
||||||
] released;
|
] released;
|
||||||
hpack = released;
|
hpack = released;
|
||||||
|
|
@ -587,6 +590,7 @@ let
|
||||||
weeder = lib.subtractLists [
|
weeder = lib.subtractLists [
|
||||||
compilerNames.ghc9101
|
compilerNames.ghc9101
|
||||||
compilerNames.ghc9102
|
compilerNames.ghc9102
|
||||||
|
compilerNames.ghc9103
|
||||||
compilerNames.ghc9122
|
compilerNames.ghc9122
|
||||||
] released;
|
] released;
|
||||||
})
|
})
|
||||||
|
|
@ -667,7 +671,7 @@ let
|
||||||
constituents = accumulateDerivations [
|
constituents = accumulateDerivations [
|
||||||
jobs.pkgsStatic.haskell.packages.native-bignum.ghc948 # non-hadrian
|
jobs.pkgsStatic.haskell.packages.native-bignum.ghc948 # non-hadrian
|
||||||
jobs.pkgsStatic.haskellPackages
|
jobs.pkgsStatic.haskellPackages
|
||||||
jobs.pkgsStatic.haskell.packages.native-bignum.ghc9102
|
jobs.pkgsStatic.haskell.packages.native-bignum.ghc9103
|
||||||
];
|
];
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue