Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 3d4c307b302e
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 93ff93d53970
Choose a head ref
  • 2 commits
  • 1 file changed
  • 1 contributor

Commits on May 22, 2020

  1. nixos/udev: support /run/current-system/systemd in udevRules

    #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 committed May 22, 2020

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    d64d42e View commit details
  2. Merge pull request #88607 from flokli/udev-rules-run-current-system-s…

    …ystemd
    
    nixos/udev: support /run/current-system/systemd in udevRules
    flokli authored May 22, 2020

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    93ff93d View commit details
Showing with 4 additions and 0 deletions.
  1. +4 −0 nixos/modules/services/hardware/udev.nix
4 changes: 4 additions & 0 deletions nixos/modules/services/hardware/udev.nix
Original file line number Diff line number Diff line change
@@ -83,6 +83,10 @@ let
run_progs=$(grep -v '^[[:space:]]*#' $out/* | grep 'RUN+="/' |
sed -e 's/.*RUN+="\([^ "]*\)[ "].*/\1/' | uniq)
for i in $import_progs $run_progs; do
# if the path refers to /run/current-system/systemd, replace with config.systemd.package
if [[ $i == /run/current-system/systemd* ]]; then
i="${config.systemd.package}/''${i#/run/current-system/systemd/}"
fi
if [[ ! -x $i ]]; then
echo "FAIL"
echo "$i is called in udev rules but is not executable or does not exist"