haskell-stack: clean up deep overrides

NixOS · Jun 19, 2019 · f399f89 · f399f89
1 parent 3a1a49c
commit f399f89
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
@@ -1103,10 +1103,11 @@ self: super: {
   stack = generateOptparseApplicativeCompletion "stack" (super.stack.overrideScope (self: super: {
     ansi-terminal = self.ansi-terminal_0_9_1;
     concurrent-output = self.concurrent-output_1_10_10; # needed for new ansi-terminal version
+    hi-file-parser = dontCheck (unmarkBroken super.hi-file-parser);  # Avoid depending on newer hspec versions.
+    http-download = dontCheck (unmarkBroken super.http-download);
+    pantry-tmp = dontCheck (unmarkBroken super.pantry-tmp);
     rio = self.rio_0_1_9_2;
-    hi-file-parser = dontCheck super.hi-file-parser;    # Avoid depending on newer hspec versions.
-    http-download = dontCheck super.http-download;
-    pantry-tmp = dontCheck super.pantry-tmp;
+    rio-prettyprint  = unmarkBroken super.rio-prettyprint;
   }));
 
   # musl fixes

diff --git a/pkgs/development/haskell-modules/lib.nix b/pkgs/development/haskell-modules/lib.nix
@@ -161,6 +161,7 @@ rec {
   disableCabalFlag = drv: x: appendConfigureFlag (removeConfigureFlag drv "-f${x}") "-f-${x}";
 
   markBroken = drv: overrideCabal drv (drv: { broken = true; hydraPlatforms = []; });
+  unmarkBroken = drv: overrideCabal drv (drv: { broken = false; });
   markBrokenVersion = version: drv: assert drv.version == version; markBroken drv;
 
   enableLibraryProfiling = drv: overrideCabal drv (drv: { enableLibraryProfiling = true; });