flake.lock: Update

Flake lock file updates:

• Updated input 'hydra':
    'git+https://git.lix.systems/lix-project/hydra.git?ref=refs/heads/main&rev=e9d0a3a754d5a477126ecb3c0bac3bf91a5bb189' (2024-06-24)
  → 'git+https://git.lix.systems/lix-project/hydra.git?ref=refs/heads/main&rev=a9a2679793a17325c966dec4cbb27d44b0531694' (2024-06-24)
• Updated input 'nixpkgs':
    'github:NixOS/nixpkgs/9b10b8f00cb5494795e5f51b39210fed4d2b0748' (2024-06-20)
  → 'github:NixOS/nixpkgs/9693852a2070b398ee123a329e68f0dab5526681' (2024-06-22)

flake.lock

@@ -144,11 +144,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1718119663,
-        "narHash": "sha256-36+umLoMsx0ZHNcuTNAhmRTw3JoyaIS9vOy9NnKRPhQ=",
+        "lastModified": 1719258100,
+        "narHash": "sha256-Eu8ausj0RsXV5MraCPezwX+j51iZD0ukif110Yj2+6k=",
         "ref": "refs/heads/main",
-        "rev": "cbe527a3ee6256de0c5bde5b10821f5095b60e22",
-        "revCount": 4170,
+        "rev": "a9a2679793a17325c966dec4cbb27d44b0531694",
+        "revCount": 4172,
         "type": "git",
         "url": "https://git.lix.systems/lix-project/hydra.git"
       },
@@ -169,11 +169,11 @@
         "pre-commit-hooks": "pre-commit-hooks"
       },
       "locked": {
-        "lastModified": 1718081112,
-        "narHash": "sha256-3cpIVHuyo6yz9n7U/7U/p2Lmwjj1xHdTJR2RkT5JntY=",
+        "lastModified": 1719211568,
+        "narHash": "sha256-oIgmvhe3CV/36LC0KXgqWnKXma39wabks8U9JBMDfO4=",
         "ref": "refs/heads/main",
-        "rev": "8a3d063a494c4b8c767190a5ce3e4075a75f9d07",
-        "revCount": 15756,
+        "rev": "4c3d93611f2848c56ebc69c85f2b1e18001ed3c7",
+        "revCount": 15877,
         "type": "git",
         "url": "https://git@git.lix.systems/lix-project/lix"
       },
@@ -200,11 +200,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1718870667,
-        "narHash": "sha256-jab3Kpc8O1z3qxwVsCMHL4+18n5Wy/HHKyu1fcsF7gs=",
+        "lastModified": 1719082008,
+        "narHash": "sha256-jHJSUH619zBQ6WdC21fFAlDxHErKVDJ5fpN0Hgx4sjs=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "9b10b8f00cb5494795e5f51b39210fed4d2b0748",
+        "rev": "9693852a2070b398ee123a329e68f0dab5526681",
         "type": "github"
       },
       "original": {
@@ -251,6 +251,10 @@
         "agenix": "agenix",
         "colmena": "colmena",
         "hydra": "hydra",
+        "lix": [
+          "hydra",
+          "nix"
+        ],
         "nixpkgs": "nixpkgs"
       }
     },

flake.nix

@@ -12,12 +12,18 @@
 
     hydra.url = "git+https://git.lix.systems/lix-project/hydra.git";
     hydra.inputs.nixpkgs.follows = "nixpkgs";
+
+    lix.follows = "hydra/nix";
   };
 
   outputs = { nixpkgs, ... } @ inputs: {
     colmena = {
       meta.nixpkgs = import nixpkgs {
         system = "x86_64-linux";
+        overlays = [
+          inputs.hydra.overlays.default
+          inputs.lix.overlays.default
+        ];
       };
       meta.specialArgs.inputs = inputs;
 

services/hydra/default.nix

@@ -1,4 +1,4 @@
-{ config, lib, ... }:
+{ config, lib, pkgs, ... }:
 
 let
   cfg = config.bagel.services.hydra;
@@ -47,6 +47,10 @@ in {
 
       notificationSender = "bagel@delroth.net";
 
+      # XXX: hydra overlay sets pkgs.hydra, but hydra's nixos module uses
+      # pkgs.hydra_unstable...
+      package = pkgs.hydra;
+
       buildMachinesFiles = [
         (pkgs.writeText "hydra-builders.conf" ''
           ssh://bagel-builder@epyc.infra.newtype.fr x86_64-linux ${config.age.secrets.hydra-ssh-key-priv.path} 8 1 big-parallel,kvm,nixos-test - c3NoLWVkMjU1MTkgQUFBQUMzTnphQzFsWkRJMU5URTVBQUFBSUJwcFBwKzhsdDFSTDNodW5aaGlXRUUvY1laaHJXYjFzaVhKVWpiU2l6Rzggcm9vdEBlcHljCg==

services/postgres/default.nix

@@ -12,8 +12,8 @@ in {
   config = lib.mkIf cfg.enable {
     systemd.tmpfiles.rules = [
       "d /var/db 0755 root root - -"
-      "d /var/db/postgresql 0770 postgres postgres - -"
-      "d ${dataDir} 0770 postgres postgres - -"
+      "d /var/db/postgresql 0750 postgres postgres - -"
+      "d ${dataDir} 0750 postgres postgres - -"
     ];
 
     services.postgresql = {
@@ -43,6 +43,10 @@ in {
       authentication = ''
         local hydra all ident map=hydra-users
       '';
+
+      settings = {
+        max_connections = 500;
+      };
     };
   };
 }