Merge branch 'master.upstream' into staging.upstream

1 files changed, 5 insertions, 11 deletions

diff --git a/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix b/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix
index 4d7ee0ff3d4..d8d1e3f499a 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix
@@ -90,10 +90,10 @@ self: super: {
 
   # Setup: At least the following dependencies are missing: base <4.8
   hspec-expectations = overrideCabal super.hspec-expectations (drv: {
-    patchPhase = "sed -i -e 's|base < 4.8|base|' hspec-expectations.cabal";
+    postPatch = "sed -i -e 's|base < 4.8|base|' hspec-expectations.cabal";
   });
   utf8-string = overrideCabal super.utf8-string (drv: {
-    patchPhase = "sed -i -e 's|base >= 3 && < 4.8|base|' utf8-string.cabal";
+    postPatch = "sed -i -e 's|base >= 3 && < 4.8|base|' utf8-string.cabal";
   });
   pointfree = doJailbreak super.pointfree;
 
@@ -178,15 +178,6 @@ self: super: {
             in addBuildDepends jsaddle' [ self.glib self.gtk3 self.webkitgtk3
                                           self.webkitgtk3-javascriptcore ];
 
-  # contacted maintainer by e-mail
-  cmdlib = markBrokenVersion "0.3.5" super.cmdlib;
-  darcs-fastconvert = dontDistribute super.darcs-fastconvert;
-  ivory-backend-c = dontDistribute super.ivory-backend-c;
-  ivory-bitdata = dontDistribute super.ivory-bitdata;
-  ivory-examples = dontDistribute super.ivory-examples;
-  ivory-hw = dontDistribute super.ivory-hw;
-  laborantin-hs = dontDistribute super.laborantin-hs;
-
   # https://github.com/cartazio/arithmoi/issues/1
   arithmoi = markBroken super.arithmoi;
   NTRU = dontDistribute super.NTRU;
@@ -281,4 +272,7 @@ self: super: {
   # https://github.com/haskell/haddock/issues/427
   haddock = dontCheck super.haddock;
 
+  # The tests in vty-ui do not build, but vty-ui itself builds.
+  vty-ui = enableCabalFlag super.vty-ui "no-tests";
+
 }