about summary refs log tree commit diff
diff options
context:
space:
mode:
authorPeter Simons <simons@cryp.to>2016-05-28 13:53:04 +0200
committerPeter Simons <simons@cryp.to>2016-05-31 22:09:56 +0200
commit2d1e907c61923c053bc61baa8021c149e43f4af0 (patch)
tree3d1fd2430532ea432f0b23befb0949d7eb5cdd7d
parent7e7c4ff779da96a2cf138f639a521d9c56794889 (diff)
downloadnixlib-2d1e907c61923c053bc61baa8021c149e43f4af0.tar
nixlib-2d1e907c61923c053bc61baa8021c149e43f4af0.tar.gz
nixlib-2d1e907c61923c053bc61baa8021c149e43f4af0.tar.bz2
nixlib-2d1e907c61923c053bc61baa8021c149e43f4af0.tar.lz
nixlib-2d1e907c61923c053bc61baa8021c149e43f4af0.tar.xz
nixlib-2d1e907c61923c053bc61baa8021c149e43f4af0.tar.zst
nixlib-2d1e907c61923c053bc61baa8021c149e43f4af0.zip
Fix LTS Haskell version of aeson.
-rw-r--r--pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix4
1 files changed, 1 insertions, 3 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 d47d8ca79c7e..5ffda7f28082 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix
@@ -63,9 +63,6 @@ self: super: {
   nats = dontHaddock super.nats;
   bytestring-builder = dontHaddock super.bytestring-builder;
 
-  # We have time 1.5
-  aeson = disableCabalFlag super.aeson "old-locale";
-
   # requires filepath >=1.1 && <1.4
   Glob = doJailbreak super.Glob;
 
@@ -198,6 +195,7 @@ self: super: {
   hackage-security = dontHaddock (dontCheck super.hackage-security);
 
   # GHC versions prior to 8.x require additional build inputs.
+  aeson = disableCabalFlag (addBuildDepend super.aeson self.semigroups) "old-locale";
   case-insensitive = addBuildDepend super.case-insensitive self.semigroups;
   semigroups = addBuildDepends super.semigroups (with self; [hashable tagged text unordered-containers]);