bug: fix autodeploy generation naming

configuration.nix

@@ -5,7 +5,6 @@
   hostInfo,
   customPkgs,
   flakeRev,
-  deployLabel,
   ...
 }:
 let
@@ -63,7 +62,14 @@ in
 
   time.timeZone = "UTC";
   system.stateVersion = "26.05";
-  system.nixos.label = if deployLabel != null then deployLabel else flakeRev;
+  system.nixos.label =
+    let
+      labelFile = ./.nixos-label;
+    in
+    if builtins.pathExists labelFile then
+      lib.removeSuffix "\n" (builtins.readFile labelFile)
+    else
+      flakeRev;
 
   nix = {
     settings = {

flake.lock

@@ -1,17 +1,5 @@
 {
   "nodes": {
-    "deploy-label": {
-      "flake": false,
-      "locked": {
-        "path": "./misc/deploy-label",
-        "type": "path"
-      },
-      "original": {
-        "path": "./misc/deploy-label",
-        "type": "path"
-      },
-      "parent": []
-    },
     "flake-utils": {
       "inputs": {
         "systems": "systems"
@@ -38,11 +26,11 @@
         "spectrum": "spectrum"
       },
       "locked": {
-        "lastModified": 1789506833,
-        "narHash": "sha256-4L8SOCF84de1irB72Ka9VHcu9wrAJ9Amuey4lU9oh4Y=",
+        "lastModified": 1786300091,
+        "narHash": "sha256-4UFJOVGpaYtHW5yasSv80MaJxTBYdk2zyf3jhKtt0wA=",
         "owner": "microvm-nix",
         "repo": "microvm.nix",
-        "rev": "187b0a390ee054028106a674e7b01b1cb940cbba",
+        "rev": "71beea0076cd46dafcee97a5a2e7d00cbba5bd2f",
         "type": "github"
       },
       "original": {
@@ -75,11 +63,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1789546076,
-        "narHash": "sha256-zVxLZiSnmaaPLwnhj7pwmqe3axBg/C6nG5JZsJMh2g4=",
+        "lastModified": 1786384358,
+        "narHash": "sha256-RzPPiWeUtuvymnpuEWsdtzli5w4kjZs49FqEs3/1u+I=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "b1b875982b17dabde9b4a37f3e229e74913e6db3",
+        "rev": "2fcb964de67fcf60b43471c55d5d99e61a9ccb5a",
         "type": "github"
       },
       "original": {
@@ -91,7 +79,6 @@
     },
     "root": {
       "inputs": {
-        "deploy-label": "deploy-label",
         "microvm": "microvm",
         "mtce": "mtce",
         "nixpkgs": "nixpkgs"
@@ -100,11 +87,11 @@
     "spectrum": {
       "flake": false,
       "locked": {
-        "lastModified": 1786032750,
-        "narHash": "sha256-+Ba/kIn5BjvV7PN8bWOo7RoqgTY/Yv2M7qeMf3wS2Ag=",
+        "lastModified": 1785761586,
+        "narHash": "sha256-MWOMVqJJERwjQGgRIv8d6rlEBqbLM3VZWxHkNKIIZNw=",
         "ref": "refs/heads/main",
-        "rev": "77d2389874bb092b8dbf05ecc5b1030372e80e98",
-        "revCount": 1417,
+        "rev": "a7762d6f54b40560dd5255ce902e6e6a5d980fe9",
+        "revCount": 1416,
         "type": "git",
         "url": "https://spectrum-os.org/git/spectrum"
       },

flake.nix

@@ -7,8 +7,6 @@
     mtce.inputs.nixpkgs.follows = "nixpkgs";
     microvm.url = "github:microvm-nix/microvm.nix";
     microvm.inputs.nixpkgs.follows = "nixpkgs";
-    deploy-label.url = "path:./misc/deploy-label";
-    deploy-label.flake = false;
   };
 
   outputs =
@@ -17,7 +15,6 @@
       nixpkgs,
       mtce,
       microvm,
-      deploy-label,
       ...
     }:
     let
@@ -26,12 +23,6 @@
       pkgs = import nixpkgs { inherit system; };
 
       flakeRev = self.shortRev or self.dirtyShortRev or "unknown";
-      deployLabel =
-        let
-          labelFile = "${deploy-label}/label";
-          raw = lib.removeSuffix "\n" (builtins.readFile labelFile);
-        in
-        if raw != "" then raw else null;
 
       customPkgs = {
         hopper-rs = pkgs.callPackage ./packages/hopper-rs.nix { };
@@ -65,7 +56,7 @@
 
       specialArgsFor = hostName: {
         hostInfo = hostInfoFor hostName;
-        inherit inputs customPkgs flakeRev deployLabel;
+        inherit inputs customPkgs flakeRev;
       };
 
       hostDefFor =

modules/autodeploy.nix

@@ -38,7 +38,7 @@ in
       type = lib.types.listOf lib.types.str;
       default = [ ];
     };
-
+    
     repoOwner = lib.mkOption {
       type = lib.types.str;
       description = "User that owns the configuration checkout";

scripts/server-autodeploy.sh

@@ -48,17 +48,15 @@ runas git tag -v "$latest" || {
 sha=$(runas git rev-list -1 "$latest")
 report_status "pending" "deploying $latest" "$sha"
 
-label_dir=$(mktemp -d)
-echo "$latest" > "$label_dir/label"
-flake_url="git+${GITEA_URL}/${GITEA_REPO}?ref=refs/tags/${latest}&rev=${sha}#$HOSTNAME"
+runas git checkout "$latest"
+runas tee .nixos-label <<< "$latest" >/dev/null
+runas git add .nixos-label
 
-if nixos-rebuild switch --flake "$flake_url" --override-input deploy-label "path:$label_dir"; then
-  rm -rf "$label_dir"
+if nixos-rebuild switch --flake ".#$HOSTNAME"; then
   echo "$latest" > "$STATE_DIR/tag"
   report_status "success" "deployed $latest" "$sha"
   echo "deployed $latest"
 else
-  rm -rf "$label_dir"
   report_status "failure" "nixos-rebuild failed" "$sha"
   exit 1
 fi