Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 26ffae147450
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 5d3a83dfc4d4
Choose a head ref
  • 2 commits
  • 2 files changed
  • 2 contributors

Commits on Nov 20, 2018

  1. 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.
    @bhipple
    bhipple committed Nov 20, 2018
    Copy the full SHA
    51a79e9 View commit details

  2. Merge pull request #50808 from bhipple/fix/ghc-bootstrap 

    ghc bootstrap binary: 8.2.1 -> 8.2.2
    @peti
    peti authored Nov 20, 2018
    Copy the full SHA
    5d3a83d View commit details
Showing with 14 additions and 14 deletions.
  1. +6 −6 pkgs/development/compilers/ghc/{8.2.1-binary.nix → 8.2.2-binary.nix}
  2. +8 −8 pkgs/top-level/haskell-packages.nix
12 changes: 6 additions & 6 deletions ...evelopment/compilers/ghc/8.2.1-binary.nix → ...evelopment/compilers/ghc/8.2.2-binary.nix
View file
Original file line number Diff line number Diff line change
@@ -24,30 +24,30 @@ let
in

stdenv.mkDerivation rec {
version = "8.2.1";
version = "8.2.2";

name = "ghc-${version}-binary";

src = fetchurl ({
"i686-linux" = {
url = "http://haskell.org/ghc/dist/${version}/ghc-${version}-i386-deb8-linux.tar.xz";
sha256 = "d86f9c157dd4161a8acb14062c131c8985a4f65fc856603c373502be1d50c95e";
sha256 = "08w2ik55dp3n95qikmrflc91lsiq01xp53ki3jlhnbj8fqnxfrwy";
};
"x86_64-linux" = {
url = "http://haskell.org/ghc/dist/${version}/ghc-${version}-x86_64-deb8-linux.tar.xz";
sha256 = "543b81bf610240bd0398111d6c6607a9094dc2d159b564057d46c8a3d1aaa130";
sha256 = "0ahv26304pqi3dm7i78si4pxwvg5f5dc2jwsfgvcrhcx5g30bqj8";
};
"armv7l-linux" = {
url = "http://haskell.org/ghc/dist/${version}/ghc-${version}-armv7-deb8-linux.tar.xz";
sha256 = "0f0e5e1d4fad3fa1a87ca1fe0d19242f4a94d158b7b8a08f99efefd98b51b019";
sha256 = "1jmv8qmnh5bn324fivbwdcaj55kvw7cb2zq9pafmlmv3qwwx7s46";
};
"aarch64-linux" = {
url = "http://haskell.org/ghc/dist/${version}/ghc-${version}-aarch64-deb8-linux.tar.xz";
sha256 = "61dab9c95ef9f9af8bce7338863fda3e42945eb46194b12d922b6d0dc245d0c2";
sha256 = "1k2amylcp1ad67c75h1pqf7czf9m0zj1i7hdc45ghjklnfq9hrk7";
};
"x86_64-darwin" = {
url = "http://haskell.org/ghc/dist/${version}/ghc-${version}-x86_64-apple-darwin.tar.xz";
sha256 = "900c802025fb630060dbd30f9738e5d107a4ca5a50d5c1262cd3e69fe4467188";
sha256 = "09swx71gh5habzbx55shz2xykgr96xkcy09nzinnm4z0yxicy3zr";
};
}.${stdenv.hostPlatform.system}
or (throw "cannot bootstrap GHC on this platform"));
16 changes: 8 additions & 8 deletions pkgs/top-level/haskell-packages.nix
View file
Original file line number Diff line number Diff line change
@@ -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;
};