From 6b6cf6942c7917854fb81a6368df8e28fed1d1a3 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 22 Jun 2017 20:42:25 +0200 Subject: [PATCH] haskell-optparse-applicative: fix build with pre-8.0.x versions of GHC --- .../haskell-modules/configuration-ghc-7.2.x.nix | 7 ++----- .../haskell-modules/configuration-ghc-7.4.x.nix | 3 ++- .../haskell-modules/configuration-ghc-7.6.x.nix | 3 ++- .../haskell-modules/configuration-ghc-7.8.x.nix | 3 ++- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-ghc-7.2.x.nix b/pkgs/development/haskell-modules/configuration-ghc-7.2.x.nix index b3f78e5b753d..421eaf832ed0 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-7.2.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-7.2.x.nix @@ -72,13 +72,10 @@ self: super: { # Newer versions require bytestring >=0.10. tar = super.tar_0_4_1_0; - # Needs void on pre 7.10.x compilers. + # These builds need additional dependencies on old compilers. conduit = addBuildDepend super.conduit self.void; - - # Needs tagged on pre 7.6.x compilers. reflection = addBuildDepend super.reflection self.tagged; - - # Needs nats on pre 7.6.x compilers. semigroups = addBuildDepend super.semigroups self.nats; + optparse-applicative = addBuildDepend super.optparse-applicative self.semigroups; } diff --git a/pkgs/development/haskell-modules/configuration-ghc-7.4.x.nix b/pkgs/development/haskell-modules/configuration-ghc-7.4.x.nix index 3b61b7bc065b..ec78e44211f2 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-7.4.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-7.4.x.nix @@ -97,8 +97,9 @@ self: super: { # Needs tagged on pre 7.6.x compilers. reflection = addBuildDepend super.reflection self.tagged; - # These builds Need additional dependencies on pre 7.6.x compilers. + # These builds need additional dependencies on old compilers. semigroups = addBuildDepends super.semigroups (with self; [nats bytestring-builder tagged unordered-containers transformers]); QuickCheck = addBuildDepends super.QuickCheck (with self; [nats semigroups]); + optparse-applicative = addBuildDepend super.optparse-applicative self.semigroups; } 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 4ef1aa562118..43ec45bf8217 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-7.6.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-7.6.x.nix @@ -93,12 +93,13 @@ self: super: { # Needs void on pre 7.10.x compilers. conduit = addBuildDepend super.conduit self.void; - # Needs additional inputs on pre 7.10.x compilers. + # Needs additional inputs on old 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; QuickCheck = addBuildDepend super.QuickCheck self.semigroups; void = addBuildDepends super.void (with self; [hashable semigroups]); + optparse-applicative = addBuildDepend super.optparse-applicative self.semigroups; # Need a newer version of Cabal to interpret their build instructions. cmdargs = addSetupDepend super.cmdargs self.Cabal_1_24_2_0; 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 1a151efcf382..a97cbfde4fc9 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-7.8.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-7.8.x.nix @@ -143,12 +143,13 @@ self: super: { hashable = dontCheck super.hashable; unordered-containers = dontCheck super.unordered-containers; - # Needs additional inputs on pre 7.10.x compilers. + # Needs additional inputs on old 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; QuickCheck = addBuildDepends super.QuickCheck (with self; [nats semigroups]); void = addBuildDepends super.void (with self; [hashable semigroups]); + optparse-applicative = addBuildDepend super.optparse-applicative self.semigroups; # Haddock doesn't cope with the new markup. bifunctors = dontHaddock super.bifunctors;