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.

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

Jump to bottom

cups: 2.2.2 -> 2.2.6 #32207

Merged
merged 2 commits into from Dec 7, 2017
Merged

cups: 2.2.2 -> 2.2.6 #32207

merged 2 commits into from Dec 7, 2017

Conversation

peterhoeg
Copy link
Member

Motivation for this change

Regular package update but have cupsd use Type=notify instead of Type=simple.

nix-build nixos/tests/printing.nix passes.

Cc: @jgeerds

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option build-use-sandbox in nix.conf on non-NixOS)
  • Built on platform(s)
    • NixOS
    • macOS
    • other Linux distributions
  • Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
  • Tested compilation of all pkgs that depend on this change using nix-shell -p nox --run "nox-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Fits CONTRIBUTING.md.

@vcunat vcunat changed the base branch from master to staging December 1, 2017 07:18
vcunat
vcunat reviewed Dec 1, 2017
View reviewed changes
pkgs/misc/cups/default.nix Outdated
@@ -96,7 +101,8 @@ stdenv.mkDerivation rec {
for f in "$out"/lib/systemd/system/*; do
substituteInPlace "$f" \
--replace "org.cups.cupsd" "cups" \
--replace "org.cups." ""
--replace "org.cups." "" \
--replace /var/run /run
Copy link
Member

Choose a reason for hiding this comment

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

Why this change? How is the path used?

Copy link
Member Author

Choose a reason for hiding this comment

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

/var/run is deprecated in favour of /run.

Copy link
Member

@vcunat vcunat Dec 1, 2017 •
edited

Choose a reason for hiding this comment

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

Ah, right, I remember now. We even have a symlink on NixOS, so it seems unlikely to break anything.

@orivej orivej force-pushed the u/cups branch 3 times, most recently from ee20a7f to 1f9a6b7 Compare December 4, 2017 20:49
@orivej
Copy link
Contributor

orivej commented Dec 4, 2017

I have rebased this on the current staging, cleaned up the original patch, updated nixos/tests/printing.nix (now the test passes [1]), and added a patch that fixes the mess with the configure flags. In the process I have discovered that $lib/lib/libcups.so.2 and $lib/lib/libcupscgi.so.1 are meant to refer to $out/share/cups. Since previously they referred to the literal $(out)/share/cups and CUPS was working anyway, I have just nixed those refs. This patch also fixes the CUPS LPD systemd unit which was dysfunctional with its ExecStart=-$(lib)/lib/cups/daemon/cups-lpd, although it must have been unused. I have not tested printing on a physical printer yet.

[1] lpstat -H is documented to Show the server hostname and port, so the old CUPS was wrong to display the socket path. The new CUPS still listens on the socket.

@orivej orivej changed the title cups: 2.2.2 -> 2.2.6 [wip] cups: 2.2.2 -> 2.2.6 Dec 4, 2017
@orivej
Copy link
Contributor

orivej commented Dec 5, 2017

WIP: needs more work on Darwin.

@orivej orivej force-pushed the u/cups branch 2 times, most recently from 065718b to e80d6ad Compare December 5, 2017 14:29
@orivej orivej changed the title [wip] cups: 2.2.2 -> 2.2.6 cups: 2.2.2 -> 2.2.6 Dec 5, 2017
@orivej
Copy link
Contributor

orivej commented Dec 5, 2017 •
edited

The lib/cups on Linux is libexec/cups on Darwin, previously the latter remained in $lib, now I move it to $out just like on Linux.

This is essentially ready, some more testing and I'll merge this.

@orivej orivej merged commit d104321 into NixOS:staging Dec 7, 2017
@peterhoeg peterhoeg deleted the u/cups branch December 7, 2017 08:26
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@vcunat vcunat vcunat left review comments

Assignees
No one assigned
Labels
10.rebuild-darwin: 101-500 10.rebuild-linux: 501+
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
4 participants
@peterhoeg @orivej @vcunat @GrahamcOfBorg