Merge branch 'master' into staging

pkgs/development/haskell-modules/configuration-common.nix

@@ -494,6 +494,9 @@ self: super: {
   # https://github.com/joeyadams/haskell-stm-delay/issues/3
   stm-delay = dontCheck super.stm-delay;
 
+  # https://github.com/cgaebel/stm-conduit/issues/33
+  stm-conduit = dontCheck super.stm-conduit;
+
   # https://github.com/fumieval/call/issues/3
   call = markBrokenVersion "0.1.2" super.call;
   rhythm-game-tutorial = dontDistribute super.rhythm-game-tutorial;     # depends on call
@@ -678,9 +681,6 @@ self: super: {
   # https://github.com/prowdsponsor/esqueleto/issues/93
   esqueleto = dontCheck super.esqueleto;
 
-  # https://github.com/anchor/ceilometer-common/issues/16
-  ceilometer-common = dontCheck super.ceilometer-common;
-
   # https://github.com/fumieval/audiovisual/issues/1
   audiovisual = markBroken super.audiovisual;
 
@@ -714,6 +714,14 @@ self: super: {
     '';
   });
 
+  # Uses OpenGL in testing
+  caramia = dontCheck super.caramia;
+
+  llvm-general = super.llvm-general.override { llvm-config = pkgs.llvmPackages_34.llvm; };
+
+  # Tries to run GUI in tests
+  leksah = dontCheck super.leksah;
+
 } // {
 
   # Not on Hackage.

pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix

@@ -134,9 +134,22 @@ self: super: {
     '';
   });
 
+  # see: https://github.com/jaspervdj/hakyll/issues/343
+  hakyll = overrideCabal super.hakyll (drv: {
+    buildDepends = drv.buildDepends ++ [ self.time-locale-compat ];
+    patches = [
+      (pkgs.fetchpatch {
+         url = "https://github.com/jaspervdj/hakyll/pull/344.patch";
+         sha256 = "130c0icw3cj209p219siaq0n8avmm0fpmph0iyjgx67w62sffrli";
+      })
+    ];
+  });
+
   # Cabal_1_22_1_1 requires filepath >=1 && <1.4
   cabal-install = dontCheck (super.cabal-install.override { Cabal = null; });
 
+  HStringTemplate = self.HStringTemplate_0_8_3;
+
   # We have Cabal 1.22.x.
   jailbreak-cabal = super.jailbreak-cabal.override { Cabal = null; };
 
@@ -170,6 +183,7 @@ self: super: {
     patchPhase = "sed -i -e 's|base >= 3 && < 4.8|base|' utf8-string.cabal";
   });
   esqueleto = doJailbreak super.esqueleto;
+  pointfree = doJailbreak super.pointfree;
 
   # bos/attoparsec#92
   attoparsec = dontCheck super.attoparsec;
@@ -215,23 +229,14 @@ self: super: {
   });
 
   wl-pprint = overrideCabal super.wl-pprint (drv: {
-    patchPhase = "sed -i '113iimport Prelude hiding ((<$>))' Text/PrettyPrint/Leijen.hs";
-  });
-
-  wl-pprint-text = overrideCabal super.wl-pprint-text (drv: {
-    patchPhase = ''
-      sed -i '71iimport Prelude hiding ((<$>))' Text/PrettyPrint/Leijen/Text/Monadic.hs
-      sed -i '119iimport Prelude hiding ((<$>))' Text/PrettyPrint/Leijen/Text.hs
-    '';
+    postPatch = "sed -i '113iimport Prelude hiding ((<$>))' Text/PrettyPrint/Leijen.hs";
+    jailbreak = true;
   });
 
   # https://github.com/kazu-yamamoto/unix-time/issues/30
   unix-time = dontCheck super.unix-time;
 
   # Until the changes have been pushed to Hackage
