ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-10-02 10:37:49 +03:00
Code Issues Projects Releases Wiki Activity

Merge pull request #167877 from sternenseemann/ghc-head-20220406

Browse Source 
haskell.compiler.ghcHEAD: 9.3.20211111 -> 9.3.20220406
This commit is contained in:
sternenseemann 2022-04-09 00:52:48 +02:00 committed by GitHub
commit f644a5c542
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -42,7 +42,7 @@
# platform). Static libs are always built.
enableShared ? !stdenv.targetPlatform.isWindows && !stdenv.targetPlatform.useiOSPrebuilt
, version ? "9.3.20211111"
, version ? "9.3.20220406"
, # What flavour to build. An empty string indicates no
# specific flavour and falls back to ghc default values.
ghcFlavour ? lib.optionalString (stdenv.targetPlatform != stdenv.hostPlatform)
@ -186,8 +186,8 @@ stdenv.mkDerivation (rec {
src = fetchgit {
url = "https://gitlab.haskell.org/ghc/ghc.git/";
rev = "cc635da167fdec2dead0603b0026cb841f0aa645";
sha256 = "1lj76l546zriwkcn2r7i5a4j35bx9fh5iggwfz2xvhh8aq8j2i46";
rev = "c44432db254d2fc960d7864e080cb50e65dfa7c6";
sha256 = "0xagijcfcw3a19s6dmh6z7085lvkrakys3lcby4ncq1v0syh507h";
};
enableParallelBuilding = true;

9
pkgs/development/haskell-modules/configuration-ghc-head.nix
View File

@ -17,23 +17,25 @@ self: super: {
llvmPackages = pkgs.lib.dontRecurseIntoAttrs self.ghc.llvmPackages;
# Disable GHC 8.7.x core libraries.
# Disable GHC core libraries.
array = null;
base = null;
binary = null;
bytestring = null;
Cabal = null;
Cabal-syntax = null;
containers = null;
deepseq = null;
directory = null;
exceptions = null;
filepath = null;
ghc-bignum = null;
ghc-boot = null;
ghc-boot-th = null;
ghc-bignum = null;
ghc-compact = null;
ghc-heap = null;
ghci = null;
ghc-prim = null;
ghci = null;
haskeline = null;
hpc = null;
integer-gmp = null;
@ -51,7 +53,6 @@ self: super: {
transformers = null;
unix = null;
xhtml = null;
exceptions = null;
# https://github.com/tibbe/unordered-containers/issues/214
unordered-containers = dontCheck super.unordered-containers;