From 2da7e03ed778b12b48f0959aa3179f7b16c27939 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 6 Oct 2014 11:29:44 +0200
Subject: [PATCH] cabal2nix: fix build with old versions of GHC

---
 pkgs/development/tools/haskell/cabal2nix/default.nix | 2 +-
 pkgs/top-level/haskell-defaults.nix                  | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/tools/haskell/cabal2nix/default.nix b/pkgs/development/tools/haskell/cabal2nix/default.nix
index 07ba2a4a09e..044ebfad434 100644
--- a/pkgs/development/tools/haskell/cabal2nix/default.nix
+++ b/pkgs/development/tools/haskell/cabal2nix/default.nix
@@ -14,7 +14,7 @@ cabal.mkDerivation (self: {
     Cabal filepath hackageDb mtl regexPosix transformers
   ];
   testDepends = [ doctest ];
-  doCheck = self.stdenv.lib.versionOlder "7.6" self.ghc.version;
+  doCheck = self.stdenv.lib.versionOlder "7.8" self.ghc.version;
   meta = {
     homepage = "http://github.com/NixOS/cabal2nix";
     description = "Convert Cabal files into Nix build instructions";
diff --git a/pkgs/top-level/haskell-defaults.nix b/pkgs/top-level/haskell-defaults.nix
index 4fcab8e9d6d..eb3b3a39d24 100644
--- a/pkgs/top-level/haskell-defaults.nix
+++ b/pkgs/top-level/haskell-defaults.nix
@@ -37,6 +37,7 @@
     attoparsec = self.attoparsec_0_11_3_1;
     binaryConduit = super.binaryConduit.override { binary = self.binary_0_7_2_1; };
     bson = super.bson.override { dataBinaryIeee754 = self.dataBinaryIeee754.override { binary = self.binary_0_7_2_1; }; };
+    cabal2nix = super.cabal2nix.override { hackageDb = super.hackageDb.override { Cabal = self.Cabal_1_18_1_3; }; };
     criterion = super.criterion.override {
       statistics = self.statistics.override {
         vectorBinaryInstances = self.vectorBinaryInstances.override { binary = self.binary_0_7_2_1; };