haskell-text: fix build with GHC 7.6.x and earlier

4 files changed, 8 insertions, 10 deletions

diff --git a/pkgs/development/haskell-modules/configuration-ghc-7.0.x.nix b/pkgs/development/haskell-modules/configuration-ghc-7.0.x.nix
index 3edbc0d398bf..f2e09ee69d64 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-7.0.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-7.0.x.nix
@@ -64,21 +64,16 @@ self: super: {
   doctest = dontHaddock super.doctest;
   hsdns = dontHaddock super.hsdns;
 
-  # Needs hashable on pre 7.10.x compilers.
-  nats_1 = addBuildDepend super.nats_1 self.hashable;
-  nats = addBuildDepend super.nats self.hashable;
-
   # 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.
+  nats_1 = addBuildDepend super.nats_1 self.hashable;
+  nats = addBuildDepend super.nats self.hashable;
   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;
+  text = addBuildDepend super.text self.bytestring-builder;
 
   # Newer versions don't compile any longer.
   network_2_6_3_1 = dontCheck super.network_2_6_3_1;
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 75e0c9c0bcb2..b72f9e4c69fd 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-7.2.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-7.2.x.nix
@@ -77,6 +77,7 @@ self: super: {
   reflection = addBuildDepend super.reflection self.tagged;
   semigroups = addBuildDepend super.semigroups self.nats;
   optparse-applicative = addBuildDepend super.optparse-applicative self.semigroups;
+  text = addBuildDepend super.text self.bytestring-builder;
 
   # Newer versions don't compile any longer.
   network_2_6_3_1 = dontCheck super.network_2_6_3_1;
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 1b15f4f105be..cf5009242231 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-7.4.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-7.4.x.nix
@@ -101,6 +101,7 @@ self: super: {
   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;
+  text = addBuildDepend super.text self.bytestring-builder;
 
   # Newer versions don't compile any longer.
   network_2_6_3_1 = dontCheck super.network_2_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 ccb71773f2bf..021397de9726 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-7.6.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-7.6.x.nix
@@ -82,8 +82,9 @@ self: super: {
     postPatch = "sed -i -e 's|base ==4.8.*,|base,|' sandi.cabal";
   });
 
-  # blaze-builder requires an additional build input on older compilers.
+  # These packages require additional build inputs on older compilers.
   blaze-builder = addBuildDepend super.blaze-builder super.bytestring-builder;
+  text = addBuildDepend super.text self.bytestring-builder;
 
   # available convertible package won't build with the available
   # bytestring and ghc-mod won't build without convertible