From e1a67915f836e7e470dc8cf09b15a16164327397 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 5 Sep 2017 09:07:53 +0200 Subject: [PATCH] haskell-happy: use 1.19.7 version (despite lts-9) to fix test suite failure --- pkgs/development/haskell-modules/configuration-common.nix | 4 ---- .../haskell-modules/configuration-hackage2nix.yaml | 2 +- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 25054d65e297..2db821d80ac8 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -900,8 +900,4 @@ self: super: { sha256 = "1vss7b99zrhw3r29krl1b60r4qk0m2mpwmrz8q8zdxrh33hb8pd7"; }); - # Has extra data files which are referred to from the binary output, - # creating a store reference cycle. Putting data in separate output - # solves the problem. - happy = overrideCabal super.happy (drv: { enableSeparateDataOutput = true; }); } diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml index 511ecc578163..28e7532f1c46 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml @@ -962,7 +962,7 @@ default-package-overrides: - happstack-jmacro ==7.0.12 - happstack-server ==7.4.6.4 - happstack-server-tls ==7.1.6.4 - - happy ==1.19.6 + - happy >1.19.6 - harp ==0.4.2 - hasbolt ==0.1.2.1 - hashable ==1.2.6.1