Skip to content

haskellPackages.feedback: Fix build #333386

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
maralorn merged 1 commit into from
Aug 13, 2024
Merged

haskellPackages.feedback: Fix build #333386

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 16 additions & 0 deletions pkgs/development/haskell-modules/configuration-common.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3115,4 +3115,20 @@ self: super: {
doJailbreak
];

# 2024-08-09: Apply optparse-applicative compat fix from master branch
# https://github.com/NorfairKing/feedback/commit/9368468934a4d8bd94709bdcb1116210b162bab8
feedback = overrideCabal (drv: assert drv.version == "0.1.0.5"; {
postPatch = drv.postPatch or "" + ''
substituteInPlace src/Feedback/Loop/OptParse.hs \
--replace-fail '(uncurry loopConfigLine)' '(pure . uncurry loopConfigLine)'
'';
}) (doDistribute (super.feedback.overrideScope (self: super: {
# 2024-08-09: The stackage versions of safe-coloured-text* are old and broken
safe-coloured-text = unmarkBroken self.safe-coloured-text_0_3_0_2;
safe-coloured-text-gen = unmarkBroken self.safe-coloured-text-gen_0_0_0_3;
safe-coloured-text-layout = unmarkBroken self.safe-coloured-text-layout_0_2_0_0;
safe-coloured-text-layout-gen = unmarkBroken self.safe-coloured-text-layout-gen_0_0_0_1;
safe-coloured-text-terminfo = unmarkBroken self.safe-coloured-text-terminfo_0_3_0_0;
})));

} // import ./configuration-tensorflow.nix {inherit pkgs haskellLib;} self super
3 changes: 3 additions & 0 deletions pkgs/development/haskell-modules/configuration-nix.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1345,6 +1345,9 @@ self: super: builtins.intersectAttrs super {

halide-haskell = super.halide-haskell.override { Halide = pkgs.halide; };

feedback = self.generateOptparseApplicativeCompletions [ "feedback" ]
(enableSeparateBinOutput super.feedback);

# Sydtest has a brittle test suite that will only work with the exact
# versions that it ships with.
sydtest = dontCheck super.sydtest;
Expand Down