diff options
author | Peter Simons <simons@cryp.to> | 2018-03-03 11:44:27 +0100 |
---|---|---|
committer | Peter Simons <simons@cryp.to> | 2018-03-03 11:44:27 +0100 |
commit | 700a717ce9dfaab521635db28fc696f18391e166 (patch) | |
tree | b31d3e54b7c05457831fccf3a47b245b6c26796b /pkgs | |
parent | 57fef3d9786e89e7e75530820f3828d05c4dffd4 (diff) |
stack: fix build with GHC 8.0.x
Diffstat (limited to 'pkgs')
-rw-r--r-- | pkgs/development/haskell-modules/configuration-common.nix | 12 | ||||
-rw-r--r-- | pkgs/development/haskell-modules/configuration-ghc-8.0.x.nix | 2 |
2 files changed, 6 insertions, 8 deletions
diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index f5f3f7fc1fadf..61a8252b00eeb 100644 --- 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 index 19a0cb6f87dbd..0a204a684af83 100644 --- 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; }); } |