Merge pull request #1239 from AmandaCameron/patch-3
Update hydra-module.nix to use newer nixos options
This commit is contained in:
commit
81228cae50
|
@ -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";
|
||||||
|
|
Loading…
Reference in a new issue