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

nixos/udev: support /run/current-system/systemd in udevRules #88607

Merged
merged 1 commit into from May 22, 2020
Merged

nixos/udev: support /run/current-system/systemd in udevRules #88607

merged 1 commit into from May 22, 2020

Conversation

flokli
Copy link
Contributor

@flokli flokli commented May 22, 2020 •
edited

#88492 flipped some references to
systemctl from config.systemd.package to /run/current-system/systemd/,
which udevRules obviously isn't able resolve.

If we encounter such references, replace them with
config.systemd.package before doing the check.

Motivation for this change

Unblock the channels.

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS linux)
  • 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 nixpkgs-review --run "nixpkgs-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)
  • Ensured that relevant documentation is up to date
  • Fits CONTRIBUTING.md.

@flokli
nixos/udev: support /run/current-system/systemd in udevRules
d64d42e 
NixOS#88492 flipped some references to
systemctl from config.systemd.package to /run/current-system/systemd/,
which udevRules obviously isn't able resolve.

If we encounter such references, replace them with
config.systemd.package before doing the check.
@flokli flokli requested a review from vcunat May 22, 2020 12:46
@flokli flokli mentioned this pull request May 22, 2020
Merged
10 tasks
@flokli
Copy link
Contributor Author

flokli commented May 22, 2020

@GrahamcOfBorg build nixosTests.boot.biosCdrom

@flokli flokli requested review from Mic92 and adisbladis May 22, 2020 13:14
vcunat
vcunat approved these changes May 22, 2020
View reviewed changes
Copy link
Member

@vcunat vcunat left a comment

Choose a reason for hiding this comment

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

Diff looks OK, the two unstable-small jobs broken on Hydra now succeed (locally).

@vcunat vcunat added the 1.severity: channel blocker Blocks a channel label May 22, 2020
@flokli flokli merged commit 93ff93d into NixOS:master May 22, 2020
@flokli flokli deleted the udev-rules-run-current-system-systemd branch May 22, 2020 15:10
dhess pushed a commit to hackworthltd/hacknix that referenced this pull request May 23, 2020
Switch to nixpkgs until udev fix is in nixpkgs-unstable.
801f8a0 
See NixOS/nixpkgs#88607.
@dhess dhess mentioned this pull request May 23, 2020
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@vcunat vcunat vcunat approved these changes

@Mic92 Mic92 Awaiting requested review from Mic92

@adisbladis adisbladis Awaiting requested review from adisbladis

Assignees
No one assigned
Labels
1.severity: channel blocker Blocks a channel
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
2 participants
@flokli @vcunat