diff options
| author | Silvan Mosberger <infinisil@icloud.com> | 2018-04-03 00:36:52 +0200 |
|---|---|---|
| committer | Silvan Mosberger <infinisil@icloud.com> | 2018-04-03 00:36:52 +0200 |
| commit | e9fc2558f95152020e8b588f92563d6664f4c3c3 (patch) | |
| tree | b7713d81e4d6f5f8a90b091bfe5663c2d43847a2 /nixos/modules/system | |
| parent | 00fc66dc7dcda7fc38a9cc7f4dbd7bb66f28c5f9 (diff) | |
| download | nixpkgs-e9fc2558f95152020e8b588f92563d6664f4c3c3.tar nixpkgs-e9fc2558f95152020e8b588f92563d6664f4c3c3.tar.gz nixpkgs-e9fc2558f95152020e8b588f92563d6664f4c3c3.tar.bz2 nixpkgs-e9fc2558f95152020e8b588f92563d6664f4c3c3.tar.lz nixpkgs-e9fc2558f95152020e8b588f92563d6664f4c3c3.tar.xz nixpkgs-e9fc2558f95152020e8b588f92563d6664f4c3c3.tar.zst nixpkgs-e9fc2558f95152020e8b588f92563d6664f4c3c3.zip | |
nixos/systemd: Fix environment type -> allows overriding
Diffstat (limited to 'nixos/modules/system')
| -rw-r--r-- | nixos/modules/system/boot/systemd-unit-options.nix | 2 | ||||
| -rw-r--r-- | nixos/modules/system/boot/systemd.nix | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/nixos/modules/system/boot/systemd-unit-options.nix b/nixos/modules/system/boot/systemd-unit-options.nix index 43a9c28bb69..5255f1a1b97 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 = types.attrs; # FIXME + type = with types; attrsOf (nullOr (either str package)); example = { PATH = "/foo/bar/bin"; LANG = "nl_NL.UTF-8"; }; description = "Environment variables passed to the service's processes."; }; diff --git a/nixos/modules/system/boot/systemd.nix b/nixos/modules/system/boot/systemd.nix index b8a2d42e0fb..e02105c8804 100644 --- a/nixos/modules/system/boot/systemd.nix +++ b/nixos/modules/system/boot/systemd.nix @@ -516,7 +516,7 @@ in }; systemd.globalEnvironment = mkOption { - type = types.attrs; + type = with types; attrsOf (nullOr (either str package)); default = {}; example = { TZ = "CET"; }; description = '' |