From 8f79a933e73e869fcc53897727a7535abcdd76ae Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Motiejus=20Jak=C5=A1tys?= <motiejus@jakstys.lt>
Date: Fri, 2 Feb 2024 15:29:53 +0200
Subject: [PATCH] overlays: fix 1

---
 flake.nix                                | 22 +++++++++++-----------
 modules/services/deployerbot/default.nix |  4 ++--
 2 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/flake.nix b/flake.nix
index 4b9aafe..62f57c9 100644
--- a/flake.nix
+++ b/flake.nix
@@ -91,24 +91,24 @@
     mkDeployPkgs = system:
       import nixpkgs {
         inherit system;
-
-        overlays = [
-          deploy-rs.overlay
-          (_self: super: {
-            deploy-rs = {
-              inherit (import nixpkgs {inherit system;}) deploy-rs;
-              inherit (super.deploy-rs) lib;
-            };
-          })
-        ];
+        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 = _: [
+    mkOverlays = system: [
       nur.overlay
       e11sync.overlays.default
+
+      deploy-rs.overlay
+      (_self: super: {
+        deploy-rs = {
+          inherit (import nixpkgs {inherit system;}) deploy-rs;
+          inherit (super.deploy-rs) lib;
+        };
+      })
     ];
   in
     {
diff --git a/modules/services/deployerbot/default.nix b/modules/services/deployerbot/default.nix
index 4b9fe71..22ab094 100644
--- a/modules/services/deployerbot/default.nix
+++ b/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 \