vriska/hydra
0
0
Fork 0
forked from lix-project/hydra
Code Pull requests Activity

Update hydra-module.nix to use newer nixos options

Browse source 
nix.trustedUsers is deprecated as of 22.05, and since the nix.extraOptions config is just doing something similar, I moved that to the new nix.settings as well
This commit is contained in:
Amanda Cameron 2022-07-22 10:35:38 -04:00 committed by GitHub
parent e2756042b8
commit 9656f16509
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
hydra-module.nix
View file

@ -228,7 +228,11 @@ in
useDefaultShell = true; useDefaultShell = true;
}; };
nix.trustedUsers = [ "hydra-queue-runner" ]; nix.settings = {
trusted-users = [ "hydra-queue-runner" ];
gc-keep-outputs = true;
gc-keep-derivations = true;
};
services.hydra-dev.extraConfig = services.hydra-dev.extraConfig =
'' ''
@ -256,11 +260,6 @@ in
environment.variables = hydraEnv; environment.variables = hydraEnv;
nix.extraOptions = ''
gc-keep-outputs = true
gc-keep-derivations = true
'';
systemd.services.hydra-init = systemd.services.hydra-init =
{ wantedBy = [ "multi-user.target" ]; { wantedBy = [ "multi-user.target" ];
requires = optional haveLocalDB "postgresql.service"; requires = optional haveLocalDB "postgresql.service";