fixup! nixos v24.05

flake.lock

@@ -44,11 +44,11 @@
     "flake-compat": {
       "flake": false,
       "locked": {
-        "lastModified": 1668681692,
+        "lastModified": 1696426674,
-        "narHash": "sha256-Ht91NGdewz8IQLtWZ9LCeNXMSXHUss+9COoqu6JLmXU=",
+        "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=",
         "owner": "edolstra",
         "repo": "flake-compat",
-        "rev": "009399224d5e398d03b22badca40a37ac85412a1",
+        "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33",
         "type": "github"
       },
       "original": {
@@ -166,36 +166,6 @@
         "type": "github"
       }
     },
-    "nixpkgs-23_05": {
-      "locked": {
-        "lastModified": 1704290814,
-        "narHash": "sha256-LWvKHp7kGxk/GEtlrGYV68qIvPHkU9iToomNFGagixU=",
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "70bdadeb94ffc8806c0570eb5c2695ad29f0e421",
-        "type": "github"
-      },
-      "original": {
-        "id": "nixpkgs",
-        "ref": "nixos-23.05",
-        "type": "indirect"
-      }
-    },
-    "nixpkgs-23_11": {
-      "locked": {
-        "lastModified": 1706098335,
-        "narHash": "sha256-r3dWjT8P9/Ah5m5ul4WqIWD8muj5F+/gbCdjiNVBKmU=",
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "a77ab169a83a4175169d78684ddd2e54486ac651",
-        "type": "github"
-      },
-      "original": {
-        "id": "nixpkgs",
-        "ref": "nixos-23.11",
-        "type": "indirect"
-      }
-    },
     "nixpkgs-unstable": {
       "locked": {
         "lastModified": 1716948383,
@@ -228,11 +198,11 @@
     },
     "secrets": {
       "locked": {
-        "lastModified": 1717157873,
+        "lastModified": 1717366287,
-        "narHash": "sha256-83FNu9/bO88ubXOUakzRfBvJJYLbIlN+fVtAtVy/as8=",
+        "narHash": "sha256-WEeB72ELO+frVaTQHOyMymoAB0vAAaVM9qSQ/6K5HkU=",
         "ref": "refs/heads/master",
-        "rev": "3369fe960dfa17dc4b3a3f84f10fd30e49fee75f",
+        "rev": "8a19e91e0a30f444d77da33dd1f44979f7774e92",
-        "revCount": 41,
+        "revCount": 42,
         "type": "git",
         "url": "ssh://git@git.caspervk.net/caspervk/nixos-secrets.git"
       },
@@ -248,22 +218,20 @@
         "nixpkgs": [
           "nixpkgs"
         ],
-        "nixpkgs-23_05": "nixpkgs-23_05",
-        "nixpkgs-23_11": "nixpkgs-23_11",
         "utils": "utils"
       },
       "locked": {
-        "lastModified": 1706219574,
+        "lastModified": 1714720456,
-        "narHash": "sha256-qO+8UErk+bXCq2ybHU4GzXG4Ejk4Tk0rnnTPNyypW4g=",
+        "narHash": "sha256-e0WFe1BHqX23ADpGBc4ZRu38Mg+GICCZCqyS6EWCbHc=",
         "owner": "simple-nixos-mailserver",
         "repo": "nixos-mailserver",
-        "rev": "e47f3719f1db3e0961a4358d4cb234a0acaa7baf",
+        "rev": "41059fc548088e49e3ddb3a2b4faeb5de018e60f",
         "type": "gitlab"
       },
       "original": {
         "owner": "simple-nixos-mailserver",
-        "ref": "nixos-23.11",
         "repo": "nixos-mailserver",
+        "rev": "41059fc548088e49e3ddb3a2b4faeb5de018e60f",
         "type": "gitlab"
       }
     },
@@ -282,13 +250,31 @@
         "type": "github"
       }
     },
