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

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

Browse Source 
haskell: ghc710 packages cleanup
This commit is contained in:
Peter Simons 2017-02-27 21:35:48 +01:00 committed by GitHub
commit d2e8ded9a1
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix
View File

@ -182,28 +182,30 @@ self: super: {
# https://github.com/well-typed/hackage-security/issues/158 # https://github.com/well-typed/hackage-security/issues/158
hackage-security = dontHaddock (dontCheck super.hackage-security); 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. # GHC versions prior to 8.x require additional build inputs.
distributive = addBuildDepend super.distributive self.semigroups; distributive = addBuildDepend super.distributive self.semigroups;
mono-traversable = addBuildDepend super.mono-traversable self.semigroups; mono-traversable = addBuildDepend super.mono-traversable self.semigroups;
attoparsec = addBuildDepends super.attoparsec (with self; [semigroups fail]); attoparsec = addBuildDepends super.attoparsec (with self; [semigroups fail]);
Glob = addBuildDepends super.Glob (with self; [semigroups]); 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 = 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; bytes = addBuildDepend super.bytes self.doctest;
case-insensitive = addBuildDepend super.case-insensitive self.semigroups; case-insensitive = addBuildDepend super.case-insensitive self.semigroups;
hoauth2 = overrideCabal super.hoauth2 (drv: { testDepends = (drv.testDepends or []) ++ [ self.wai self.warp ]; }); hoauth2 = overrideCabal super.hoauth2 (drv: { testDepends = (drv.testDepends or []) ++ [ self.wai self.warp ]; });
hslogger = addBuildDepend super.hslogger self.HUnit; hslogger = addBuildDepend super.hslogger self.HUnit;
intervals = addBuildDepends super.intervals (with self; [doctest QuickCheck]); intervals = addBuildDepends super.intervals (with self; [doctest QuickCheck]);
lens = addBuildDepends super.lens (with self; [doctest generic-deriving nats simple-reflect]); 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 = 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; 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 ]; }); 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 # cereal must have `fail` in pre-ghc-8.0.x versions
# also tests require bytestring>=0.10.8.1 # also tests require bytestring>=0.10.8.1
cereal = dontCheck (addBuildDepend super.cereal self.fail); 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 # 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; }; ghc-mod = super.ghc-mod.override { cabal-helper = self.cabal-helper_0_6_3_1; };