overlays: fix 1

flake.nix

@@ -91,8 +91,17 @@
     mkDeployPkgs = system:
       import nixpkgs {
         inherit system;
+        overlays = mkOverlays system;
+      };
+
+    deployPkgsIA64 = mkDeployPkgs "x86_64-linux";
+    deployPkgsArm64 = mkDeployPkgs "aarch64-linux";
+    # accepting "system" argument in case we need to construct
+    # nixpkgs-unstable. See git log around the switch from 23.05 to 23.11.
+    mkOverlays = system: [
+      nur.overlay
+      e11sync.overlays.default
 
-        overlays = [
       deploy-rs.overlay
       (_self: super: {
         deploy-rs = {
@@ -101,15 +110,6 @@
         };
       })
     ];
-      };
-    deployPkgsIA64 = mkDeployPkgs "x86_64-linux";
-    deployPkgsArm64 = mkDeployPkgs "aarch64-linux";
-    # accepting "system" argument in case we need to construct
-    # nixpkgs-unstable. See git log around the switch from 23.05 to 23.11.
-    mkOverlays = _: [
-      nur.overlay
-      e11sync.overlays.default
-    ];
   in
     {
       #nixosConfigurations.vm = nixpkgs.lib.nixosSystem {

modules/services/deployerbot/default.nix

@@ -9,7 +9,7 @@
     pingTarget,
   }: ''
     if ${pkgs.inetutils}/bin/ping -c 1 ${pingTarget}; then
-      ${pkgs.deploy-rs}/bin/deploy \
+      ${pkgs.deploy-rs.deploy-rs}/bin/deploy \
         --ssh-opts="-i ''${CREDENTIALS_DIRECTORY}/ssh-key" \
         --ssh-user=deployerbot-follower \
         --confirm-timeout 60 \
@@ -85,7 +85,7 @@ in {
 
             nix flake update --accept-flake-config --commit-lock-file
 
-            ${pkgs.deploy-rs}/bin/deploy \
+            ${pkgs.deploy-rs.deploy-rs}/bin/deploy \
               --ssh-opts="-i ''${CREDENTIALS_DIRECTORY}/ssh-key" \
               --ssh-user=deployerbot-follower \
               --confirm-timeout 60 \