stack: fix build with GHC 8.0.x

NixOS · Mar 3, 2018 · 700a717 · 700a717
1 parent 57fef3d
commit 700a717
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 8 deletions.
diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
@@ -940,19 +940,17 @@ self: super: {
   weeder = super.weeder.override { extra = self.extra_1_6_4; };
   yaml_0_8_28 = (dontCheck super.yaml_0_8_28).override { aeson = self.aeson_1_2_4_0; };
 
-  stack = (super.stack.overrideScope (self: super: {
+  stack = super.stack.overrideScope (self: super: {
     aeson = self.aeson_1_2_4_0;
+    ansi-terminal = self.ansi-terminal_0_7_1_1;
+    ansi-wl-pprint = self.ansi-wl-pprint_0_6_8_2; # old versions don't accept current ansi-terminal
+    colour = dontCheck super.colour;  # necessary to avoid infinite loop with ansi-terminal
     extra = self.extra_1_6_4;
     hpack = self.hpack_0_27_0;
     path = self.path_0_6_1;
     path-io = self.path-io_1_3_3;
     unliftio = self.unliftio_0_2_4_0;
-  })).override {
-    # Avoiding the deep-override here saves us from dealing with an infinite
-    # recursion, because ansi-terminal is a dependency of the test suite of
-    # some dependencies of ansi-terminal.
-    ansi-terminal = self.ansi-terminal_0_7_1_1;
-  };
+  });
 
   cabal2nix = super.cabal2nix.overrideScope (self: super: {
     aeson = self.aeson_1_2_4_0;

diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.0.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.0.x.nix
@@ -58,6 +58,6 @@ self: super: {
 
   # These builds need the latest Cabal version.
   cabal2nix = super.cabal2nix.overrideScope (self: super: { Cabal = self.Cabal_2_0_1_1; });
-  stack = super.stack.override { Cabal = self.Cabal_2_0_1_1; };
+  stack = super.stack.overrideScope (self: super: { Cabal = self.Cabal_2_0_1_1; });
 
 }