From 2d1e907c61923c053bc61baa8021c149e43f4af0 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 28 May 2016 13:53:04 +0200 Subject: [PATCH] Fix LTS Haskell version of aeson. --- pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix | 4 +--- 1 file changed, 1 insertion(+), 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 d47d8ca79c7..5ffda7f2808 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]);