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

Fix CUPS socket path to be default /var/run/cups/cups.sock #35390

Merged
merged 2 commits into from Feb 23, 2018
Merged

Fix CUPS socket path to be default /var/run/cups/cups.sock #35390

merged 2 commits into from Feb 23, 2018

Conversation

abbradar
Copy link
Member

Motivation for this change

Hopefully fixes #34963, closes #35190.

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.

Tested with tests.printing.x86_64-linux. lpstat -H points to /var/run/cups/cups.sock now.`

@gnidorah Can you remember any other applications with broken printing besides Chromium? It'll help to generate less heat from my machine :D

@abbradar
cups: fix path to socket and run directory
de5626b 
We use default /var/run/cups/cups.sock in NixOS but here it's misdefined to be
/run/cups.sock. Return it to default.
@abbradar abbradar added this to the 18.03 milestone Feb 23, 2018
@abbradar
cups service: fix client sockets
92b9919 
Use systemd to create the directory for UNIX socket. Also use localhost instead
of 127.0.0.1 as is done in default cupsd.conf so that IPv6 is enabled when
available.
@GrahamcOfBorg
Copy link

Success on aarch64-linux (full log)

Partial log (click to expand)

stripping (with command strip and flags -S) in /nix/store/4mr2rgzk5z2ksgdybrs8fq83mjqmcmxl-cups-2.2.6-dev/bin
patching script interpreter paths in /nix/store/4mr2rgzk5z2ksgdybrs8fq83mjqmcmxl-cups-2.2.6-dev
/nix/store/4mr2rgzk5z2ksgdybrs8fq83mjqmcmxl-cups-2.2.6-dev/bin/cups-config: interpreter directive changed from "/bin/sh" to "/nix/store/lnws52qanbi5vz8qg24v4ym57nznfndg-bash-4.4-p12/bin/sh"
checking for references to /build in /nix/store/4mr2rgzk5z2ksgdybrs8fq83mjqmcmxl-cups-2.2.6-dev...
shrinking RPATHs of ELF executables and libraries in /nix/store/c31z46n3jsy3lwmm5z0sqx2a8jcay6la-cups-2.2.6-man
gzipping man pages under /nix/store/c31z46n3jsy3lwmm5z0sqx2a8jcay6la-cups-2.2.6-man/share/man/
strip is /nix/store/lvx1acn1ig1j2km8jds5x3ggh3f2wa8v-binutils-2.28.1/bin/strip
patching script interpreter paths in /nix/store/c31z46n3jsy3lwmm5z0sqx2a8jcay6la-cups-2.2.6-man
checking for references to /build in /nix/store/c31z46n3jsy3lwmm5z0sqx2a8jcay6la-cups-2.2.6-man...
/nix/store/6rxwxxwzf4qcp5gn2j1g0hwn6l1d7256-cups-2.2.6

@GrahamcOfBorg
Copy link

Success on x86_64-linux (full log)

Partial log (click to expand)

stripping (with command strip and flags -S) in /nix/store/v13hmywvrxhr49j6fmwly0ysfin5bmcy-cups-2.2.6-dev/bin 
patching script interpreter paths in /nix/store/v13hmywvrxhr49j6fmwly0ysfin5bmcy-cups-2.2.6-dev
/nix/store/v13hmywvrxhr49j6fmwly0ysfin5bmcy-cups-2.2.6-dev/bin/cups-config: interpreter directive changed from "/bin/sh" to "/nix/store/zqh3l3lyw32q1ayb15bnvg9f24j5v2p0-bash-4.4-p12/bin/sh"
checking for references to /tmp/nix-build-cups-2.2.6.drv-0 in /nix/store/v13hmywvrxhr49j6fmwly0ysfin5bmcy-cups-2.2.6-dev...
shrinking RPATHs of ELF executables and libraries in /nix/store/200px9f17cmprc07qc1dc00y3w2w41di-cups-2.2.6-man
gzipping man pages under /nix/store/200px9f17cmprc07qc1dc00y3w2w41di-cups-2.2.6-man/share/man/
strip is /nix/store/b0zlxla7dmy1iwc3g459rjznx59797xy-binutils-2.28.1/bin/strip
patching script interpreter paths in /nix/store/200px9f17cmprc07qc1dc00y3w2w41di-cups-2.2.6-man
checking for references to /tmp/nix-build-cups-2.2.6.drv-0 in /nix/store/200px9f17cmprc07qc1dc00y3w2w41di-cups-2.2.6-man...
/nix/store/a1ym7n7gds6wx485byqrz8y330smv2y0-cups-2.2.6

@ghost
Copy link

ghost commented Feb 23, 2018

@abbradar Wow, awesome work, thanks! No, don't remember. Firefox worked via network port, Libreoffice and GTK programs worked too.

fpletz
fpletz approved these changes Feb 23, 2018
View reviewed changes
Copy link
Member

@fpletz fpletz left a comment

Choose a reason for hiding this comment

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

Push to staging please as this is a mass rebuild. :)

@abbradar
Copy link
Member Author

Yeah, I want to do so but am wary of changing branch in PR as this will ping a lot of people as code owners :D

@abbradar
Copy link
Member Author

I want to backport it to 17.09, is it okay to cherry-pick mass rebuild changes to release-17.09?

@fpletz
Copy link
Member

fpletz commented Feb 23, 2018

@abbradar Yes, it is! As I've just picked another big rebuild to 17.09 and haven triggered an evaluation on Hydra yet, wanna do it right now? :)

@abbradar
Copy link
Member Author

abbradar commented Feb 23, 2018 •
edited

Yep, will do. Thanks!

P.S.: Tested with Chromium, it prints now.

@abbradar abbradar merged commit cf4c077 into NixOS:master Feb 23, 2018
@abbradar
Copy link
Member Author

abbradar commented Feb 23, 2018 •
edited

Argh, I pushed it to master by mistake. Will revert and push to staging instead. Lesson learnt, better ping random people than push mass rebuilds to master ~ __ ~

@fpletz
Copy link
Member

fpletz commented Feb 23, 2018

No worries. That happens to all of us. Thanks!

@abbradar
Copy link
Member Author

17.09 actually doesn't require this PR -- it's a regression, git blame shows e5715d9.

@samueldr samueldr removed the 9.needs: port to stable A PR needs a backport to the stable release. label Apr 17, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@fpletz fpletz fpletz approved these changes

Assignees
No one assigned
Labels
0.kind: bug 6.topic: nixos 6.topic: printing 8.has: module (update) 10.rebuild-darwin: 101-500 10.rebuild-linux: 501+
Projects
None yet
Milestone
18.03
Development

Successfully merging this pull request may close these issues.

CUPS on NixOS [Chrome stopped to print]
4 participants
@abbradar @GrahamcOfBorg @fpletz @samueldr