Merge pull request #71338 from edef1c/nix-daemon-opt-aliases

nixos/nix-daemon: don't refer to deprecated option aliases
This commit is contained in:
edef 2019-10-21 09:59:13 +00:00 committed by GitHub
commit 0599c89d58
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 4 deletions

View file

@ -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.

View file

@ -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>.";
};