public
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

haskell.compiler.ghcHEAD: 8.11.20200824 -> 9.3.20210504

This commit is contained in:
sternenseemann 2021-05-05 16:49:48 +02:00 committed by sterni
parent f7c01a9c27
commit b4c069dc11
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
pkgs/development/compilers/ghc/head.nix
View File

@ -38,7 +38,7 @@
, # Whether to build terminfo. , # Whether to build terminfo.
enableTerminfo ? !stdenv.targetPlatform.isWindows enableTerminfo ? !stdenv.targetPlatform.isWindows
, version ? "8.11.20200824" , version ? "9.3.20210504"
, # What flavour to build. An empty string indicates no , # What flavour to build. An empty string indicates no
# specific flavour and falls back to ghc default values. # specific flavour and falls back to ghc default values.
ghcFlavour ? lib.optionalString (stdenv.targetPlatform != stdenv.hostPlatform) ghcFlavour ? lib.optionalString (stdenv.targetPlatform != stdenv.hostPlatform)
@ -110,8 +110,8 @@ stdenv.mkDerivation (rec {
src = fetchgit { src = fetchgit {
url = "https://gitlab.haskell.org/ghc/ghc.git/"; url = "https://gitlab.haskell.org/ghc/ghc.git/";
rev = "3f50154591ada9064351ccec4adfe6df53ca2439"; rev = "049c3a83fbce67e58e70c727d89e8331608a4e04";
sha256 = "1w2p5bc74aswspzvgvrhcb95hvj5ky38rgqqjvrri19z2qyiky6d"; sha256 = "0dk7c9ywam9fj33lqzpwxhiwz017m58j6ixvc8b07kzp7kskaxq7";
}; };
enableParallelBuilding = true; enableParallelBuilding = true;
@ -139,6 +139,9 @@ stdenv.mkDerivation (rec {
export READELF="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}readelf" export READELF="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}readelf"
export STRIP="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}strip" export STRIP="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}strip"
# otherwise haddock fails when generating the compiler docs
export LANG=C.UTF-8
echo -n "${buildMK dontStrip}" > mk/build.mk echo -n "${buildMK dontStrip}" > mk/build.mk
echo ${version} > VERSION echo ${version} > VERSION
echo ${src.rev} > GIT_COMMIT_ID echo ${src.rev} > GIT_COMMIT_ID

2
pkgs/top-level/haskell-packages.nix
View File

@ -86,7 +86,7 @@ in {
llvmPackages = pkgs.llvmPackages_10; llvmPackages = pkgs.llvmPackages_10;
}; };
ghcHEAD = callPackage ../development/compilers/ghc/head.nix { ghcHEAD = callPackage ../development/compilers/ghc/head.nix {
bootPkgs = packages.ghc884; # no binary yet bootPkgs = packages.ghc8104; # no binary yet
inherit (buildPackages.python3Packages) sphinx; inherit (buildPackages.python3Packages) sphinx;
buildLlvmPackages = buildPackages.llvmPackages_10; buildLlvmPackages = buildPackages.llvmPackages_10;
llvmPackages = pkgs.llvmPackages_10; llvmPackages = pkgs.llvmPackages_10;