Merge remote-tracking branch 'upstream/master' into staging

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

@@ -22,8 +22,8 @@ self: super: {
   statistics = dontCheck super.statistics;
   text = dontCheck super.text;
 
-  # https://github.com/bartavelle/hruby/issues/10
-  hruby = addExtraLibrary super.hruby pkgs.ruby_2_1;
+  # The package doesn't compile with ruby 1.9, which is our default at the moment.
+  hruby = super.hruby.override { ruby = pkgs.ruby_2_1; };
 
   # Doesn't compile with lua 5.2.
   hslua = super.hslua.override { lua = pkgs.lua5_1; };
@@ -155,9 +155,11 @@ self: super: {
     patchPhase = "sed -i -e 's|random.*==.*|random|' -e 's|text.*>=.*,|text,|' -e s'|terminfo == .*|terminfo|' darcs.cabal";
   });
 
-  # The test suite imposes too narrow restrictions on the version of
-  # Cabal that can be used to build this package.
-  cabal-test-quickcheck = dontCheck super.cabal-test-quickcheck;
+  # Needs the latest version of QuickCheck to compile.
+  cabal-test-quickcheck = super.cabal-test-quickcheck.override { QuickCheck = self.QuickCheck_2_8_1; };
+
+  # https://github.com/massysett/rainbox/issues/1
+  rainbox = dontCheck super.rainbox;
 
   # https://github.com/techtangents/ablist/issues/1
   ABList = dontCheck super.ABList;

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

@@ -329,4 +329,9 @@ self: super: {
   seqid-streams_0_1_0 = markBroken super.seqid-streams_0_1_0;
   vector_0_10_9_3 = markBroken super.vector_0_10_9_3;
 
+  # https://github.com/bos/wreq/issues/61
+  wreq = markBrokenVersion "0.3.0.1" (dontCheck super.wreq);
+  wreq-sb = dontDistribute (dontCheck super.wreq-sb);
+  hipbot = dontDistribute super.hipbot;
+
 }

pkgs/development/haskell-modules/with-packages-wrapper.nix

@@ -1,6 +1,7 @@
-{ stdenv, lib, ghc, llvmPackages, packages, buildEnv
-, makeWrapper
-, ignoreCollisions ? false, withLLVM ? false }:
+{ stdenv, lib, ghc, llvmPackages, packages, buildEnv, makeWrapper
+, ignoreCollisions ? false, withLLVM ? false
+, postBuild ? ""
+}:
 
 # This wrapper works only with GHC 6.12 or later.
 assert lib.versionOlder "6.12" ghc.version || ghc.isGhcjs;
@@ -89,7 +90,7 @@ buildEnv {
 
     ${lib.optionalString hasLibraries "$out/bin/${ghcCommand}-pkg recache"}
     $out/bin/${ghcCommand}-pkg check
-  '';
+  '' + postBuild;
 } // {
   preferLocalBuild = true;
   inherit (ghc) version meta;