Merge remote-tracking branch 'origin/master' into update-nix

2022-09-06 16:14:23 +02:00
parent 481ca71d6e 222a8047e4
commit d61702f86d
7 changed files with 36 additions and 141 deletions
--- a/hydra-module.nix
+++ b/hydra-module.nix
@ -228,8 +228,12 @@ in
        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 =
      ''
        using_frontend_proxy = 1
@ -256,11 +260,6 @@ in

    environment.variables = hydraEnv;

-    nix.extraOptions = ''
-      gc-keep-outputs = true
-      gc-keep-derivations = true
-    '';
-
    systemd.services.hydra-init =
      { wantedBy = [ "multi-user.target" ];
        requires = optional haveLocalDB "postgresql.service";