diff options
| author | Benjamin Hipple <bhipple@protonmail.com> | 2018-11-19 18:23:35 -0500 |
|---|---|---|
| committer | Peter Simons <simons@cryp.to> | 2018-11-21 16:06:22 +0100 |
| commit | a4758050a3fe1ba85397aedaf854a659831a9d0a (patch) | |
| tree | fb1716fdc56488d9f35bf70cc5ff368f4c3bf662 /pkgs/top-level/haskell-packages.nix | |
| parent | 8f11b37a9567b8ee7e93d2206975459f33a420db (diff) | |
ghc bootstrap binary: 8.2.1 -> 8.2.2
If the nix store lives on NFS, `ghc 8.2.1` is unable to build a package
database. This bug was fixed by @bgamari in `ghc 8.2.2` here:
https://ghc.haskell.org/trac/ghc/ticket/13945
This commit upgrades the unpacked bootstrap GHC version, so that we can build
newer versions of GHC even if the store is on NFS.
Diffstat (limited to 'pkgs/top-level/haskell-packages.nix')
| -rw-r--r-- | pkgs/top-level/haskell-packages.nix | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 80dd1a04e73d..21f3b2773397 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -5,7 +5,7 @@ let # These are attributes in compiler and packages that don't support integer-simple. integerSimpleExcludes = [ - "ghc821Binary" + "ghc822Binary" "ghc844" "ghcjs" "ghcjs82" @@ -42,16 +42,16 @@ in { compiler = { - ghc821Binary = callPackage ../development/compilers/ghc/8.2.1-binary.nix { }; + ghc822Binary = callPackage ../development/compilers/ghc/8.2.2-binary.nix { }; ghc822 = callPackage ../development/compilers/ghc/8.2.2.nix { - bootPkgs = packages.ghc821Binary; + bootPkgs = packages.ghc822Binary; inherit (buildPackages.python3Packages) sphinx; buildLlvmPackages = buildPackages.llvmPackages_39; llvmPackages = pkgs.llvmPackages_39; }; ghc844 = callPackage ../development/compilers/ghc/8.4.4.nix { - bootPkgs = packages.ghc821Binary; + bootPkgs = packages.ghc822Binary; buildLlvmPackages = buildPackages.llvmPackages_5; llvmPackages = pkgs.llvmPackages_5; }; @@ -66,7 +66,7 @@ in { llvmPackages = pkgs.llvmPackages_6; }; ghcHEAD = callPackage ../development/compilers/ghc/head.nix { - bootPkgs = packages.ghc821Binary; + bootPkgs = packages.ghc822Binary; buildLlvmPackages = buildPackages.llvmPackages_5; llvmPackages = pkgs.llvmPackages_5; }; @@ -100,9 +100,9 @@ in { # Always get compilers from `buildPackages` packages = let bh = buildPackages.haskell; in { - ghc821Binary = callPackage ../development/haskell-modules { - buildHaskellPackages = bh.packages.ghc821Binary; - ghc = bh.compiler.ghc821Binary; + ghc822Binary = callPackage ../development/haskell-modules { + buildHaskellPackages = bh.packages.ghc822Binary; + ghc = bh.compiler.ghc822Binary; compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-8.2.x.nix { }; packageSetConfig = bootstrapPackageSet; }; |