From 921bb64a6d34bf16ae20598e6cffef7ef07c9e2e Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 11 Jan 2015 13:22:56 +0100
Subject: [PATCH] haskell-ng: fix old Cabal builds

---
 .../haskell-modules/configuration-common.nix  |  2 ++
 .../haskell-modules/hackage-packages.nix      | 25 +++++++++++++++++++
 2 files changed, 27 insertions(+)

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index 91a9f063f03..284c6b5786b 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -5,6 +5,8 @@ with import ./lib.nix { inherit pkgs; };
 self: super: {
 
   # Some packages need a non-core version of Cabal.
+  Cabal_1_18_1_6 = doJailbreak (dontCheck super.Cabal_1_18_1_6);
+  Cabal_1_20_0_3 = doJailbreak (dontCheck super.Cabal_1_20_0_3);
   Cabal_1_22_0_0 = dontCheck super.Cabal_1_22_0_0;
   cabal-install = dontCheck (super.cabal-install.override { Cabal = self.Cabal_1_22_0_0; });
 
diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix
index dc5a47175dc..1945d5510b5 100644
--- a/pkgs/development/haskell-modules/hackage-packages.nix
+++ b/pkgs/development/haskell-modules/hackage-packages.nix
@@ -1865,6 +1865,31 @@ self: {
           opencv_legacy = null; opencv_ml = null; opencv_objdetect = null;
           opencv_video = null; };
 
+  "Cabal_1_18_1_6" = callPackage
+    ({ mkDerivation, array, base, bytestring, containers, deepseq
+     , directory, extensible-exceptions, filepath, HUnit, pretty
+     , process, QuickCheck, regex-posix, test-framework
+     , test-framework-hunit, test-framework-quickcheck2, time, unix
+     }:
+     mkDerivation {
+       pname = "Cabal";
+       version = "1.18.1.6";
+       sha256 = "15nn6f8bnqzy7pqxb45hdf30qid2hw608dcqgmwrcfrd8zrrvylw";
+       buildDepends = [
+         array base bytestring containers deepseq directory filepath pretty
+         process time unix
+       ];
+       testDepends = [
+         base bytestring directory extensible-exceptions filepath HUnit
+         process QuickCheck regex-posix test-framework test-framework-hunit
+         test-framework-quickcheck2 unix
+       ];
+       preCheck = "unset GHC_PACKAGE_PATH; export HOME=$NIX_BUILD_TOP";
+       homepage = "http://www.haskell.org/cabal/";
+       description = "A framework for packaging Haskell software";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "Cabal_1_20_0_3" = callPackage
     ({ mkDerivation, array, base, bytestring, containers, deepseq
      , directory, extensible-exceptions, filepath, HUnit, pretty