diff options
| author | xeji <36407913+xeji@users.noreply.github.com> | 2018-05-13 18:15:55 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-05-13 18:15:55 +0200 |
| commit | 8c78d3a527d3377fb8a13383c3ed1dccbb8c4e2d (patch) | |
| tree | 56ad5c06c6f32b5cd46243f6bd9ed0eebc3f6a9e | |
| parent | ce5091a7e3d82089f0438f35329193771f5fbd44 (diff) | |
| parent | fb2a8d66699c96d6a687eb71ebfcca08e3405037 (diff) | |
| download | nixlib-8c78d3a527d3377fb8a13383c3ed1dccbb8c4e2d.tar nixlib-8c78d3a527d3377fb8a13383c3ed1dccbb8c4e2d.tar.gz nixlib-8c78d3a527d3377fb8a13383c3ed1dccbb8c4e2d.tar.bz2 nixlib-8c78d3a527d3377fb8a13383c3ed1dccbb8c4e2d.tar.lz nixlib-8c78d3a527d3377fb8a13383c3ed1dccbb8c4e2d.tar.xz nixlib-8c78d3a527d3377fb8a13383c3ed1dccbb8c4e2d.tar.zst nixlib-8c78d3a527d3377fb8a13383c3ed1dccbb8c4e2d.zip | |
Merge pull request #40416 from oxij/os/fix-some-types
nixos: fix some types
| -rw-r--r-- | nixos/modules/services/x11/desktop-managers/xterm.nix | 1 | ||||
| -rw-r--r-- | nixos/modules/system/boot/systemd-unit-options.nix | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/nixos/modules/services/x11/desktop-managers/xterm.nix b/nixos/modules/services/x11/desktop-managers/xterm.nix index 29752ff405e2..6ff1ef0e4c9a 100644 --- a/nixos/modules/services/x11/desktop-managers/xterm.nix +++ b/nixos/modules/services/x11/desktop-managers/xterm.nix @@ -12,6 +12,7 @@ in options = { services.xserver.desktopManager.xterm.enable = mkOption { + type = types.bool; default = true; description = "Enable a xterm terminal as a desktop manager."; }; diff --git a/nixos/modules/system/boot/systemd-unit-options.nix b/nixos/modules/system/boot/systemd-unit-options.nix index 5255f1a1b97a..2cff25a8c854 100644 --- a/nixos/modules/system/boot/systemd-unit-options.nix +++ b/nixos/modules/system/boot/systemd-unit-options.nix @@ -217,7 +217,7 @@ in rec { environment = mkOption { default = {}; - type = with types; attrsOf (nullOr (either str package)); + type = with types; attrsOf (nullOr (either str (either path package))); example = { PATH = "/foo/bar/bin"; LANG = "nl_NL.UTF-8"; }; description = "Environment variables passed to the service's processes."; }; |