Skip to content

Commit

Permalink
jacinda: build with happy-2.1.3
Browse files Browse the repository at this point in the history
  • Loading branch information
sternenseemann committed Dec 23, 2024
1 parent 42bee96 commit ebe5bea
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion pkgs/development/haskell-modules/configuration-common.nix
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
4 changes: 2 additions & 2 deletions pkgs/development/haskell-modules/configuration-nix.nix
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down

0 comments on commit ebe5bea

Please sign in to comment.