diff options
| author | Yury G. Kudryashov <urkud.urkud@gmail.com> | 2011-08-24 21:24:39 +0000 |
|---|---|---|
| committer | Yury G. Kudryashov <urkud.urkud@gmail.com> | 2011-08-24 21:24:39 +0000 |
| commit | e5917ea6fc26ecf52b5db6ccf2bb8bfc8c507854 (patch) | |
| tree | 1c1875f5d22e19cc7c5100bbd940b78e355ab618 /modules/services/hardware/upower.nix | |
| parent | 1aa1c86afc5ac6e11162fb55f0113b7c58936c8a (diff) | |
| download | nixpkgs-e5917ea6fc26ecf52b5db6ccf2bb8bfc8c507854.tar nixpkgs-e5917ea6fc26ecf52b5db6ccf2bb8bfc8c507854.tar.gz nixpkgs-e5917ea6fc26ecf52b5db6ccf2bb8bfc8c507854.tar.bz2 nixpkgs-e5917ea6fc26ecf52b5db6ccf2bb8bfc8c507854.tar.lz nixpkgs-e5917ea6fc26ecf52b5db6ccf2bb8bfc8c507854.tar.xz nixpkgs-e5917ea6fc26ecf52b5db6ccf2bb8bfc8c507854.tar.zst nixpkgs-e5917ea6fc26ecf52b5db6ccf2bb8bfc8c507854.zip | |
Merge with udev-173
The only conflict was the addition of two different options at the same place. svn path=/nixos/trunk/; revision=28801
Diffstat (limited to 'modules/services/hardware/upower.nix')
| -rw-r--r-- | modules/services/hardware/upower.nix | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/modules/services/hardware/upower.nix b/modules/services/hardware/upower.nix index c529e8b3cdb..8e7cf23900c 100644 --- a/modules/services/hardware/upower.nix +++ b/modules/services/hardware/upower.nix @@ -33,6 +33,8 @@ with pkgs.lib; services.dbus.packages = [ pkgs.upower ]; + services.udev.packages = [ pkgs.upower ]; + }; } |