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

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

Browse Source 
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
nixos/modules/services/continuous-integration/hydra/default.nix
View File

@ -242,8 +242,8 @@ in
environment.variables = hydraEnv; environment.variables = hydraEnv;
nix.extraOptions = '' nix.extraOptions = ''
gc-keep-outputs = true keep-outputs = true
gc-keep-derivations = true keep-derivations = true
# The default (`true') slows Nix down a lot since the build farm # The default (`true') slows Nix down a lot since the build farm
# has so many GC roots. # has so many GC roots.

4
nixos/modules/services/misc/nix-daemon.nix
View File

@ -152,8 +152,8 @@ in
type = types.lines; type = types.lines;
default = ""; default = "";
example = '' example = ''
gc-keep-outputs = true keep-outputs = true
gc-keep-derivations = true keep-derivations = true
''; '';
description = "Additional text appended to <filename>nix.conf</filename>."; description = "Additional text appended to <filename>nix.conf</filename>.";
}; };