From dba09a202b69540be3c1780a9fde04ff84551aa2 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 19 Dec 2017 23:38:29 +0100 Subject: [PATCH] stack: jailbreak to fix broken build in LTS-10.x --- .../haskell-modules/configuration-common.nix | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 960cab95211..36e4765ef8b 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -961,14 +961,8 @@ self: super: { testToolDepends = drv.testToolDepends or [] ++ [pkgs.procps]; }); - # Newer hpack's needs newer HUnit, but we cannot easily override the version - # used in the build, so we take the easy way out and disable the test suite. - hpack_0_20_0 = dontCheck super.hpack_0_20_0; - - # Stack 1.6.1 needs newer versions than LTS-9 provides. - stack = super.stack.overrideScope (self: super: { - hpack = super.hpack_0_20_0; - }); + # https://github.com/fpco/stackage/issues/3126 + stack = doJailbreak super.stack; # Hoogle needs a newer version than lts-10 provides. hoogle = super.hoogle.override { haskell-src-exts = self.haskell-src-exts_1_20_1; };