ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-12-26 21:33:03 +03:00
Code Issues Projects Releases Wiki Activity

ghcHEAD: 20200403 -> 20200505

Browse Source
This commit is contained in:
Gabor Greif 2020-05-05 18:52:15 +02:00 committed by Peter Simons
parent 4f0200a3fc
commit dec283b463
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
doc/languages-frameworks/haskell.section.md
View File

@ -103,8 +103,8 @@ command displays the complete list of available compilers:
$ nix-env -f "<nixpkgs>" -qaP -A haskell.compiler $ nix-env -f "<nixpkgs>" -qaP -A haskell.compiler
haskell.compiler.ghc8101 ghc-8.10.1 haskell.compiler.ghc8101 ghc-8.10.1
haskell.compiler.integer-simple.ghc8101 ghc-8.10.1 haskell.compiler.integer-simple.ghc8101 ghc-8.10.1
haskell.compiler.ghcHEAD ghc-8.11.20200403 haskell.compiler.ghcHEAD ghc-8.11.20200505
haskell.compiler.integer-simple.ghcHEAD ghc-8.11.20200403 haskell.compiler.integer-simple.ghcHEAD ghc-8.11.20200505
haskell.compiler.ghc822Binary ghc-8.2.2-binary haskell.compiler.ghc822Binary ghc-8.2.2-binary
haskell.compiler.ghc844 ghc-8.4.4 haskell.compiler.ghc844 ghc-8.4.4
haskell.compiler.ghc863Binary ghc-8.6.3-binary haskell.compiler.ghc863Binary ghc-8.6.3-binary

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

@ -35,7 +35,7 @@
, # Whetherto build terminfo. , # Whetherto build terminfo.
enableTerminfo ? !stdenv.targetPlatform.isWindows enableTerminfo ? !stdenv.targetPlatform.isWindows
, version ? "8.11.20200403" , version ? "8.11.20200505"
, # 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 ? stdenv.lib.optionalString (stdenv.targetPlatform != stdenv.hostPlatform) ghcFlavour ? stdenv.lib.optionalString (stdenv.targetPlatform != stdenv.hostPlatform)
@ -103,8 +103,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 = "4291bddaea3148908c55f235ee8978e1d9aa6f20"; rev = "40c71c2cf38b4e134d81b7184a4d5e02949ae70c";
sha256 = "1gs3mxmsdpsgsp7vnawx8mys0qwg4x2zhfrbciy3wv8nv13ar1af"; sha256 = "04h9rcyzm9w3an1z00hjs062dp7dl19b8pkyxjsypr7a2i9dmvkb";
}; };
enableParallelBuilding = true; enableParallelBuilding = true;

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

@ -77,8 +77,8 @@ in {
ghcHEAD = callPackage ../development/compilers/ghc/head.nix { ghcHEAD = callPackage ../development/compilers/ghc/head.nix {
bootPkgs = packages.ghc883; # no binary yet bootPkgs = packages.ghc883; # no binary yet
inherit (buildPackages.python3Packages) sphinx; inherit (buildPackages.python3Packages) sphinx;
buildLlvmPackages = buildPackages.llvmPackages_9; buildLlvmPackages = buildPackages.llvmPackages_10;
llvmPackages = pkgs.llvmPackages_9; llvmPackages = pkgs.llvmPackages_10;
libffi = pkgs.libffi; libffi = pkgs.libffi;
}; };
ghcjs = compiler.ghcjs86; ghcjs = compiler.ghcjs86;