disable gnutls patch

common/optional/x86-64-v3/patches/default.nix

@@ -1,9 +1,14 @@
 _final: prev:
 (import ./abseil { inherit prev; })
 // {
-  gnutls = import ./gnutls { inherit (prev) gnutls; };
+  # gnutls = import ./gnutls { inherit (prev) gnutls; };
   libjpeg_turbo = import ./libjpeg-turbo { inherit (prev) lib libjpeg_turbo stdenv; };
   prometheus = import ./prometheus { inherit (prev) prometheus; };
+  # Temporarily skip the date-dependent now.ck failure; remove after updating
+  # nixpkgs to include https://github.com/NixOS/nixpkgs/pull/582577.
+  tzdata = prev.tzdata.overrideAttrs (_: {
+    doCheck = false;
+  });
   zopfli = import ./zopfli { inherit (prev) zopfli; };
 
   pythonPackagesExtensions = prev.pythonPackagesExtensions ++ [

flake.lock

@@ -7,11 +7,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1792526520,
-        "narHash": "sha256-3hSJlv8mUVnZPMWK2+CM7a9O+nR6Z4mCh27NfLCmTPc=",
+        "lastModified": 1794328522,
+        "narHash": "sha256-h2BYMW4nTFpIqnMd8gwAPFmJAp/1wWLQ6vT0NfL5qt4=",
         "owner": "nix-community",
         "repo": "disko",
-        "rev": "cedd626e11b635470fa6f9fdb8ad79b0075dd7f9",
+        "rev": "1dd30c29c88d99ce295f15e27f93c49bc5fbae07",
         "type": "github"
       },
       "original": {
@@ -45,11 +45,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1793193205,
-        "narHash": "sha256-X6xa6sGA7RnJQuZGbFMC+K+KToWAlBDCCjJXfTwEPsw=",
+        "lastModified": 1794278858,
+        "narHash": "sha256-rkrJwLgLSHBnXfgoSKIDa+2LLGdTqynsV3GAxOTGhUU=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "095fef2f265c3c0da4fe315efba8f8a04495ab34",
+        "rev": "82ce401aa350502897c3f2e85f384d61cd3b0b6d",
         "type": "github"
       },
       "original": {
@@ -67,11 +67,11 @@
         "rust-overlay": "rust-overlay"
       },
       "locked": {
-        "lastModified": 1793017781,
-        "narHash": "sha256-YRem1WRn//ruQ7QukBCjpn/Uwmd17vGLml8w3i+Swd8=",
+        "lastModified": 1794656551,
+        "narHash": "sha256-qDY3RT0XuXb+Zxs+P/mrqOxQWoDH2n8EbxVULunZ8oU=",
         "owner": "LLukas22",
         "repo": "Jellyswarrm",
-        "rev": "90cca4fe7e6f855453866b71ca5b38773342a0c4",
+        "rev": "72c941578f97f74a87984db9328adb6851ab1e14",
         "type": "github"
       },
       "original": {
@@ -85,11 +85,11 @@
         "nixpkgs": "nixpkgs"
       },
       "locked": {
-        "lastModified": 1793236063,
-        "narHash": "sha256-jGFe4xdrCw6xpgH2zgKwslACyt/NGuPwGILPEMFxmcQ=",
+        "lastModified": 1794597451,
+        "narHash": "sha256-bUkc9dMpCFiJuuf5Efr7pnCDs5q18aA8zJah+MYZl9w=",
         "owner": "nixos",
         "repo": "nixos-hardware",
-        "rev": "b6754c901c21478fd8450d62101e712b2a4f0d75",
+        "rev": "eb3c90bd715f7a9a28719bb014f53d309ccb2fc8",
         "type": "github"
       },
       "original": {
@@ -114,11 +114,11 @@
     },
     "nixpkgs-master": {
       "locked": {
-        "lastModified": 1793315900,
-        "narHash": "sha256-z5lZoCwheBzMgRtfYlGLMhmPwhv1Rty16Kf269n8ctc=",
+        "lastModified": 1794683356,
+        "narHash": "sha256-OXfUyqruV6ug7YsBtHybhxwHC9afvEr1WRDmX9rPjaU=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "db379a58acfef9783b46ffde2957dac397c92b85",
+        "rev": "4a616a343aea95d18a93d65d5270836e10839078",
         "type": "github"
       },
       "original": {
@@ -146,11 +146,11 @@
     },
     "nixpkgs_2": {
       "locked": {
-        "lastModified": 1793110635,
-        "narHash": "sha256-dhoW6VgFWlaodSY5jrBn+CF2FLmaUvDVgM7+C7T2+NM=",
+        "lastModified": 1794386569,
+        "narHash": "sha256-x9sADJvoVG0L6RejZB+/BB4YiGZFBZrfTlhF4uBq1tQ=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "31ecbaca1bdefa45dffc409f0250bd8039ea0010",
+        "rev": "d4f25a3e562008648d45bcf2d70bcc7422cad84e",
         "type": "github"
       },
       "original": {
@@ -181,11 +181,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1779419951,
-        "narHash": "sha256-dMX0PUslUHPajP6o8FEoRdFv9afq/dec4POR0vVfjK4=",
+        "lastModified": 1793174968,
+        "narHash": "sha256-u5nUf4cewaT36iIzG1s/VECktqUMiZaGF5BsgervsvQ=",
         "owner": "oxalica",
         "repo": "rust-overlay",
-        "rev": "5b5c521d6cae9ef4aa32f888eb2c0ce595c9be52",
+        "rev": "19ecdd08213836b36c4296a3a4f4af5a3d5308db",
         "type": "github"
       },
       "original": {
@@ -201,11 +201,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1793052255,
-        "narHash": "sha256-Y/JIHTnMlOabDfyaSBubWGLDIVGihLEUuoMhFvQKaDo=",
+        "lastModified": 1794624949,
+        "narHash": "sha256-3q/hxp/flW1PnV3Dx+H3p8kHGEHJ7251BqVMNsAAB9E=",
         "owner": "Mic92",
         "repo": "sops-nix",
-        "rev": "60182817ee048ac94b4c68ea76d5ef2e8aac730d",
+        "rev": "11e5885d241743ff0193465d533b20e754bc3ce0",
         "type": "github"
       },
       "original": {

systems/jeeves/runners/register_gitea_runner.sh

@@ -1,38 +1,21 @@
 #!/usr/bin/env bash
 
-# Newer runner modules export INSTANCE_DIR and multiple colon-separated state paths.
-instance_dir="${INSTANCE_DIR:-${STATE_DIRECTORY%%:*}/$1}"
-legacy_instance_dir="$(dirname "$instance_dir")/$(hostname)"
+legacy_instance_dir="$STATE_DIRECTORY/$(hostname)"
+instance_dir="$STATE_DIRECTORY/$1"
 runner_url="$2"
 runner_config_file="$3"
 shift 3
 runner_labels="$(IFS=,; printf '%s' "$*")"
 
-if [ "$legacy_instance_dir" != "$instance_dir" ] && [ -d "$legacy_instance_dir" ]; then
-  # systemd may have already created an empty instance directory.
-  if [ ! -e "$instance_dir" ] || rmdir "$instance_dir" 2>/dev/null; then
-    mv "$legacy_instance_dir" "$instance_dir"
-  fi
+if [ ! -e "$instance_dir" ] && [ -d "$legacy_instance_dir" ]; then
+  mv "$legacy_instance_dir" "$instance_dir"
 fi
 
 mkdir -vp "$instance_dir"
 cd "$instance_dir" || exit 1
 
-# Newer modules use LoadCredential; older ones export TOKEN via EnvironmentFile.
-runner_token="${TOKEN:-}"
-if [ -n "${CREDENTIALS_DIRECTORY:-}" ]; then
-  runner_token="$(cat "$CREDENTIALS_DIRECTORY/token")"
-  # Keep accepting the legacy TOKEN= format as well as a raw token.
-  while IFS= read -r token_line; do
-    if [[ "$token_line" =~ ^[[:space:]]*TOKEN= ]]; then
-      runner_token="${token_line#*=}"
-    fi
-  done <<< "$runner_token"
-fi
-: "${runner_token:?Runner registration token is missing}"
-
 token_hash_file="$instance_dir/.token-hash"
-token_hash_current="$(printf '%s' "$runner_token" | sha256sum | cut -d' ' -f1)"
+token_hash_current="$(printf '%s' "$TOKEN" | sha256sum | cut -d' ' -f1)"
 token_hash_stored="$(cat "$token_hash_file" 2>/dev/null || echo "")"
 labels_file="$instance_dir/.labels"
 labels_wanted="$(printf '%s\n' "$@" | sort)"
@@ -43,7 +26,7 @@ if [ ! -e "$instance_dir/.runner" ] || [ "$labels_wanted" != "$labels_current" ]
 
   gitea-runner register --no-interactive \
     --instance "$runner_url" \
-    --token "$runner_token" \
+    --token "$TOKEN" \
     --name "jeeves-$(hostname)" \
     --labels "$runner_labels" \
     --config "$runner_config_file"