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: 4a599a688eef
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 85c884278e3c
Choose a head ref
  • 9 commits
  • 1 file changed
  • 1 contributor

Commits on Jul 13, 2017

  1. haskell-hspec-meta: use latest version when compiling with ghc-8.2.x 

    Fixes hspec/hspec#323.
    @peti
    peti committed Jul 13, 2017

    Verified

    This commit was signed with the committer’s verified signature.
    slawekjaranowski Slawomir Jaranowski
    GPG key ID: 9EB80E92EB2135B1
    Verified
    Learn about vigilant mode
    Copy the full SHA
    e59c532 View commit details

  2. haskell-ChasingBottoms: jailbreak to fix build with ghc-8.2.x

    @peti
    peti committed Jul 13, 2017
    Copy the full SHA
    f980dbe View commit details

  3. haskell-doctest: remove obsolete jailbreak; ghc-8.2.x can build this … 

    …package now
    @peti
    peti committed Jul 13, 2017
    Copy the full SHA
    0ee5424 View commit details

  4. haskell-base-orphans: disable test suite to avoid build failures with… 

    … ghc-8.2.x
    @peti
    peti committed Jul 13, 2017
    Copy the full SHA
    26762f1 View commit details

  5. haskell-jailbreak-cabal: use stable version from ghc-8.0.x in ghc-8.2… 

    ….x package set

The version compiled with Cabal 2.x breaks many packages, like doctest and
hashable. This needs further investigation.
    @peti
    peti committed Jul 13, 2017
    Copy the full SHA
    2180d2c View commit details

  6. haskell-hashable: jailbreak to fix build with ghc-8.2.x

    @peti
    peti committed Jul 13, 2017
    Copy the full SHA
    bde4ef2 View commit details

  7. haskell-base-orphans: use latest version when compiling with ghc-8.2.x

    @peti
    peti committed Jul 13, 2017
    Copy the full SHA
    c6ccfcd View commit details

  8. haskell-semigroupoids: use latest version when compiling with ghc-8.2.x

    @peti
    peti committed Jul 13, 2017
    Copy the full SHA
    559b1b7 View commit details

  9. haskell-lens: use latest version when compiling with ghc-8.2.x

    @peti
    peti committed Jul 13, 2017
    Copy the full SHA
    85c8842 View commit details
Showing with 9 additions and 4 deletions.
  1. +9 −4 pkgs/development/haskell-modules/configuration-ghc-8.2.x.nix
13 changes: 9 additions & 4 deletions pkgs/development/haskell-modules/configuration-ghc-8.2.x.nix
View file
Original file line number Diff line number Diff line change
@@ -39,8 +39,8 @@ self: super: {
# cabal-install can use the native Cabal library.
cabal-install = super.cabal-install.override { Cabal = null; };

# jailbreak-cabal can use the native Cabal library.
jailbreak-cabal = super.jailbreak-cabal.override { Cabal = null; };
# jailbreak-cabal doesn't seem to work right with the native Cabal version.
jailbreak-cabal = pkgs.haskellPackages.jailbreak-cabal;

# https://github.com/bmillwood/applicative-quoters/issues/6
applicative-quoters = appendPatch super.applicative-quoters (pkgs.fetchpatch {
@@ -60,11 +60,16 @@ self: super: {
ghc-syb-utils = dontCheck super.ghc-syb-utils;

# Older, LTS-8-based versions don't compile.
vector = super.vector_0_12_0_1;
base-orphans = self.base-orphans_0_6;
hspec-meta = self.hspec-meta_2_4_4;
lens = self.lens_4_15_3;
primitive = self.primitive_0_6_2_0;
semigroupoids = self.semigroupoids_5_2;
syb = self.syb_0_7;
vector = super.vector_0_12_0_1;

# Work around overly restrictive constraints on the version of 'base'.
doctest = doJailbreak super.doctest;
ChasingBottoms = doJailbreak super.ChasingBottoms;
hashable = doJailbreak super.hashable;

}