pyrox.dev / nixpkgs
lol
fork atom

Merge pull request #268718 from ners/udev

treewide: replace broken udev paths with systemd

authored by

Nick Cao and committed by
GitHub 9075a0d5 a3a15d72

+9 -10
unified split
+2 -2
nixos/modules/security/lock-kernel-modules.nix
··· 1 - { config, pkgs, lib, ... }: 2 3 with lib; 4 ··· 49 }; 50 51 script = '' 52 - ${pkgs.udev}/bin/udevadm settle 53 echo -n 1 >/proc/sys/kernel/modules_disabled 54 ''; 55 };
··· 1 + { config, lib, ... }: 2 3 with lib; 4 ··· 49 }; 50 51 script = '' 52 + ${config.systemd.package}/bin/udevadm settle 53 echo -n 1 >/proc/sys/kernel/modules_disabled 54 ''; 55 };
+1 -1
nixos/modules/services/hardware/usbmuxd.nix
··· 77 serviceConfig = { 78 # Trigger the udev rule manually. This doesn't require replugging the 79 # device when first enabling the option to get it to work 80 - ExecStartPre = "${pkgs.udev}/bin/udevadm trigger -s usb -a idVendor=${apple}"; 81 ExecStart = "${cfg.package}/bin/usbmuxd -U ${cfg.user} -v"; 82 }; 83 };
··· 77 serviceConfig = { 78 # Trigger the udev rule manually. This doesn't require replugging the 79 # device when first enabling the option to get it to work 80 + ExecStartPre = "${config.systemd.package}/bin/udevadm trigger -s usb -a idVendor=${apple}"; 81 ExecStart = "${cfg.package}/bin/usbmuxd -U ${cfg.user} -v"; 82 }; 83 };
+2 -3
pkgs/tools/filesystems/stratisd/default.nix
··· 11 , dbus 12 , cryptsetup 13 , util-linux 14 - , udev 15 , lvm2 16 , systemd 17 , xfsprogs ··· 53 --replace stratis-min "$out/bin/stratis-min" \ 54 --replace systemd-ask-password "${systemd}/bin/systemd-ask-password" \ 55 --replace sleep "${coreutils}/bin/sleep" \ 56 - --replace udevadm "${udev}/bin/udevadm" 57 ''; 58 59 nativeBuildInputs = [ ··· 72 dbus 73 cryptsetup 74 util-linux 75 - udev 76 lvm2 77 ]; 78
··· 11 , dbus 12 , cryptsetup 13 , util-linux 14 , lvm2 15 , systemd 16 , xfsprogs ··· 52 --replace stratis-min "$out/bin/stratis-min" \ 53 --replace systemd-ask-password "${systemd}/bin/systemd-ask-password" \ 54 --replace sleep "${coreutils}/bin/sleep" \ 55 + --replace udevadm "${systemd}/bin/udevadm" 56 ''; 57 58 nativeBuildInputs = [ ··· 71 dbus 72 cryptsetup 73 util-linux 74 + systemd 75 lvm2 76 ]; 77
+2 -2
pkgs/tools/misc/brltty/default.nix
··· 1 { lib, stdenv, fetchurl, pkg-config, python3, bluez 2 - , tcl, acl, kmod, coreutils, shadow, util-linux, udev 3 , alsaSupport ? stdenv.isLinux, alsa-lib 4 , systemdSupport ? lib.meta.availableOn stdenv.hostPlatform systemd, systemd 5 }: ··· 90 ) 91 substituteInPlace $out/libexec/brltty/systemd-wrapper \ 92 --replace 'logger' "${util-linux}/bin/logger" \ 93 - --replace 'udevadm' "${udev}/bin/udevadm" 94 ''; 95 }
··· 1 { lib, stdenv, fetchurl, pkg-config, python3, bluez 2 + , tcl, acl, kmod, coreutils, shadow, util-linux 3 , alsaSupport ? stdenv.isLinux, alsa-lib 4 , systemdSupport ? lib.meta.availableOn stdenv.hostPlatform systemd, systemd 5 }: ··· 90 ) 91 substituteInPlace $out/libexec/brltty/systemd-wrapper \ 92 --replace 'logger' "${util-linux}/bin/logger" \ 93 + --replace 'udevadm' "${systemd}/bin/udevadm" 94 ''; 95 }
+2 -2
pkgs/tools/misc/os-prober/default.nix
··· 4 grub2, # grub-mount and grub-probe 5 cryptsetup, # cryptsetup 6 libuuid, # blkid and blockdev 7 - udev, # udevadm udevinfo 8 ntfs3g, # ntfs3g 9 dmraid, # dmraid 10 lvm2 # lvs ··· 56 done; 57 for file in $out/bin/*; do 58 wrapProgram $file \ 59 - --suffix PATH : ${lib.makeBinPath [ grub2 udev coreutils cryptsetup libuuid ntfs3g lvm2 dmraid ]} \ 60 --run "[ -d /var/lib/os-prober ] || mkdir /var/lib/os-prober" 61 done; 62 '';
··· 4 grub2, # grub-mount and grub-probe 5 cryptsetup, # cryptsetup 6 libuuid, # blkid and blockdev 7 + systemd, # udevadm 8 ntfs3g, # ntfs3g 9 dmraid, # dmraid 10 lvm2 # lvs ··· 56 done; 57 for file in $out/bin/*; do 58 wrapProgram $file \ 59 + --suffix PATH : ${lib.makeBinPath [ grub2 systemd coreutils cryptsetup libuuid ntfs3g lvm2 dmraid ]} \ 60 --run "[ -d /var/lib/os-prober ] || mkdir /var/lib/os-prober" 61 done; 62 '';