Skip to content
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.

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

gscan2pdf: fix build failure, add patches #268836

Merged
merged 4 commits into from
Nov 29, 2023

Conversation

gador
Copy link
Member

@gador gador commented Nov 21, 2023

Description of changes

Due to the removal of tools like tiff2pdf from libtiff many tests fail or cause a timeout.
This commit fixes the dependency to libtiff_4_5. Also it includes two upstream patches, which haven't been merged and re-adds a previously removed test.

fixes #268406

Things done

  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandboxing enabled in nix.conf? (See Nix manual)
    • sandbox = relaxed
    • sandbox = true
  • Tested, as applicable:
  • Tested compilation of all packages that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage
  • Tested basic functionality of all binary files (usually in ./result/bin/)
  • 23.11 Release Notes (or backporting 23.05 Release notes)
    • (Package updates) Added a release notes entry if the change is major or breaking
    • (Module updates) Added a release notes entry if the change is significant
    • (Module addition) Added a release notes entry if adding a new NixOS module
  • Fits CONTRIBUTING.md.

Copy link
Contributor

@pacien pacien left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thank you for handling this!

  • diff looks good
  • tests passing
  • program starting

(I would just split the mutually independent changes into four commits).

@delroth delroth added 12.approvals: 1 This PR was reviewed and approved by one reputable person 12.approved-by: package-maintainer This PR was reviewed and approved by a maintainer listed in the package labels Nov 21, 2023
@gador gador force-pushed the gscan2pdf-libtiff-fix branch from df8c4d3 to 5e959a0 Compare November 22, 2023 10:00
@gador
Copy link
Member Author

gador commented Nov 22, 2023

(I would just split the mutually independent changes into four commits).

Done 👍

@delroth delroth removed the 12.approvals: 1 This PR was reviewed and approved by one reputable person label Nov 22, 2023
@ofborg ofborg bot requested a review from pacien November 22, 2023 11:01
Copy link
Contributor

@pacien pacien left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nit: Message of the first commit (e7090c1) should be updated accordingly.

Other than that, all good, thanks 👍

@delroth delroth added the 12.approvals: 1 This PR was reviewed and approved by one reputable person label Nov 22, 2023
@gador gador force-pushed the gscan2pdf-libtiff-fix branch from 5e959a0 to e9fd30d Compare November 22, 2023 14:56
@gador
Copy link
Member Author

gador commented Nov 22, 2023

Nit: Message of the first commit (e7090c1) should be updated accordingly.

Good catch, done 👍

@delroth delroth removed the 12.approvals: 1 This PR was reviewed and approved by one reputable person label Nov 22, 2023
@ofborg ofborg bot requested a review from pacien November 22, 2023 16:34
@delroth delroth added the 12.approvals: 1 This PR was reviewed and approved by one reputable person label Nov 22, 2023
@nixos-discourse
Copy link

This pull request has been mentioned on NixOS Discourse. There might be relevant details there:

https://discourse.nixos.org/t/prs-already-reviewed/2617/1248

@gador gador force-pushed the gscan2pdf-libtiff-fix branch from e9fd30d to 083bfd7 Compare November 23, 2023 11:02
Due to the removal of tools like `tiff2pdf` from `libtiff`
many tests fail or cause a timeout.
This commit fixes the dependency to `libtiff_4_5`.

fixes NixOS#268406

Signed-off-by: Florian Brandes <[email protected]>
@gador gador force-pushed the gscan2pdf-libtiff-fix branch from 083bfd7 to d54a7a6 Compare November 23, 2023 11:05
@delroth delroth removed the 12.approvals: 1 This PR was reviewed and approved by one reputable person label Nov 23, 2023
@ofborg ofborg bot requested a review from pacien November 23, 2023 14:29
@delroth delroth added the 12.approvals: 1 This PR was reviewed and approved by one reputable person label Nov 26, 2023
@emilytrau emilytrau merged commit 4204f4f into NixOS:master Nov 29, 2023
@hpfr
Copy link
Contributor

hpfr commented Dec 2, 2023

Looks like this needs backporting to release-23.11: https://hydra.nixos.org/build/242651099

Copy link
Contributor

github-actions bot commented Dec 2, 2023

Successfully created backport PR for release-23.11:

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
10.rebuild-darwin: 1-10 10.rebuild-darwin: 1 10.rebuild-linux: 1-10 10.rebuild-linux: 1 12.approvals: 1 This PR was reviewed and approved by one reputable person 12.approved-by: package-maintainer This PR was reviewed and approved by a maintainer listed in the package
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Build failure: gscan2pdf
7 participants