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

Jump to bottom

[19.03] backport fixes from #59367, #60638, #60832 #60880

Merged
merged 4 commits into from May 3, 2019
Merged

[19.03] backport fixes from #59367, #60638, #60832 #60880

merged 4 commits into from May 3, 2019

Conversation

c0bw3b
Copy link
Contributor

@c0bw3b c0bw3b commented May 3, 2019

Motivation for this change

backport fixes from #59367, #60638, #60832
ping @NixOS/backports

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option 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 nix-review --run "nix-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Determined the impact on package closure size (by running nix path-info -S before and after)
  • Assured whether relevant documentation is up to date
  • Fits CONTRIBUTING.md.

klntsky and others added 3 commits May 3, 2019 19:32
@klntsky @c0bw3b
pax-rs: fix missing Cargo.lock
5eee6de 
(cherry picked from commit b8c99fb)
@Ma27 @c0bw3b
nixos/hostapd: escape interface names for hostapd
0d6993a 
Same problem as described in acbadcd.

When using multiple interfaces for wifi with `networking.wlanInterfaces`
and the interface for `hostapd` contains a dash, this will fail as
systemd escapes dashes in its device names.

(cherry picked from commit f975bba)
@marsam @c0bw3b
looking-glass-client: fix build
1de4690 
spice-protocol removed the spice/error_codes.h header file [1], which
looking-glass-client was still using.

[1] https://gitlab.freedesktop.org/spice/spice-protocol/commit/334cef51d03134a50d85827ea3c2ebc1ebb09e1c

(cherry picked from commit 6e90393)
@c0bw3b c0bw3b requested a review from infinisil as a code owner May 3, 2019 17:36
@c0bw3b c0bw3b added the 8.has: port to stable A PR already has a backport to the stable release. label May 3, 2019
@c0bw3b
Copy link
Contributor Author

c0bw3b commented May 3, 2019

cc @Ma27

@samueldr
Copy link
Member

samueldr commented May 3, 2019

Anything special to know about the backports? if not, imo you can self-merge after ofborg evals :).

Thanks!

@c0bw3b
Copy link
Contributor Author

c0bw3b commented May 3, 2019

No nothing special.
Indeed I'll wait for ofBorg eval to double check then I'll merge.

@c0bw3b
pax-rs: restrict to Linux platforms
e7e7c71 
It fails to build on Darwin

(cherry picked from commit a851074)
@c0bw3b c0bw3b merged commit 3b5974a into NixOS:release-19.03 May 3, 2019
@c0bw3b c0bw3b deleted the backport/1903/fixes branch May 3, 2019 21:15
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@infinisil infinisil Awaiting requested review from infinisil infinisil is a code owner

Assignees
No one assigned
Labels
6.topic: nixos 8.has: clean-up 8.has: module (update) 8.has: port to stable A PR already has a backport to the stable release. 10.rebuild-darwin: 0 10.rebuild-linux: 1-10
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
5 participants
@c0bw3b @samueldr @klntsky @Ma27 @marsam