public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ghc bootstrap binary: 8.2.1 -> 8.2.2

Browse Source 
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.
This commit is contained in:
Benjamin Hipple 2018-11-19 18:23:35 -05:00 committed by Peter Simons
parent 8f11b37a95
commit a4758050a3
2 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
pkgs/development/compilers/ghc/8.2.1-binary.nix → pkgs/development/compilers/ghc/8.2.2-binary.nix
View File

@ -24,30 +24,30 @@ let
in in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
version = "8.2.1"; version = "8.2.2";
name = "ghc-${version}-binary"; name = "ghc-${version}-binary";
src = fetchurl ({ src = fetchurl ({
"i686-linux" = { "i686-linux" = {
url = "http://haskell.org/ghc/dist/${version}/ghc-${version}-i386-deb8-linux.tar.xz"; url = "http://haskell.org/ghc/dist/${version}/ghc-${version}-i386-deb8-linux.tar.xz";
sha256 = "d86f9c157dd4161a8acb14062c131c8985a4f65fc856603c373502be1d50c95e"; sha256 = "08w2ik55dp3n95qikmrflc91lsiq01xp53ki3jlhnbj8fqnxfrwy";
}; };
"x86_64-linux" = { "x86_64-linux" = {
url = "http://haskell.org/ghc/dist/${version}/ghc-${version}-x86_64-deb8-linux.tar.xz"; url = "http://haskell.org/ghc/dist/${version}/ghc-${version}-x86_64-deb8-linux.tar.xz";
sha256 = "543b81bf610240bd0398111d6c6607a9094dc2d159b564057d46c8a3d1aaa130"; sha256 = "0ahv26304pqi3dm7i78si4pxwvg5f5dc2jwsfgvcrhcx5g30bqj8";
}; };
"armv7l-linux" = { "armv7l-linux" = {
url = "http://haskell.org/ghc/dist/${version}/ghc-${version}-armv7-deb8-linux.tar.xz"; url = "http://haskell.org/ghc/dist/${version}/ghc-${version}-armv7-deb8-linux.tar.xz";
sha256 = "0f0e5e1d4fad3fa1a87ca1fe0d19242f4a94d158b7b8a08f99efefd98b51b019"; sha256 = "1jmv8qmnh5bn324fivbwdcaj55kvw7cb2zq9pafmlmv3qwwx7s46";
}; };
"aarch64-linux" = { "aarch64-linux" = {
url = "http://haskell.org/ghc/dist/${version}/ghc-${version}-aarch64-deb8-linux.tar.xz"; url = "http://haskell.org/ghc/dist/${version}/ghc-${version}-aarch64-deb8-linux.tar.xz";
sha256 = "61dab9c95ef9f9af8bce7338863fda3e42945eb46194b12d922b6d0dc245d0c2"; sha256 = "1k2amylcp1ad67c75h1pqf7czf9m0zj1i7hdc45ghjklnfq9hrk7";
}; };
"x86_64-darwin" = { "x86_64-darwin" = {
url = "http://haskell.org/ghc/dist/${version}/ghc-${version}-x86_64-apple-darwin.tar.xz"; url = "http://haskell.org/ghc/dist/${version}/ghc-${version}-x86_64-apple-darwin.tar.xz";
sha256 = "900c802025fb630060dbd30f9738e5d107a4ca5a50d5c1262cd3e69fe4467188"; sha256 = "09swx71gh5habzbx55shz2xykgr96xkcy09nzinnm4z0yxicy3zr";
}; };
}.${stdenv.hostPlatform.system} }.${stdenv.hostPlatform.system}
or (throw "cannot bootstrap GHC on this platform")); or (throw "cannot bootstrap GHC on this platform"));

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

@ -5,7 +5,7 @@
let let
# These are attributes in compiler and packages that don't support integer-simple. # These are attributes in compiler and packages that don't support integer-simple.
integerSimpleExcludes = [ integerSimpleExcludes = [
"ghc821Binary" "ghc822Binary"
"ghc844" "ghc844"
"ghcjs" "ghcjs"
"ghcjs82" "ghcjs82"
@ -42,16 +42,16 @@ in {
compiler = { 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 { ghc822 = callPackage ../development/compilers/ghc/8.2.2.nix {
bootPkgs = packages.ghc821Binary; bootPkgs = packages.ghc822Binary;
inherit (buildPackages.python3Packages) sphinx; inherit (buildPackages.python3Packages) sphinx;
buildLlvmPackages = buildPackages.llvmPackages_39; buildLlvmPackages = buildPackages.llvmPackages_39;
llvmPackages = pkgs.llvmPackages_39; llvmPackages = pkgs.llvmPackages_39;
}; };
ghc844 = callPackage ../development/compilers/ghc/8.4.4.nix { ghc844 = callPackage ../development/compilers/ghc/8.4.4.nix {
bootPkgs = packages.ghc821Binary; bootPkgs = packages.ghc822Binary;
buildLlvmPackages = buildPackages.llvmPackages_5; buildLlvmPackages = buildPackages.llvmPackages_5;
llvmPackages = pkgs.llvmPackages_5; llvmPackages = pkgs.llvmPackages_5;
}; };
@ -66,7 +66,7 @@ in {
llvmPackages = pkgs.llvmPackages_6; llvmPackages = pkgs.llvmPackages_6;
}; };
ghcHEAD = callPackage ../development/compilers/ghc/head.nix { ghcHEAD = callPackage ../development/compilers/ghc/head.nix {
bootPkgs = packages.ghc821Binary; bootPkgs = packages.ghc822Binary;
buildLlvmPackages = buildPackages.llvmPackages_5; buildLlvmPackages = buildPackages.llvmPackages_5;
llvmPackages = pkgs.llvmPackages_5; llvmPackages = pkgs.llvmPackages_5;
}; };
@ -100,9 +100,9 @@ in {
# Always get compilers from `buildPackages` # Always get compilers from `buildPackages`
packages = let bh = buildPackages.haskell; in { packages = let bh = buildPackages.haskell; in {
ghc821Binary = callPackage ../development/haskell-modules { ghc822Binary = callPackage ../development/haskell-modules {
buildHaskellPackages = bh.packages.ghc821Binary; buildHaskellPackages = bh.packages.ghc822Binary;
ghc = bh.compiler.ghc821Binary; ghc = bh.compiler.ghc822Binary;
compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-8.2.x.nix { }; compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-8.2.x.nix { };
packageSetConfig = bootstrapPackageSet; packageSetConfig = bootstrapPackageSet;
}; };