From f4cf09e721dc24906d31d20a28baceb5a7bc6bd8 Mon Sep 17 00:00:00 2001
From: Hercules CI Effects <hercules-ci[bot]@users.noreply.github.com>
Date: Fri, 16 Feb 2024 02:23:42 +0000
Subject: [PATCH 1/2] flake.lock: Update
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Flake lock file updates:

• Updated input 'agenix':
    'github:ryantm/agenix/417caa847f9383e111d1397039c9d4337d024bf0' (2023-12-24)
  → 'github:ryantm/agenix/8cb01a0e717311680e0cbca06a76cbceba6f3ed6' (2024-02-13)
• Updated input 'attic':
    'github:zhaofengli/attic/fbe252a5c21febbe920c025560cbd63b20e24f3b' (2024-01-18)
  → 'github:zhaofengli/attic/6eabc3f02fae3683bffab483e614bebfcd476b21' (2024-02-14)
• Updated input 'hercules-ci-agent':
    'github:hercules-ci/hercules-ci-agent/d1b8efd21d1832291e58bd99805eea8f8194d07b' (2024-02-07)
  → 'github:hercules-ci/hercules-ci-agent/9f6779e23afb401e3fe2346d615f19e20bb040e1' (2024-02-14)
• Updated input 'hercules-ci-agent/nixpkgs':
    'github:NixOS/nixpkgs/faf912b086576fd1a15fca610166c98d47bc667e' (2024-02-05)
  → 'github:NixOS/nixpkgs/f9d39fb9aff0efee4a3d5f4a6d7c17701d38a1d8' (2024-02-11)
• Updated input 'nixpkgs':
    'github:NixOS/nixpkgs/620b309240d774a0ea00611d8291f96141c1e60e' (2024-02-08)
  → 'github:NixOS/nixpkgs/0ca77ade2a34c5466be6d54f1267507860c95da8' (2024-02-15)
---
 flake.lock | 30 +++++++++++++++---------------
 1 file changed, 15 insertions(+), 15 deletions(-)

diff --git a/flake.lock b/flake.lock
index e1ef609..ae85195 100644
--- a/flake.lock
+++ b/flake.lock
@@ -10,11 +10,11 @@
         "systems": "systems"
       },
       "locked": {
-        "lastModified": 1703433843,
-        "narHash": "sha256-nmtA4KqFboWxxoOAA6Y1okHbZh+HsXaMPFkYHsoDRDw=",
+        "lastModified": 1707830867,
+        "narHash": "sha256-PAdwm5QqdlwIqGrfzzvzZubM+FXtilekQ/FA0cI49/o=",
         "owner": "ryantm",
         "repo": "agenix",
-        "rev": "417caa847f9383e111d1397039c9d4337d024bf0",
+        "rev": "8cb01a0e717311680e0cbca06a76cbceba6f3ed6",
         "type": "github"
       },
       "original": {
@@ -40,11 +40,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1705617092,
-        "narHash": "sha256-n9PK4O4X4S1JkwpkMuYm1wHZYJzRqif8g3RuVIPD+rY=",
+        "lastModified": 1707922053,
+        "narHash": "sha256-wSZjK+rOXn+UQiP1NbdNn5/UW6UcBxjvlqr2wh++MbM=",
         "owner": "zhaofengli",
         "repo": "attic",
-        "rev": "fbe252a5c21febbe920c025560cbd63b20e24f3b",
+        "rev": "6eabc3f02fae3683bffab483e614bebfcd476b21",
         "type": "github"
       },
       "original": {
@@ -235,11 +235,11 @@
         "nixpkgs": "nixpkgs"
       },
       "locked": {
-        "lastModified": 1707316879,
-        "narHash": "sha256-QAE+1H+eew9eNuHmqdQv4berobTbgC4sis/dm7MRat4=",
+        "lastModified": 1707943395,
+        "narHash": "sha256-ImyLsIDT5E7NDVS8HVZGvgFC9pLI3eUamqOXh5OyQr8=",
         "owner": "hercules-ci",
         "repo": "hercules-ci-agent",
-        "rev": "d1b8efd21d1832291e58bd99805eea8f8194d07b",
+        "rev": "9f6779e23afb401e3fe2346d615f19e20bb040e1",
         "type": "github"
       },
       "original": {
@@ -422,11 +422,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1707092692,
-        "narHash": "sha256-ZbHsm+mGk/izkWtT4xwwqz38fdlwu7nUUKXTOmm4SyE=",
+        "lastModified": 1707689078,
+        "narHash": "sha256-UUGmRa84ZJHpGZ1WZEBEUOzaPOWG8LZ0yPg1pdDF/yM=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "faf912b086576fd1a15fca610166c98d47bc667e",
+        "rev": "f9d39fb9aff0efee4a3d5f4a6d7c17701d38a1d8",
         "type": "github"
       },
       "original": {
@@ -438,11 +438,11 @@
     },
     "nixpkgs_2": {
       "locked": {
-        "lastModified": 1707401858,
-        "narHash": "sha256-aDoW/6ST/C2q7auOChns0tMEtRoGYdRMbFOqNGcZ4jQ=",
+        "lastModified": 1708010317,
+        "narHash": "sha256-aUpx73pVvVag2Nyt7Ch2KfpBOh5BsIwHDINKW3pHCIc=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "620b309240d774a0ea00611d8291f96141c1e60e",
+        "rev": "0ca77ade2a34c5466be6d54f1267507860c95da8",
         "type": "github"
       },
       "original": {

From dc7f39c905211dcef60d1c7e2832ebaf01f3ecfc Mon Sep 17 00:00:00 2001
From: Max <max@privatevoid.net>
Date: Thu, 22 Feb 2024 11:26:22 +0100
Subject: [PATCH 2/2] Revert "cluster/services/attic: auto-restart atticd"

This reverts commit 6a51b09f8c1826e92be5081faea0389c069ce9d1.
Done upstream now.
---
 cluster/services/attic/server.nix | 2 --
 1 file changed, 2 deletions(-)

diff --git a/cluster/services/attic/server.nix b/cluster/services/attic/server.nix
index 812614e..1c2fa61 100644
--- a/cluster/services/attic/server.nix
+++ b/cluster/services/attic/server.nix
@@ -72,8 +72,6 @@ in
     after = [ "postgresql.service" ];
     serviceConfig = {
       DynamicUser = lib.mkForce false;
-      Restart = "on-failure";
-      RestartSec = "10s";
     };
     environment = {
       AWS_SHARED_CREDENTIALS_FILE = config.age.secrets.atticS3Credentials.path;