diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2014-07-07 13:16:26 +0200 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2014-07-07 13:16:26 +0200 |
| commit | 95b828de42adaa2f825e5588d1cccb0d6398b20a (patch) | |
| tree | abfa4798c91b9932173212e7fbc6e5f7bd85f5d6 /nixos/modules/programs | |
| parent | 421ce6439c2e685065fe9c256b751225de51e0b3 (diff) | |
| parent | 1ecae5c2c123c0ca615d011b9ce32f501198e7c4 (diff) | |
| download | nixlib-95b828de42adaa2f825e5588d1cccb0d6398b20a.tar nixlib-95b828de42adaa2f825e5588d1cccb0d6398b20a.tar.gz nixlib-95b828de42adaa2f825e5588d1cccb0d6398b20a.tar.bz2 nixlib-95b828de42adaa2f825e5588d1cccb0d6398b20a.tar.lz nixlib-95b828de42adaa2f825e5588d1cccb0d6398b20a.tar.xz nixlib-95b828de42adaa2f825e5588d1cccb0d6398b20a.tar.zst nixlib-95b828de42adaa2f825e5588d1cccb0d6398b20a.zip | |
Merge remote-tracking branch 'origin/master' into staging
Diffstat (limited to 'nixos/modules/programs')
| -rw-r--r-- | nixos/modules/programs/blcr.nix | 4 | ||||
| -rw-r--r-- | nixos/modules/programs/screen.nix | 4 | ||||
| -rw-r--r-- | nixos/modules/programs/shadow.nix | 4 | ||||
| -rw-r--r-- | nixos/modules/programs/virtualbox.nix | 1 |
4 files changed, 7 insertions, 6 deletions
diff --git a/nixos/modules/programs/blcr.nix b/nixos/modules/programs/blcr.nix index e1e31b4a56aa..804e1d01f12b 100644 --- a/nixos/modules/programs/blcr.nix +++ b/nixos/modules/programs/blcr.nix @@ -1,7 +1,7 @@ -{ config, pkgs, ... }: +{ config, lib, ... }: let - inherit (pkgs.lib) mkOption mkIf; + inherit (lib) mkOption mkIf; cfg = config.environment.blcr; blcrPkg = config.boot.kernelPackages.blcr; in diff --git a/nixos/modules/programs/screen.nix b/nixos/modules/programs/screen.nix index 1c63ebe6a11e..f82338a69d25 100644 --- a/nixos/modules/programs/screen.nix +++ b/nixos/modules/programs/screen.nix @@ -1,7 +1,7 @@ -{ config, pkgs, ... }: +{ config, lib, ... }: let - inherit (pkgs.lib) mkOption mkIf types; + inherit (lib) mkOption mkIf types; cfg = config.programs.screen; in diff --git a/nixos/modules/programs/shadow.nix b/nixos/modules/programs/shadow.nix index 5fcd2133a7e1..658b08b3d870 100644 --- a/nixos/modules/programs/shadow.nix +++ b/nixos/modules/programs/shadow.nix @@ -40,7 +40,7 @@ in options = { - users.defaultUserShell = pkgs.lib.mkOption { + users.defaultUserShell = lib.mkOption { description = '' This option defines the default shell assigned to user accounts. This must not be a store path, since the path is @@ -60,7 +60,7 @@ in config = { environment.systemPackages = - pkgs.lib.optional config.users.mutableUsers pkgs.shadow; + lib.optional config.users.mutableUsers pkgs.shadow; environment.etc = [ { # /etc/login.defs: global configuration for pwdutils. You diff --git a/nixos/modules/programs/virtualbox.nix b/nixos/modules/programs/virtualbox.nix index 10e657abd3c5..e2dd76219eb0 100644 --- a/nixos/modules/programs/virtualbox.nix +++ b/nixos/modules/programs/virtualbox.nix @@ -14,6 +14,7 @@ let virtualbox = config.boot.kernelPackages.virtualbox; in services.udev.extraRules = '' KERNEL=="vboxdrv", OWNER="root", GROUP="vboxusers", MODE="0660", TAG+="systemd" + KERNEL=="vboxdrvu", OWNER="root", GROUP="root", MODE="0666", TAG+="systemd" KERNEL=="vboxnetctl", OWNER="root", GROUP="root", MODE="0600", TAG+="systemd" SUBSYSTEM=="usb_device", ACTION=="add", RUN+="${virtualbox}/libexec/virtualbox/VBoxCreateUSBNode.sh $major $minor $attr{bDeviceClass}" SUBSYSTEM=="usb", ACTION=="add", ENV{DEVTYPE}=="usb_device", RUN+="${virtualbox}/libexec/virtualbox/VBoxCreateUSBNode.sh $major $minor $attr{bDeviceClass}" |