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

haskell-distributive: fix build with ghc versions prior to 8.x

Browse Source
This commit is contained in:
Peter Simons 2017-01-17 13:28:28 +01:00
parent 73e2219927
commit 8f5937e36e
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -103,8 +103,6 @@ self: super: {
license = pkgs.stdenv.lib.licenses.bsd3; license = pkgs.stdenv.lib.licenses.bsd3;
}) {}; }) {};
mono-traversable = addBuildDepend super.mono-traversable self.semigroups;
# diagrams/monoid-extras#19 # diagrams/monoid-extras#19
monoid-extras = overrideCabal super.monoid-extras (drv: { monoid-extras = overrideCabal super.monoid-extras (drv: {
prePatch = "sed -i 's|4\.8|4.9|' monoid-extras.cabal"; prePatch = "sed -i 's|4\.8|4.9|' monoid-extras.cabal";
@ -185,6 +183,8 @@ self: super: {
hackage-security = dontHaddock (dontCheck super.hackage-security); hackage-security = dontHaddock (dontCheck super.hackage-security);
# 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;
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]); Glob_0_7_10 = addBuildDepends super.Glob_0_7_10 (with self; [semigroups]);
@ -208,6 +208,4 @@ self: super: {
# 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; };
} }

1
pkgs/development/haskell-modules/configuration-ghc-7.6.x.nix
View File

@ -99,6 +99,7 @@ self: super: {
# Needs additional inputs on pre 7.10.x compilers. # Needs additional inputs on pre 7.10.x compilers.
semigroups = addBuildDepends super.semigroups (with self; [bytestring-builder nats tagged unordered-containers transformers]); semigroups = addBuildDepends super.semigroups (with self; [bytestring-builder nats tagged unordered-containers transformers]);
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 super.distributive self.semigroups;
# Haddock doesn't cope with the new markup. # Haddock doesn't cope with the new markup.
bifunctors = dontHaddock super.bifunctors; bifunctors = dontHaddock super.bifunctors;

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

@ -142,6 +142,7 @@ self: super: {
# Needs additional inputs on pre 7.10.x compilers. # Needs additional inputs on pre 7.10.x compilers.
semigroups = addBuildDepends super.semigroups (with self; [nats tagged unordered-containers]); semigroups = addBuildDepends 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 super.distributive self.semigroups;
# Haddock doesn't cope with the new markup. # Haddock doesn't cope with the new markup.
bifunctors = dontHaddock super.bifunctors; bifunctors = dontHaddock super.bifunctors;