diff options
| author | Gabor Greif <ggreif@gmail.com> | 2020-04-11 09:41:22 +0200 |
|---|---|---|
| committer | Peter Simons <simons@cryp.to> | 2020-04-17 20:50:48 +0200 |
| commit | 7932fb22cbf4df9d1b630e130160b3081bd5de10 (patch) | |
| tree | c0b82210f4386f2190ebbe7cec70a7a66d04970a /pkgs/top-level/haskell-packages.nix | |
| parent | fd1103227dd7e386fd102a52dcc24a4511bcb750 (diff) | |
ghcHEAD: bump to 8.11.20200403 (#84217)
* ghcHEAD: bump to 8.11.20200403
* ghcHead: reduce diff vs. 8.10.1
dontAddExtraLibs was removed by accident (IMO) in ea19a8ed1e3
* ghcHEAD: add ability to use system libffi
- enable nixpkgs' libffi
- minimise diffs against 8.10.1
- remove patching
* remove configure warning about --with-curses-includes
configure: WARNING: unrecognized options: --with-curses-includes
Diffstat (limited to 'pkgs/top-level/haskell-packages.nix')
| -rw-r--r-- | pkgs/top-level/haskell-packages.nix | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 052b84f269e6..aa7ef02a3886 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -81,10 +81,11 @@ in { llvmPackages = pkgs.llvmPackages_9; }; ghcHEAD = callPackage ../development/compilers/ghc/head.nix { - bootPkgs = packages.ghc865Binary; + bootPkgs = packages.ghc883; # no binary yet inherit (buildPackages.python3Packages) sphinx; - buildLlvmPackages = buildPackages.llvmPackages_6; - llvmPackages = pkgs.llvmPackages_6; + buildLlvmPackages = buildPackages.llvmPackages_9; + llvmPackages = pkgs.llvmPackages_9; + libffi = pkgs.libffi; }; ghcjs = compiler.ghcjs86; ghcjs86 = callPackage ../development/compilers/ghcjs-ng { |