b12f/nixpkgs
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Rename environment.systemVariables -> environment.sessionVariables

Browse source 
This makes it clearer that they're part of PAM sessions.
This commit is contained in:
Eelco Dolstra 2014-06-13 17:56:46 +02:00
parent 27c72f337b
commit f5055e2ef6
6 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
nixos/modules/config/i18n.nix
View file

@ -76,7 +76,7 @@ in
environment.systemPackages = [ glibcLocales ]; environment.systemPackages = [ glibcLocales ];
environment.systemVariables = environment.sessionVariables =
{ LANG = config.i18n.defaultLocale; { LANG = config.i18n.defaultLocale;
LOCALE_ARCHIVE = "/run/current-system/sw/lib/locale/locale-archive"; LOCALE_ARCHIVE = "/run/current-system/sw/lib/locale/locale-archive";
}; };

4
nixos/modules/config/system-environment.nix
View file

@ -14,7 +14,7 @@ in
options = { options = {
environment.systemVariables = mkOption { environment.sessionVariables = mkOption {
default = {}; default = {};
description = '' description = ''
A set of environment variables used in the global environment. A set of environment variables used in the global environment.
@ -48,7 +48,7 @@ in
'' ''
${concatStringsSep "\n" ( ${concatStringsSep "\n" (
(mapAttrsToList (n: v: ''${n}="${concatStringsSep ":" v}"'') (mapAttrsToList (n: v: ''${n}="${concatStringsSep ":" v}"'')
(zipAttrsWith (const concatLists) ([ (mapAttrs (n: v: [ v ]) cfg.systemVariables) ]))))} (zipAttrsWith (const concatLists) ([ (mapAttrs (n: v: [ v ]) cfg.sessionVariables) ]))))}
''; '';
}; };

2
nixos/modules/config/timezone.nix
View file

@ -30,7 +30,7 @@ in
config = { config = {
environment.systemVariables.TZDIR = "/etc/zoneinfo"; environment.sessionVariables.TZDIR = "/etc/zoneinfo";
systemd.globalEnvironment.TZDIR = tzdir; systemd.globalEnvironment.TZDIR = tzdir;

2
nixos/modules/programs/environment.nix
View file

@ -23,7 +23,7 @@ in
EDITOR = "nano"; EDITOR = "nano";
}; };
environment.systemVariables = environment.sessionVariables =
{ NIX_PATH = { NIX_PATH =
[ "/nix/var/nix/profiles/per-user/root/channels/nixos" [ "/nix/var/nix/profiles/per-user/root/channels/nixos"
"nixpkgs=/etc/nixos/nixpkgs" "nixpkgs=/etc/nixos/nixpkgs"

2
nixos/modules/security/ca.nix
View file

@ -12,7 +12,7 @@ with lib;
} }
]; ];
environment.systemVariables = environment.sessionVariables =
{ OPENSSL_X509_CERT_FILE = "/etc/ssl/certs/ca-bundle.crt"; { OPENSSL_X509_CERT_FILE = "/etc/ssl/certs/ca-bundle.crt";
CURL_CA_BUNDLE = "/etc/ssl/certs/ca-bundle.crt"; CURL_CA_BUNDLE = "/etc/ssl/certs/ca-bundle.crt";
GIT_SSL_CAINFO = "/etc/ssl/certs/ca-bundle.crt"; GIT_SSL_CAINFO = "/etc/ssl/certs/ca-bundle.crt";

2
nixos/modules/services/misc/nix-daemon.nix
View file

@ -318,7 +318,7 @@ in
}; };
# Set up the environment variables for running Nix. # Set up the environment variables for running Nix.
environment.systemVariables = cfg.envVars; environment.sessionVariables = cfg.envVars;
environment.extraInit = environment.extraInit =
'' ''