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

haskell-semigroups: fix build with ghc-7.10.x and earlier

Browse Source
This commit is contained in:
Peter Simons 2017-08-23 14:30:10 +02:00
parent 074581c1a4
commit 5f9645ef2e
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -196,7 +196,7 @@ self: super: {
lens = addBuildDepend super.lens self.generic-deriving; lens = addBuildDepend super.lens self.generic-deriving;
optparse-applicative = addBuildDepend super.optparse-applicative self.semigroups; optparse-applicative = addBuildDepend super.optparse-applicative self.semigroups;
QuickCheck = addBuildDepend super.QuickCheck self.semigroups; QuickCheck = addBuildDepend super.QuickCheck self.semigroups;
semigroups = addBuildDepends super.semigroups (with self; [hashable tagged text unordered-containers]); semigroups = addBuildDepends (dontCheck 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

2
pkgs/development/haskell-modules/configuration-ghc-7.8.x.nix
View File

@ -144,7 +144,7 @@ self: super: {
unordered-containers = dontCheck super.unordered-containers; unordered-containers = dontCheck super.unordered-containers;
# Needs additional inputs on old compilers. # Needs additional inputs on old compilers.
semigroups = addBuildDepends super.semigroups (with self; [nats tagged unordered-containers]); semigroups = addBuildDepends (dontCheck super.semigroups) (with self; [nats tagged unordered-containers]);
lens = addBuildDepends super.lens (with self; [doctest generic-deriving nats simple-reflect]); lens = addBuildDepends super.lens (with self; [doctest generic-deriving nats simple-reflect]);
distributive = addBuildDepend (dontCheck super.distributive) self.semigroups; distributive = addBuildDepend (dontCheck super.distributive) self.semigroups;
QuickCheck = addBuildDepends super.QuickCheck (with self; [nats semigroups]); QuickCheck = addBuildDepends super.QuickCheck (with self; [nats semigroups]);