diff options
| author | edef <edef@edef.eu> | 2019-10-21 09:59:13 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-10-21 09:59:13 +0000 |
| commit | 0599c89d588435a3fbd177ef16fcd74069a454ed (patch) | |
| tree | dde4f844abbcfbc593b623356e0ff4f910af8c04 /nixos/modules/services | |
| parent | 7474d9c3bfc4e6485d61a44e385a1f5384ea7468 (diff) | |
| parent | a68219b79bf9f6cd84d443b0eb94f38287c19cd4 (diff) | |
| download | nixlib-0599c89d588435a3fbd177ef16fcd74069a454ed.tar nixlib-0599c89d588435a3fbd177ef16fcd74069a454ed.tar.gz nixlib-0599c89d588435a3fbd177ef16fcd74069a454ed.tar.bz2 nixlib-0599c89d588435a3fbd177ef16fcd74069a454ed.tar.lz nixlib-0599c89d588435a3fbd177ef16fcd74069a454ed.tar.xz nixlib-0599c89d588435a3fbd177ef16fcd74069a454ed.tar.zst nixlib-0599c89d588435a3fbd177ef16fcd74069a454ed.zip | |
Merge pull request #71338 from edef1c/nix-daemon-opt-aliases
nixos/nix-daemon: don't refer to deprecated option aliases
Diffstat (limited to 'nixos/modules/services')
| -rw-r--r-- | nixos/modules/services/continuous-integration/hydra/default.nix | 4 | ||||
| -rw-r--r-- | nixos/modules/services/misc/nix-daemon.nix | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/nixos/modules/services/continuous-integration/hydra/default.nix b/nixos/modules/services/continuous-integration/hydra/default.nix index 2da10a9a5e2a..30c5550f71c5 100644 --- a/nixos/modules/services/continuous-integration/hydra/default.nix +++ b/nixos/modules/services/continuous-integration/hydra/default.nix @@ -242,8 +242,8 @@ in environment.variables = hydraEnv; nix.extraOptions = '' - gc-keep-outputs = true - gc-keep-derivations = true + keep-outputs = true + keep-derivations = true # The default (`true') slows Nix down a lot since the build farm # has so many GC roots. diff --git a/nixos/modules/services/misc/nix-daemon.nix b/nixos/modules/services/misc/nix-daemon.nix index ff4e4f5b97d5..c1754c0e0ecb 100644 --- a/nixos/modules/services/misc/nix-daemon.nix +++ b/nixos/modules/services/misc/nix-daemon.nix @@ -152,8 +152,8 @@ in type = types.lines; default = ""; example = '' - gc-keep-outputs = true - gc-keep-derivations = true + keep-outputs = true + keep-derivations = true ''; description = "Additional text appended to <filename>nix.conf</filename>."; }; |