diff --git a/pkgs/development/libraries/haskell/aeson/0.7.0.1.nix b/pkgs/development/libraries/haskell/aeson/0.7.0.1.nix index 551f62d0756..dd58c12473d 100644 --- a/pkgs/development/libraries/haskell/aeson/0.7.0.1.nix +++ b/pkgs/development/libraries/haskell/aeson/0.7.0.1.nix @@ -1,6 +1,7 @@ -{ cabal, attoparsec, deepseq, dlist, hashable, HUnit, mtl -, QuickCheck, scientific, syb, testFramework, testFrameworkHunit -, testFrameworkQuickcheck2, text, time, unorderedContainers, vector +{ cabal, attoparsec, blazeBuilder, deepseq, dlist, hashable, HUnit +, mtl, QuickCheck, scientific, syb, testFramework +, testFrameworkHunit, testFrameworkQuickcheck2, text, time +, unorderedContainers, vector }: cabal.mkDerivation (self: { @@ -8,8 +9,8 @@ cabal.mkDerivation (self: { version = "0.7.0.1"; sha256 = "17cwclxh2f2m0mvs867lfzrv14gd9grw8a9f8l95j3nd76y58kb3"; buildDepends = [ - attoparsec deepseq dlist hashable mtl scientific syb text time - unorderedContainers vector + attoparsec blazeBuilder deepseq dlist hashable mtl scientific syb + text time unorderedContainers vector ]; testDepends = [ attoparsec HUnit QuickCheck testFramework testFrameworkHunit diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index dd996a0d576..ba3f60d7246 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -527,7 +527,9 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x adjunctions = callPackage ../development/libraries/haskell/adjunctions {}; aeson_0_6_2_1 = callPackage ../development/libraries/haskell/aeson/0.6.2.1.nix {}; - aeson_0_7_0_1 = callPackage ../development/libraries/haskell/aeson/0.7.0.1.nix {}; + aeson_0_7_0_1 = callPackage ../development/libraries/haskell/aeson/0.7.0.1.nix { + blazeBuilder = if (pkgs.stdenv.lib.versionOlder ghc.version "7.6") then self.blazeBuilder else null; + }; aeson = self.aeson_0_6_2_1; aesonLens = callPackage ../development/libraries/haskell/aeson-lens {};