-    "utils": {
+    "systems_2": {
       "locked": {
-        "lastModified": 1605370193,
+        "lastModified": 1681028828,
-        "narHash": "sha256-YyMTf3URDL/otKdKgtoMChu4vfVL3vCMkRqpGifhUn0=",
+        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
+        "owner": "nix-systems",
+        "repo": "default",
+        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-systems",
+        "repo": "default",
+        "type": "github"
+      }
+    },
+    "utils": {
+      "inputs": {
+        "systems": "systems_2"
+      },
+      "locked": {
+        "lastModified": 1709126324,
+        "narHash": "sha256-q6EQdSeUZOG26WelxqkmR7kArjgWCdw5sfJVHPH/7j8=",
         "owner": "numtide",
         "repo": "flake-utils",
-        "rev": "5021eac20303a61fafe17224c087f5519baed54d",
+        "rev": "d465f4819400de7c8d874d50b982301f28a84605",
         "type": "github"
       },
       "original": {

flake.nix

@@ -40,7 +40,9 @@
       inputs.nixpkgs.follows = "nixpkgs"; # use the same nixpkgs as the system
     };
     simple-nixos-mailserver = {
-      url = "gitlab:simple-nixos-mailserver/nixos-mailserver/nixos-23.11";
+      # TODO
+      # url = "gitlab:simple-nixos-mailserver/nixos-mailserver/nixos-24.05";
+      url = "gitlab:simple-nixos-mailserver/nixos-mailserver/41059fc548088e49e3ddb3a2b4faeb5de018e60f";
       inputs.nixpkgs.follows = "nixpkgs"; # use the same nixpkgs as the system
     };
   };

hosts/sigma/forgejo.nix

@@ -77,13 +77,13 @@
   # https://wiki.nixos.org/wiki/Forgejo
   # https://forgejo.org/docs/latest/admin/actions/
   services.gitea-actions-runner = {
-    package = pkgs.forgejo-actions-runner;
+    package = pkgs.forgejo-runner;
     instances."default" = {
       enable = true;
       name = "default";
       url = "https://git.caspervk.net";
       # From https://git.caspervk.net/admin/actions/runners/
-      tokenFile = config.age.secrets.forgejo-actions-runner-token-file.path;
+      tokenFile = config.age.secrets.forgejo-runner-token-file.path;
       # The Forgejo runner relies on application containers (Docker, Podman,
       # etc) to execute a workflow in an isolated environment. Labels are used
       # to map jobs' `runs-on` to their runtime environment. Many common
@@ -124,8 +124,8 @@
     ];
   };
 
-  age.secrets.forgejo-actions-runner-token-file = {
+  age.secrets.forgejo-runner-token-file = {
-    file = "${secrets}/secrets/forgejo-actions-runner-token-file.age";
+    file = "${secrets}/secrets/forgejo-runner-token-file.age";
     mode = "400";
     owner = "root";
     group = "root";

hosts/sigma/matrix.nix

@@ -49,7 +49,7 @@
   };
 
   # https://github.com/matrix-org/sliding-sync
-  services.matrix-synapse.sliding-sync = {
+  services.matrix-sliding-sync = {
     # Unlike matrix-synapse, sliding-sync has createDatabase=true by default,
     # which means we don't have to configure the database in the postgres
     # service manually.

overlays/default.nix

@@ -1,3 +1,3 @@
 {...}: {
-  imports = [./forgejo-actions-runner.nix];
+  imports = [];
 }

overlays/forgejo-actions-runner.nix

@@ -1,24 +0,0 @@
-{...}: {
-  # Running containers without /bin/sleep (such as nixos) requires newer
-  # forgejo act runner. See https://codeberg.org/forgejo/forgejo/issues/2611.
-  nixpkgs.overlays = [
-    (final: prev: {
-      forgejo-actions-runner = prev.callPackage "${prev.path}/pkgs/development/tools/continuous-integration/forgejo-actions-runner" {
-        buildGoModule = args:
-          prev.buildGoModule (args
-            // rec {
-              version = "3.4.1";
-
-              src = prev.fetchFromGitea {
-                domain = "codeberg.org";
-                owner = "forgejo";
-                repo = "runner";
-                rev = "v${version}";
-                hash = "sha256-c8heIHt+EJ6LnZT4/6TTWd7v85VRHjH72bdje12un4M=";
-              };
-              vendorHash = "sha256-FCCQZdAYRtJR3DGQIEvUzv+1kqvxVTGkwJwZSohq28s=";
-            });
-      };
-    })
-  ];
-}