diff options
author | sternenseemann <sternenseemann@systemli.org> | 2022-04-08 15:13:52 +0200 |
---|---|---|
committer | sternenseemann <sternenseemann@systemli.org> | 2022-04-09 00:34:46 +0200 |
commit | 4eeab0f0ab8db80a572d1fd223a3c004af5d5b2e (patch) | |
tree | e7a24212aa196a0cab0a52feccb638c5acc65885 | |
parent | 490ec6a9c1e6a5693f1759bc9432804216a941f5 (diff) | |
download | nixpkgs-4eeab0f0ab8db80a572d1fd223a3c004af5d5b2e.tar nixpkgs-4eeab0f0ab8db80a572d1fd223a3c004af5d5b2e.tar.gz nixpkgs-4eeab0f0ab8db80a572d1fd223a3c004af5d5b2e.tar.bz2 nixpkgs-4eeab0f0ab8db80a572d1fd223a3c004af5d5b2e.tar.lz nixpkgs-4eeab0f0ab8db80a572d1fd223a3c004af5d5b2e.tar.xz nixpkgs-4eeab0f0ab8db80a572d1fd223a3c004af5d5b2e.tar.zst nixpkgs-4eeab0f0ab8db80a572d1fd223a3c004af5d5b2e.zip |
haskell.compiler.ghcHEAD: 9.3.20211111 -> 9.3.20220406
-rw-r--r-- | pkgs/development/compilers/ghc/head.nix | 6 | ||||
-rw-r--r-- | pkgs/development/haskell-modules/configuration-ghc-head.nix | 9 |
2 files changed, 8 insertions, 7 deletions
diff --git a/pkgs/development/compilers/ghc/head.nix b/pkgs/development/compilers/ghc/head.nix index 07ea6bda245..a2afb7400c2 100644 --- a/pkgs/development/compilers/ghc/head.nix +++ b/pkgs/development/compilers/ghc/head.nix @@ -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; diff --git a/pkgs/development/haskell-modules/configuration-ghc-head.nix b/pkgs/development/haskell-modules/configuration-ghc-head.nix index 9c7895d4fe6..bc65e209911 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-head.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-head.nix @@ -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; |