Skip to content

canon-cups-ufr2: Rework build script with RPM spec#381315

Merged
GaetanLepage merged 1 commit intoNixOS:masterfrom
lluchs:fix-cngplp
Feb 27, 2025
Merged

canon-cups-ufr2: Rework build script with RPM spec#381315
GaetanLepage merged 1 commit intoNixOS:masterfrom
lluchs:fix-cngplp

Conversation

@lluchs
Copy link
Contributor

@lluchs lluchs commented Feb 12, 2025

Strongly inspired by the AUR package 1, this commit removes most manual build and install commands in favor of reusing the RPM spec file.

With the rework and a small patch, cngplp now builds and is installed correctly. Previously, we would skip building cngplp, resulting in broken symlinks in the output folder.

Fixes #380572

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/)
  • 25.05 Release Notes (or backporting 24.11 and 25.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.

Add a 👍 reaction to pull requests you find important.

@github-actions github-actions bot added 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin. 10.rebuild-linux: 1 This PR causes 1 package to rebuild on Linux. 10.rebuild-linux: 1-10 This PR causes between 1 and 10 packages to rebuild on Linux. labels Feb 12, 2025
@kik4444
Copy link

kik4444 commented Feb 27, 2025

Any news on this? I'd like to re-enable my printer's drivers 🙂

@michelealbrigo
Copy link

Any news on this? I'd like to re-enable my printer's drivers 🙂

I was tempted to ask the same question, but I'm not sure if I can read the patch workflow correctly (e.g. things like this patch being only targeted to the stable / 25.05 branch).

Copy link
Member

@SuperSandro2000 SuperSandro2000 left a comment

Choose a reason for hiding this comment

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

LGTM

Strongly inspired by the AUR package [1], this commit removes most
manual build and install commands in favor of reusing the RPM spec file.

With the rework and a small patch, cngplp now builds and is installed
correctly. Previously, we would skip building cngplp, resulting in
broken symlinks in the output folder.

[1]: https://aur.archlinux.org/packages/cnrdrvcups-lb

Fixes NixOS#380572
@lluchs
Copy link
Contributor Author

lluchs commented Feb 27, 2025

Thanks for looking over this. I combined the patchShebangs calls.

@GaetanLepage
Copy link
Contributor

nixpkgs-review result

Generated using nixpkgs-review.

Command: nixpkgs-review pr 381315


x86_64-linux

✅ 1 package built:
  • canon-cups-ufr2

aarch64-linux

✅ 1 package built:
  • canon-cups-ufr2

@GaetanLepage GaetanLepage merged commit cd5a0d1 into NixOS:master Feb 27, 2025
26 of 27 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin. 10.rebuild-linux: 1-10 This PR causes between 1 and 10 packages to rebuild on Linux. 10.rebuild-linux: 1 This PR causes 1 package to rebuild on Linux.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Build failure: canon-cups-ufr2

5 participants