nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-28 18:03:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #333386 from rvl/haskell-updates-feedback

Browse Source 
haskellPackages.feedback: Fix build
This commit is contained in:
maralorn 2024-08-13 22:56:06 +02:00 committed by GitHub
commit cbb8a5777b
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 19 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
pkgs/development/haskell-modules/configuration-common.nix
View File

@ -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
pkgs/development/haskell-modules/configuration-nix.nix
View File

@ -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;