-  haskell-src-meta = overrideCabal (doJailbreak (appendPatch super.haskell-src-meta ./haskell-src-meta-ghc710.patch)) (drv: {
-    prePatch = "sed -i -e 's|template-haskell [^,]\\+|template-haskell|' haskell-src-meta.cabal && cat haskell-src-meta.cabal";
-  });
   mono-traversable = appendPatch super.mono-traversable (pkgs.fetchpatch {
     url = "https://github.com/snoyberg/mono-traversable/pull/68.patch";
     sha256 = "11hqf6hi3sc34wl0fn4rpigdf7wfklcjv6jwp8c3129yphg8687h";
@@ -240,10 +245,13 @@ self: super: {
     url = "https://github.com/fpco/conduit-combinators/pull/16.patch";
     sha256 = "0jpwpi3shdn5rms3lcr4srajbhhfp5dbwy7pl23c9kmlil3d9mk3";
   });
-  yesod-bin = appendPatch super.yesod-bin (pkgs.fetchpatch {
-    url = "https://github.com/yesodweb/yesod/pull/966.patch";
-    sha256 = "0mm4swyn7qh30hw7ya8ykz5qvsd4ni4vmipq364yqbsi9ysrc6nb";
-    stripLen = 1;
+  annotated-wl-pprint = appendPatch super.annotated-wl-pprint (pkgs.fetchpatch {
+    url = "https://patch-diff.githubusercontent.com/raw/david-christiansen/annotated-wl-pprint/pull/2.patch";
+    sha256 = "0n0fbq3vd7b9kfmhg089q0dy40vawq4q88il3zc9ybivhi62nwv4";
+  });
+  ghc-events = appendPatch super.ghc-events (pkgs.fetchpatch {
+    url = "https://patch-diff.githubusercontent.com/raw/haskell/ghc-events/pull/8.patch";
+    sha256 = "1k881jrvzfvs761jgfhf5nsbmbc33c9333l4s0f5088p46ff2n1l";
   });
 
   ghcjs-prim = self.callPackage ({ mkDerivation, fetchgit, primitive }: mkDerivation {

pkgs/development/haskell-modules/configuration-ghc-7.8.x.nix

@@ -73,6 +73,15 @@ self: super: {
   mtl-prelude = self.mtl-prelude_1_0_3;
   equivalence = super.equivalence_0_2_5;        # required by Agda
 
+  # purescript requires mtl 2.2.x.
+  purescript = overrideCabal (super.purescript.overrideScope (self: super: {
+    mkDerivation = drv: super.mkDerivation (drv // { doCheck = false; });
+    mtl = super.mtl_2_2_1;
+    transformers = super.transformers_0_4_3_0;
+    haskeline = self.haskeline_0_7_2_1;
+    transformers-compat = disableCabalFlag super.transformers-compat "three";
+  })) (drv: {});
+
   # The test suite pulls in mtl 2.2.x
   command-qq = dontCheck super.command-qq;
 
@@ -96,7 +105,6 @@ self: super: {
   highlighter2 = markBroken super.highlighter2;
   hypher = markBroken super.hypher;
   miniforth = markBroken super.miniforth;
-  purescript = markBroken super.purescript;
   xhb-atom-cache = markBroken super.xhb-atom-cache;
   xhb-ewmh = markBroken super.xhb-ewmh;
   yesod-purescript = markBroken super.yesod-purescript;

pkgs/development/haskell-modules/configuration-ghcjs.nix

@@ -7,7 +7,7 @@ self: super: {
   # LLVM is not supported on this GHC; use the latest one.
   inherit (pkgs) llvmPackages;
 
-  jailbreak-cabal = pkgs.haskell-ng.packages.ghc7101.jailbreak-cabal;
+  inherit (pkgs.haskell-ng.packages.ghc7101) jailbreak-cabal alex happy;
 
   # Many packages fail with:
   #   haddock: internal error: expectJust getPackageDetails
@@ -95,16 +95,7 @@ self: super: {
     '';
   });
 
-  "ghcjs-dom" = self.callPackage
-    ({ mkDerivation, base, mtl, text, ghcjs-base
-     }:
-     mkDerivation {
-       pname = "ghcjs-dom";
-       version = "0.1.1.3";
-       sha256 = "0pdxb2s7fflrh8sbqakv0qi13jkn3d0yc32xhg2944yfjg5fvlly";
-       buildDepends = [ base mtl text ghcjs-base ];
-       description = "DOM library that supports both GHCJS and WebKitGTK";
-       license = pkgs.stdenv.lib.licenses.mit;
-       hydraPlatforms = pkgs.stdenv.lib.platforms.none;
-     }) {};
+  ghcjs-dom = overrideCabal super.ghcjs-dom (drv: {
+    buildDepends = [ self.base self.mtl self.text self.ghcjs-base ];
+  });
 }