BoomMicrophone/nixpkgs-suyu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

haskell.compiler: ghc942 -> ghc943

Browse source 
https://www.haskell.org/ghc/download_ghc_9_4_3.html

Dropping GHC 9.4.2, since there is no Stackage snapshot which uses GHC 9.4.*,
so the stack Nix integration should not get any ideas.
This commit is contained in:
sternenseemann 2022-11-04 15:17:07 +01:00
parent 9226c0b10b
commit 677ff51cfa
4 changed files with 12 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
pkgs/development/compilers/ghc/9.4.2.nix → pkgs/development/compilers/ghc/9.4.3.nix
View file

@ -176,12 +176,12 @@ assert buildTargetLlvmPackages.llvm == llvmPackages.llvm;
assert stdenv.targetPlatform.isDarwin -> buildTargetLlvmPackages.clang == llvmPackages.clang; assert stdenv.targetPlatform.isDarwin -> buildTargetLlvmPackages.clang == llvmPackages.clang;
stdenv.mkDerivation (rec { stdenv.mkDerivation (rec {
version = "9.4.2"; version = "9.4.3";
pname = "${targetPrefix}ghc${variantSuffix}"; pname = "${targetPrefix}ghc${variantSuffix}";
src = fetchurl { src = fetchurl {
url = "https://downloads.haskell.org/ghc/${version}/ghc-${version}-src.tar.xz"; url = "https://downloads.haskell.org/ghc/${version}/ghc-${version}-src.tar.xz";
sha256 = "7227ef3b5e15a0d70b8f1a43aec32867e2a9b2d857cc0ed556aeed172d4db3a5"; sha256 = "eaf63949536ede50ee39179f2299d5094eb9152d87cc6fb2175006bc98e8905a";
}; };
enableParallelBuilding = true; enableParallelBuilding = true;

2
pkgs/development/compilers/ghc/common-hadrian.nix
View file

@ -158,7 +158,7 @@ assert !enableNativeBignum -> gmp != null;
assert stdenv.hostPlatform == stdenv.targetPlatform || throw '' assert stdenv.hostPlatform == stdenv.targetPlatform || throw ''
hadrian doesn't support building an installable GHC cross-compiler at the moment. hadrian doesn't support building an installable GHC cross-compiler at the moment.
Consider using GHC 9.4.2 or lower which support this via the make build system. Consider using GHC 9.4 or lower which support this via the make build system.
See also: https://gitlab.haskell.org/ghc/ghc/-/issues/22090 See also: https://gitlab.haskell.org/ghc/ghc/-/issues/22090
''; '';

16
pkgs/top-level/haskell-packages.nix
View file

@ -18,7 +18,7 @@ let
"ghc90" "ghc90"
"ghc924" "ghc924"
"ghc92" "ghc92"
"ghc942" "ghc943"
"ghc94" "ghc94"
"ghcHEAD" "ghcHEAD"
]; ];
@ -29,7 +29,7 @@ let
"ghc92" "ghc92"
"ghc924" "ghc924"
"ghc94" "ghc94"
"ghc942" "ghc943"
"ghcHEAD" "ghcHEAD"
]; ];
@ -165,7 +165,7 @@ in {
llvmPackages = pkgs.llvmPackages_12; llvmPackages = pkgs.llvmPackages_12;
}; };
ghc92 = ghc924; ghc92 = ghc924;
ghc942 = callPackage ../development/compilers/ghc/9.4.2.nix { ghc943 = callPackage ../development/compilers/ghc/9.4.3.nix {
bootPkgs = bootPkgs =
# Building with 9.2 is broken due to # Building with 9.2 is broken due to
# https://gitlab.haskell.org/ghc/ghc/-/issues/21914 # https://gitlab.haskell.org/ghc/ghc/-/issues/21914
@ -189,7 +189,7 @@ in {
buildTargetLlvmPackages = pkgsBuildTarget.llvmPackages_12; buildTargetLlvmPackages = pkgsBuildTarget.llvmPackages_12;
llvmPackages = pkgs.llvmPackages_12; llvmPackages = pkgs.llvmPackages_12;
}; };
ghc94 = ghc942; ghc94 = ghc943;
ghcHEAD = callPackage ../development/compilers/ghc/head.nix { ghcHEAD = callPackage ../development/compilers/ghc/head.nix {
bootPkgs = bootPkgs =
# For GHC 9.2.3 and 9.2.4 no armv7l bindists are available. # For GHC 9.2.3 and 9.2.4 no armv7l bindists are available.
@ -311,12 +311,12 @@ in {
compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-9.2.x.nix { }; compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-9.2.x.nix { };
}; };
ghc92 = ghc924; ghc92 = ghc924;
ghc942 = callPackage ../development/haskell-modules { ghc943 = callPackage ../development/haskell-modules {
buildHaskellPackages = bh.packages.ghc942; buildHaskellPackages = bh.packages.ghc943;
ghc = bh.compiler.ghc942; ghc = bh.compiler.ghc943;
compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-9.4.x.nix { }; compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-9.4.x.nix { };
}; };
ghc94= ghc942; ghc94 = ghc943;
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;

2
pkgs/top-level/release-haskell.nix
View file

@ -53,7 +53,7 @@ let
ghc8107 ghc8107
ghc902 ghc902
ghc924 ghc924
ghc942 ghc943
]; ];
# packagePlatforms applied to `haskell.packages.*` # packagePlatforms applied to `haskell.packages.*`