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: 8f11b37a9567
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 31de7743f8a7
Choose a head ref
  • 6 commits
  • 8 files changed
  • 3 contributors

Commits on Nov 21, 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 @peti
    bhipple authored and peti committed Nov 21, 2018
    Copy the full SHA
    a475805 View commit details

  2. all-cabal-hashes: update to Hackage at 2018-11-19T08:07:53Z

    @peti
    peti committed Nov 21, 2018
    Copy the full SHA
    e911141 View commit details

  3. fltk: add version 1.4.x-r13121

    @chris-martin @peti
    chris-martin authored and peti committed Nov 21, 2018
    Copy the full SHA
    97cd07e View commit details

  4. hackage-packages.nix: automatic Haskell package set update 

    This update was generated by hackage2nix v2.11.1-13-g2103989 from Hackage revision
commercialhaskell/all-cabal-hashes@c669f71.
    @peti
    peti committed Nov 21, 2018
    Copy the full SHA
    f5cdb2d View commit details

  5. hspec-meta: update override to the latest version

    @peti
    peti committed Nov 21, 2018
    Copy the full SHA
    50ffe1d View commit details

  6. haskell-fltkhs: re-enable the build 

    #50828 makes an effort to fix this
package.
    @peti
    peti committed Nov 21, 2018
    Copy the full SHA
    31de774 View commit details
4 changes: 2 additions & 2 deletions pkgs/data/misc/hackage/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{ fetchurl }:

fetchurl {
url = "https://github.com/commercialhaskell/all-cabal-hashes/archive/1fba236a8a8f685aaf55029d20ab24d7e4cbc5ba.tar.gz";
sha256 = "0yy6ass2c0vn81pcvb0ksc1qh3hlw2q97937vp73jawghgwsy9qv";
url = "https://github.com/commercialhaskell/all-cabal-hashes/archive/3487551670de487866a34bd466b33b5146087882.tar.gz";
sha256 = "10kag8qmlsnj3qwq0zxb6apd2z7jg17srvhsax5lgbwvlymbnckb";
}
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"));
5 changes: 0 additions & 5 deletions pkgs/development/haskell-modules/configuration-common.nix
View file
Original file line number Diff line number Diff line change
@@ -694,11 +694,6 @@ self: super: {
# We cannot build this package w/o the C library from <http://www.phash.org/>.
phash = markBroken super.phash;

# https://github.com/deech/fltkhs/issues/16
# linking fails because the build doesn't pull in the libGLU_combined libraries
fltkhs = markBroken super.fltkhs;
fltkhs-fluid-examples = dontDistribute super.fltkhs-fluid-examples;

# We get lots of strange compiler errors during the test suite run.
jsaddle = dontCheck super.jsaddle;

2 changes: 1 addition & 1 deletion pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix
View file
Original file line number Diff line number Diff line change
@@ -63,7 +63,7 @@ self: super: {
hspec-core = self.hspec-core_2_6_0;
hspec-discover = self.hspec-discover_2_6_0;
hspec-megaparsec = doJailbreak super.hspec-megaparsec; # newer versions need megaparsec 7.x
hspec-meta = self.hspec-meta_2_5_6;
hspec-meta = self.hspec-meta_2_6_0;
JuicyPixels = self.JuicyPixels_3_3_2;
lens = self.lens_4_17;
megaparsec = dontCheck (doJailbreak super.megaparsec);
Loading