From ebe5bea58f8036adf95ca2bf33aeedd639d62b10 Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Tue, 24 Dec 2024 00:09:48 +0100 Subject: [PATCH] jacinda: build with happy-2.1.3 --- pkgs/development/haskell-modules/configuration-common.nix | 2 +- pkgs/development/haskell-modules/configuration-nix.nix | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 24196f1fcd6015..1092591c4865e8 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -169,7 +169,7 @@ self: super: { # jacinda needs latest version of alex and happy jacinda = super.jacinda.override { alex = self.alex_3_5_1_0; - happy = self.happy_2_1_2; + happy = self.happy_2_1_3; }; # 2024-07-09: rhine 1.4.* needs newer monad-schedule than stackage (and is only consumer) diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix index 5020e3b2e95477..806e0b91ba784f 100644 --- a/pkgs/development/haskell-modules/configuration-nix.nix +++ b/pkgs/development/haskell-modules/configuration-nix.nix @@ -1341,12 +1341,12 @@ self: super: builtins.intersectAttrs super { # Test have become more fussy in >= 2.0. We need to have which available for # tests to succeed and the makefile no longer finds happy by itself. - happy_2_1_2 = overrideCabal (drv: { + happy_2_1_3 = overrideCabal (drv: { buildTools = drv.buildTools or [ ] ++ [ pkgs.buildPackages.which ]; preCheck = drv.preCheck or "" + '' export PATH="$PWD/dist/build/happy:$PATH" ''; - }) super.happy_2_1_2; + }) super.happy_2_1_3; # Additionally install documentation jacinda = overrideCabal (drv: { enableSeparateDocOutput = true;