cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

haskell.compiler: ghc941 -> ghc942

Browse source
This commit is contained in:
sternenseemann 2022-08-22 21:12:30 +02:00
parent 547e2355ec
commit 970a97f973
2 changed files with 9 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
pkgs/development/compilers/ghc/9.4.1.nix → pkgs/development/compilers/ghc/9.4.2.nix
View file

@ -1,4 +1,4 @@
# Preliminary GHC 9.4.1 expression using the make build system. # Preliminary GHC 9.4.2 expression using the make build system.
# TODO(@sternenseemann): port to hadrian, so we are prepared for 9.6 # TODO(@sternenseemann): port to hadrian, so we are prepared for 9.6
# where make support will be dropped. # where make support will be dropped.
{ lib, stdenv, pkgsBuildTarget, pkgsHostTarget, targetPackages { lib, stdenv, pkgsBuildTarget, pkgsHostTarget, targetPackages
@ -177,12 +177,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.1"; version = "9.4.2";
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 = "sha256-y/7UZAvfAl4zulVDPa+M32mPTgSZrnqADd5EqC5zluM="; sha256 = "7227ef3b5e15a0d70b8f1a43aec32867e2a9b2d857cc0ed556aeed172d4db3a5";
}; };
enableParallelBuilding = true; enableParallelBuilding = true;
@ -190,16 +190,6 @@ stdenv.mkDerivation (rec {
outputs = [ "out" "doc" ]; outputs = [ "out" "doc" ];
patches = [
# add missing profiling targets in make build system
(fetchpatch {
name = "ghc-9.4.1-fix-bootstrapping-with-profiling-1.patch";
url = "https://gitlab.haskell.org/ghc/ghc/-/commit/47b4fea08bd0ef1476b8d134c7baf06157fe5fa5.diff";
sha256 = "sha256-oYQWg9cK0RNL9I+kap8KER+iiKim73zG6URQs8BeAXU=";
})
./ghc-9.4.1-fix-bootstrapping-with-profiling-2.patch
];
postPatch = "patchShebangs ."; postPatch = "patchShebangs .";
# GHC needs the locale configured during the Haddock phase. # GHC needs the locale configured during the Haddock phase.

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

@ -16,14 +16,14 @@ let
"native-bignum" "native-bignum"
"ghc902" "ghc902"
"ghc924" "ghc924"
"ghc941" "ghc942"
"ghcHEAD" "ghcHEAD"
]; ];
nativeBignumIncludes = [ nativeBignumIncludes = [
"ghc902" "ghc902"
"ghc924" "ghc924"
"ghc941" "ghc942"
"ghcHEAD" "ghcHEAD"
]; ];
@ -155,7 +155,7 @@ in {
buildTargetLlvmPackages = pkgsBuildTarget.llvmPackages_12; buildTargetLlvmPackages = pkgsBuildTarget.llvmPackages_12;
llvmPackages = pkgs.llvmPackages_12; llvmPackages = pkgs.llvmPackages_12;
}; };
ghc941 = callPackage ../development/compilers/ghc/9.4.1.nix { ghc942 = callPackage ../development/compilers/ghc/9.4.2.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
@ -291,9 +291,9 @@ in {
ghc = bh.compiler.ghc924; ghc = bh.compiler.ghc924;
compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-9.2.x.nix { }; compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-9.2.x.nix { };
}; };
ghc941 = callPackage ../development/haskell-modules { ghc942 = callPackage ../development/haskell-modules {
buildHaskellPackages = bh.packages.ghc941; buildHaskellPackages = bh.packages.ghc942;
ghc = bh.compiler.ghc941; ghc = bh.compiler.ghc942;
compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-9.4.x.nix { }; compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-9.4.x.nix { };
}; };
ghcHEAD = callPackage ../development/haskell-modules { ghcHEAD = callPackage ../development/haskell-modules {