diff options
| author | Peter Simons <simons@cryp.to> | 2017-01-17 13:28:28 +0100 |
|---|---|---|
| committer | Peter Simons <simons@cryp.to> | 2017-01-18 09:54:12 +0100 |
| commit | 8f5937e36e9e3c46e90e668ada5436dbb7b558f4 (patch) | |
| tree | 574eec7a51cc2770d3e8216a448fa6d6e9d2b555 /pkgs/development/haskell-modules | |
| parent | 73e221992717a95777710a841134f43781240bba (diff) | |
| download | nixlib-8f5937e36e9e3c46e90e668ada5436dbb7b558f4.tar nixlib-8f5937e36e9e3c46e90e668ada5436dbb7b558f4.tar.gz nixlib-8f5937e36e9e3c46e90e668ada5436dbb7b558f4.tar.bz2 nixlib-8f5937e36e9e3c46e90e668ada5436dbb7b558f4.tar.lz nixlib-8f5937e36e9e3c46e90e668ada5436dbb7b558f4.tar.xz nixlib-8f5937e36e9e3c46e90e668ada5436dbb7b558f4.tar.zst nixlib-8f5937e36e9e3c46e90e668ada5436dbb7b558f4.zip | |
haskell-distributive: fix build with ghc versions prior to 8.x
Diffstat (limited to 'pkgs/development/haskell-modules')
3 files changed, 4 insertions, 4 deletions
diff --git a/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix b/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix index 564ce3c04ecb..6263d38a2bbf 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix @@ -103,8 +103,6 @@ self: super: { license = pkgs.stdenv.lib.licenses.bsd3; }) {}; - mono-traversable = addBuildDepend super.mono-traversable self.semigroups; - # diagrams/monoid-extras#19 monoid-extras = overrideCabal super.monoid-extras (drv: { prePatch = "sed -i 's|4\.8|4.9|' monoid-extras.cabal"; @@ -185,6 +183,8 @@ self: super: { hackage-security = dontHaddock (dontCheck super.hackage-security); # 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]); @@ -208,6 +208,4 @@ self: super: { # 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; }; - - } diff --git a/pkgs/development/haskell-modules/configuration-ghc-7.6.x.nix b/pkgs/development/haskell-modules/configuration-ghc-7.6.x.nix index 1c579b9d6e2c..ffd6845b1d05 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-7.6.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-7.6.x.nix @@ -99,6 +99,7 @@ self: super: { # Needs additional inputs on pre 7.10.x compilers. 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]); + distributive = addBuildDepend super.distributive self.semigroups; # Haddock doesn't cope with the new markup. bifunctors = dontHaddock super.bifunctors; diff --git a/pkgs/development/haskell-modules/configuration-ghc-7.8.x.nix b/pkgs/development/haskell-modules/configuration-ghc-7.8.x.nix index f74106898668..4b18332648db 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-7.8.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-7.8.x.nix @@ -142,6 +142,7 @@ self: super: { # Needs additional inputs on pre 7.10.x compilers. semigroups = addBuildDepends super.semigroups (with self; [nats tagged unordered-containers]); 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. bifunctors = dontHaddock super.bifunctors; |