From b5fb80ffa34999325919765a090422b28bd52ca6 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 20 Jan 2015 21:37:51 +0100
Subject: [PATCH] haskell-aeson: fix build with ghc 7.6.x

---
 .../configuration-ghc-7.6.x.nix               |  3 ++-
 .../haskell-modules/hackage-packages.nix      | 27 +++++++++++++++++++
 2 files changed, 29 insertions(+), 1 deletion(-)

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 e9bef1e6c9a..1a3216533c8 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-7.6.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-7.6.x.nix
@@ -51,6 +51,7 @@ self: super: {
   # Haddock chokes on the prologue from the cabal file.
   ChasingBottoms = dontHaddock super.ChasingBottoms;
 
-  # wizards = doJailbreak super.wizards;
+  # Later versions require a newer version of bytestring than we have.
+  aeson = self.aeson_0_7_0_6;
 
 }
diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix
index a690b82f17a..8dec0dfd8f5 100644
--- a/pkgs/development/haskell-modules/hackage-packages.nix
+++ b/pkgs/development/haskell-modules/hackage-packages.nix
@@ -16313,6 +16313,33 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "aeson_0_7_0_6" = callPackage
+    ({ mkDerivation, attoparsec, base, blaze-builder, bytestring
+     , containers, deepseq, dlist, ghc-prim, hashable, HUnit, mtl
+     , old-locale, QuickCheck, scientific, syb, template-haskell
+     , test-framework, test-framework-hunit, test-framework-quickcheck2
+     , text, time, unordered-containers, vector
+     }:
+     mkDerivation {
+       pname = "aeson";
+       version = "0.7.0.6";
+       sha256 = "0vsf9msz9iv7xvsnys5c0kbkldb0pvhiai02vz50b0d1kdsk2mb4";
+       editedCabalFile = "8b87a1343dd8d93d98e48e530f2ec14f5949fcdc96c8ecc81458a1d20defd001";
+       buildDepends = [
+         attoparsec base blaze-builder bytestring containers deepseq dlist
+         ghc-prim hashable mtl old-locale scientific syb template-haskell
+         text time unordered-containers vector
+       ];
+       testDepends = [
+         attoparsec base bytestring containers ghc-prim HUnit QuickCheck
+         template-haskell test-framework test-framework-hunit
+         test-framework-quickcheck2 text time unordered-containers vector
+       ];
+       homepage = "https://github.com/bos/aeson";
+       description = "Fast JSON parsing and encoding";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "aeson" = callPackage
     ({ mkDerivation, attoparsec, base, blaze-builder, bytestring
      , containers, deepseq, dlist, ghc-prim, hashable, HUnit, mtl