From 267361434bab7910ecafb57da9068aa96cfa18ee Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 22 Jan 2015 17:30:05 +0100
Subject: [PATCH] haskell-ng: fix some builds (mostly by disabling their
 failing test suites)

---
 pkgs/development/haskell-modules/configuration-common.nix | 5 +++--
 .../haskell-modules/configuration-ghc-7.8.x.nix           | 3 +++
 pkgs/development/haskell-modules/hackage-packages.nix     | 8 ++++----
 3 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index 1d2af9da6d4c..9fb5f4956b37 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -231,7 +231,6 @@ self: super: {
   command-qq = dontCheck super.command-qq;              # http://hydra.cryp.to/build/499042/log/raw
   conduit-connection = dontCheck super.conduit-connection;
   craftwerk = dontCheck super.craftwerk;
-  crypto-pubkey = dontCheck super.crypto-pubkey;
   damnpacket = dontCheck super.damnpacket;              # http://hydra.cryp.to/build/496923/log
   Deadpan-DDP = dontCheck super.Deadpan-DDP;            # http://hydra.cryp.to/build/496418/log/raw
   DigitalOcean = dontCheck super.DigitalOcean;
@@ -370,7 +369,6 @@ self: super: {
   # Needs older versions of its dependencies.
   structured-haskell-mode = (dontJailbreak super.structured-haskell-mode).override {
     haskell-src-exts = self.haskell-src-exts_1_15_0_1;  # https://github.com/chrisdone/structured-haskell-mode/issues/90
-    descriptive = self.descriptive_0_0_2;               # https://github.com/chrisdone/structured-haskell-mode/issues/94
   };
 
   # Expect to find sendmail(1) in $PATH.
@@ -382,6 +380,9 @@ self: super: {
   # https://ghc.haskell.org/trac/ghc/ticket/9625
   vty = dontCheck super.vty;
 
+  # https://github.com/vincenthz/hs-crypto-pubkey/issues/20
+  crypto-pubkey = dontCheck super.crypto-pubkey;
+
 }
 // {
   # Not on Hackage yet.
diff --git a/pkgs/development/haskell-modules/configuration-ghc-7.8.x.nix b/pkgs/development/haskell-modules/configuration-ghc-7.8.x.nix
index 5f91e7ff30ea..1c8a024b9a7d 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-7.8.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-7.8.x.nix
@@ -61,6 +61,9 @@ self: super: {
   # Newer versions require mtl 2.2.x.
   mtl-prelude = self.mtl-prelude_1_0_2;
 
+  # The test suite pulls in mtl 2.2.x
+  command-qq = dontCheck super.command-qq;
+
 }
 
 // # packages relating to amazonka
diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix
index ef2adf5b7daf..8382f7bf665c 100644
--- a/pkgs/development/haskell-modules/hackage-packages.nix
+++ b/pkgs/development/haskell-modules/hackage-packages.nix
@@ -37145,8 +37145,8 @@ self: {
      }:
      mkDerivation {
        pname = "descriptive";
-       version = "0.3.0";
-       sha256 = "1nfi4895k9rlca0b6bakjr55690j7hkydagms7q9a44dw6px1m15";
+       version = "0.3.1";
+       sha256 = "1l7i40gr1501i1k76fp49flkpad6g0lc10i0waf6qkb6dwn2104n";
        buildDepends = [
          aeson base bifunctors containers mtl text transformers
        ];
@@ -59081,8 +59081,8 @@ self: {
      }:
      mkDerivation {
        pname = "hindent";
-       version = "4.2.4";
-       sha256 = "0jf4xh6j94vzw8pcf73gxrmgamw2hj9jmbmrfmxzmdkj6dy22b83";
+       version = "4.3.0";
+       sha256 = "0wlrhka9dk4b1vrp3x4wav3jhwzwka5acgmjad0ivkhi8259np9v";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [