From 7e2f1493b72a8ff400c34197dc37fea5b5b3ae0d Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sat, 10 Jan 2015 18:50:49 +0100
Subject: [PATCH] haskell-ng: update to jailbreak-cabal 1.2, which supports
 Cabal 1.22.x now

---
 .../haskell-modules/configuration-common.nix      |  1 -
 .../haskell-modules/configuration-ghc-7.9.x.nix   |  5 ++---
 .../haskell-modules/hackage-packages.nix          | 15 +++++++--------
 3 files changed, 9 insertions(+), 12 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index 1e987793fdf..05a5b50e87f 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -8,7 +8,6 @@ self: super: {
   Cabal_1_20_0_3 = overrideCabal super.Cabal_1_20_0_3 (drv: { doCheck = false; });
   Cabal_1_22_0_0 = overrideCabal super.Cabal_1_22_0_0 (drv: { doCheck = false; });
   cabal-install = overrideCabal (super.cabal-install.override { Cabal = self.Cabal_1_22_0_0; }) (drv: { doCheck = false; });
-  jailbreak-cabal = super.jailbreak-cabal.override { Cabal = self.Cabal_1_20_0_3; };
 
   # Break infinite recursions.
   digest = super.digest.override { inherit (pkgs) zlib; };
diff --git a/pkgs/development/haskell-modules/configuration-ghc-7.9.x.nix b/pkgs/development/haskell-modules/configuration-ghc-7.9.x.nix
index 341429bbc1d..77190c3f862 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-7.9.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-7.9.x.nix
@@ -30,9 +30,8 @@ self: super: {
   unix = null;
   xhtml = null;
 
-  # We cannot build jailbreak without Cabal 1.20.x, and we cannot build
-  # Cabal 1.20.x without jailbreak. Go figure. Let's use a sledgehammer.
-  jailbreak-cabal = pkgs.haskellngPackages.jailbreak-cabal;
+  # We have Cabal 1.22.x.
+  jailbreak-cabal = super.jailbreak-cabal.override { Cabal = null; };
 
   # GHC 7.10.x's Haddock binary cannot generate hoogle files.
   # https://ghc.haskell.org/trac/ghc/ticket/9921
diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix
index 7ea91824e8e..1467a47bf15 100644
--- a/pkgs/development/haskell-modules/hackage-packages.nix
+++ b/pkgs/development/haskell-modules/hackage-packages.nix
@@ -27462,8 +27462,8 @@ self: {
      }:
      mkDerivation {
        pname = "cipher-aes";
-       version = "0.2.9";
-       sha256 = "1nkrh8mrrh14zfhjz0lfidw0hw9c70hap9w24rvb14zgfnnasnlq";
+       version = "0.2.10";
+       sha256 = "1sglxv66byib2bcwhilcf4m4glhz02vxy2lxa0hvpwa9c0ifhcxz";
        buildDepends = [
          base byteable bytestring crypto-cipher-types securemem
        ];
@@ -27472,7 +27472,7 @@ self: {
          QuickCheck test-framework test-framework-quickcheck2
        ];
        configureFlags = [ "-fsupport_aesni" ];
-       homepage = "http://github.com/vincenthz/hs-cipher-aes";
+       homepage = "https://github.com/vincenthz/hs-cipher-aes";
        description = "Fast AES cipher implementation with advanced mode of operations";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -67263,9 +67263,8 @@ self: {
     ({ mkDerivation, base, Cabal }:
      mkDerivation {
        pname = "jailbreak-cabal";
-       version = "1.1";
-       sha256 = "0x0dkzfjsgqpjmldgami46ki9k7pgy7ll4slms0kdc89qryzp7dg";
-       editedCabalFile = "7fe251c9c0b2637b6e340eac33174fa3570218cbe2d92ec3df6ab4cf0a8387e7";
+       version = "1.2";
+       sha256 = "1lwghsykfjx4zmcxk615lkyckrngj6d5rfyizif8vn5pjksygdsr";
        isLibrary = false;
        isExecutable = true;
        buildDepends = [ base Cabal ];
@@ -109898,8 +109897,8 @@ self: {
      }:
      mkDerivation {
        pname = "typedquery";
-       version = "0.1.0.1";
-       sha256 = "18qx00rajs2li05ywd8bqqdfyg3d2wyza1jwrl1dh47bmhw049ll";
+       version = "0.1.0.2";
+       sha256 = "0l0fxhh1mq0801gb73pv531943i0iy5lm58hwyf5g6x6l50lj660";
        buildDepends = [
          aeson base bytestring haskell-src-meta parsec template-haskell text
          transformers