Skip to content

Commit

Permalink
haskellPackages.pdftotext: unbreak
Browse files Browse the repository at this point in the history
Fixes NixOS#319365

Build of pdftotext was broken caused by a recent cabal change introduced via haskell/cabal#9200
  • Loading branch information
mpscholten authored and flandweber committed Aug 28, 2024
1 parent 4143572 commit 585c6a8
Show file tree
Hide file tree
Showing 3 changed files with 13 additions and 3 deletions.
13 changes: 13 additions & 0 deletions pkgs/development/haskell-modules/configuration-common.nix
Original file line number Diff line number Diff line change
Expand Up @@ -3114,4 +3114,17 @@ self: super: {
sha256 = "sha256-1QEaoO8BTdvfFzMrybrf0v7cK0NbYrWOj4Mqexr+ylc=";
}) super.avro;

pdftotext = overrideCabal (drv: {
postPatch = ''
# Fixes https://todo.sr.ht/~geyaeb/haskell-pdftotext/6
substituteInPlace pdftotext.cabal --replace-quiet c-sources cxx-sources
# Fix cabal ignoring cxx because the cabal format version is too old
substituteInPlace pdftotext.cabal --replace-quiet ">=1.10" 2.2
# Fix wrong license name that breaks recent cabal version
substituteInPlace pdftotext.cabal --replace-quiet BSD3 BSD-3-Clause
'' + (drv.postPatch or "");
}) (doJailbreak (addExtraLibrary pkgs.pkg-config (addExtraLibrary pkgs.poppler super.pdftotext)));

} // import ./configuration-tensorflow.nix {inherit pkgs haskellLib;} self super
Original file line number Diff line number Diff line change
Expand Up @@ -4429,7 +4429,6 @@ broken-packages:
- pdfinfo # failure in job https://hydra.nixos.org/build/233214432 at 2023-09-02
- pdf-slave-template # failure in job https://hydra.nixos.org/build/233217870 at 2023-09-02
- pdf-toolbox-viewer # failure in job https://hydra.nixos.org/build/233196461 at 2023-09-02
- pdftotext # failure in job https://hydra.nixos.org/build/233242086 at 2023-09-02
- pdynload # failure in job https://hydra.nixos.org/build/233226504 at 2023-09-02
- PeanoWitnesses # failure in job https://hydra.nixos.org/build/233207451 at 2023-09-02
- pecoff # failure in job https://hydra.nixos.org/build/233231268 at 2023-09-02
Expand Down
2 changes: 0 additions & 2 deletions pkgs/development/haskell-modules/hackage-packages.nix

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit 585c6a8

Please sign in to comment.