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: e292d166e8e8
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: d2e8ded9a1b9
Choose a head ref
  • 5 commits
  • 1 file changed
  • 2 contributors

Commits on Feb 27, 2017

  1. haskell: ghc710x packages: remove obsolete configurations

    @ljli
    ljli committed Feb 27, 2017
    Copy the full SHA
    172a2bb View commit details

  2. haskell: add semigroups dependency to Quickcheck for GHC < 8

    @ljli
    ljli committed Feb 27, 2017
    Copy the full SHA
    1aa6d77 View commit details

  3. haskell: break dependency cycle between QuickCheck and semigroups for… 

    … GHC < 8

The cycle:
QuickCheck -> semigroups
semigroups -> hashable
semigroups -> unordered-containers
unordered-containers -> hashable
unordered-containers -> QuickCheck # test suite only
hashable -> QuickCheck # test suite only
    @ljli
    ljli committed Feb 27, 2017
    Copy the full SHA
    24c9361 View commit details

  4. haskell: add semigroups dependency to optparse-applicative for GHC < 8

    @ljli
    ljli committed Feb 27, 2017
    Copy the full SHA
    386ddc7 View commit details

  5. Merge pull request #23250 from ljli/ghc710-pkgs-fixes 

    haskell: ghc710 packages cleanup
    @peti
    peti authored Feb 27, 2017
    Copy the full SHA
    d2e8ded View commit details
Showing with 6 additions and 4 deletions.
  1. +6 −4 pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix
10 changes: 6 additions & 4 deletions pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix
View file
Original file line number Diff line number Diff line change
@@ -182,28 +182,30 @@ self: super: {
# https://github.com/well-typed/hackage-security/issues/158
hackage-security = dontHaddock (dontCheck super.hackage-security);

# Breaks a dependency cycle between QuickCheck and semigroups
hashable = dontCheck super.hashable;
unordered-containers = dontCheck super.unordered-containers;

# GHC versions prior to 8.x require additional build inputs.
distributive = addBuildDepend super.distributive self.semigroups;
mono-traversable = addBuildDepend super.mono-traversable self.semigroups;
attoparsec = addBuildDepends super.attoparsec (with self; [semigroups fail]);
Glob = addBuildDepends super.Glob (with self; [semigroups]);
Glob_0_7_10 = addBuildDepends super.Glob_0_7_10 (with self; [semigroups]);
aeson = disableCabalFlag (addBuildDepend super.aeson self.semigroups) "old-locale";
aeson_0_11_2_0 = disableCabalFlag (addBuildDepend super.aeson_0_11_2_0 self.semigroups) "old-locale";
bytes = addBuildDepend super.bytes self.doctest;
case-insensitive = addBuildDepend super.case-insensitive self.semigroups;
hoauth2 = overrideCabal super.hoauth2 (drv: { testDepends = (drv.testDepends or []) ++ [ self.wai self.warp ]; });
hslogger = addBuildDepend super.hslogger self.HUnit;
intervals = addBuildDepends super.intervals (with self; [doctest QuickCheck]);
lens = addBuildDepends super.lens (with self; [doctest generic-deriving nats simple-reflect]);
optparse-applicative = addBuildDepend super.optparse-applicative self.semigroups;
QuickCheck = addBuildDepend super.QuickCheck self.semigroups;
semigroups = addBuildDepends super.semigroups (with self; [hashable tagged text unordered-containers]);
semigroups_0_18_1 = addBuildDepends super.semigroups (with self; [hashable tagged text unordered-containers]);
texmath = addBuildDepend super.texmath self.network-uri;
yesod-auth-oauth2 = overrideCabal super.yesod-auth-oauth2 (drv: { testDepends = (drv.testDepends or []) ++ [ self.load-env self.yesod ]; });
# cereal must have `fail` in pre-ghc-8.0.x versions
# also tests require bytestring>=0.10.8.1
cereal = dontCheck (addBuildDepend super.cereal self.fail);
cereal_0_5_2_0 = dontCheck (addBuildDepend super.cereal_0_5_2_0 self.fail);

# Moved out from common as no longer the case for GHC8
ghc-mod = super.ghc-mod.override { cabal-helper = self.cabal-helper_0_6_3_1; };