public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #38356 from Infinisil/fix/environment

Browse Source 
nixos/systemd: Fix environment type -> allows overriding
This commit is contained in:
Daiderd Jordan 2018-04-20 22:22:05 +02:00 committed by GitHub
commit 58fd592019
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
nixos/modules/system/boot/systemd-unit-options.nix
View File

@ -217,7 +217,7 @@ in rec {
environment = mkOption { environment = mkOption {
default = {}; default = {};
type = types.attrs; # FIXME type = with types; attrsOf (nullOr (either str package));
example = { PATH = "/foo/bar/bin"; LANG = "nl_NL.UTF-8"; }; example = { PATH = "/foo/bar/bin"; LANG = "nl_NL.UTF-8"; };
description = "Environment variables passed to the service's processes."; description = "Environment variables passed to the service's processes.";
}; };

2
nixos/modules/system/boot/systemd.nix
View File

@ -515,7 +515,7 @@ in
}; };
systemd.globalEnvironment = mkOption { systemd.globalEnvironment = mkOption {
type = types.attrs; type = with types; attrsOf (nullOr (either str package));
default = {}; default = {};
example = { TZ = "CET"; }; example = { TZ = "CET"; };
description = '' description = ''