From e7ce8e1fb44b45ce50fd04c533804a61d305e2cf Mon Sep 17 00:00:00 2001
From: teutat3s <teutates@mailbox.org>
Date: Sat, 13 May 2023 18:43:12 +0200
Subject: [PATCH] deploy-rs: use nixpkgs version, avoid rebuilding

https://github.com/serokell/deploy-rs/pull/207
https://github.com/serokell/deploy-rs/issues/163
---
 flake.lock      |  6 +++---
 flake.nix       | 16 +++++++++++++---
 shell/devos.nix |  2 +-
 3 files changed, 17 insertions(+), 7 deletions(-)

diff --git a/flake.lock b/flake.lock
index a224fe11..498bf939 100644
--- a/flake.lock
+++ b/flake.lock
@@ -54,11 +54,11 @@
         "utils": "utils"
       },
       "locked": {
-        "lastModified": 1683255183,
-        "narHash": "sha256-UUxpb5PMkFfP2JGoPMEUvKbxv+wCkTWy4uZs1MyyCes=",
+        "lastModified": 1683779844,
+        "narHash": "sha256-sIeOU0GsCeQEn5TpqE/jFRN4EGsPsjqVRsPdrzIDABM=",
         "owner": "serokell",
         "repo": "deploy-rs",
-        "rev": "6b0b6a1c2527e8b1ef370a308b6ef8903004ac47",
+        "rev": "c80189917086e43d49eece2bd86f56813500a0eb",
         "type": "github"
       },
       "original": {
diff --git a/flake.nix b/flake.nix
index 0c06c1a2..1e7a8f0e 100644
--- a/flake.nix
+++ b/flake.nix
@@ -72,7 +72,17 @@
           overlays = [];
         };
         nixos-22-05 = {};
-        latest = {};
+        latest = {
+          overlays = [
+            deploy.overlay
+            (self: super: {
+              deploy-rs = {
+                inherit (inputs.latest.legacyPackages.x86_64-linux) deploy-rs;
+                lib = super.deploy-rs.lib;
+              };
+            })
+          ];
+        };
         master = {};
       };
 
@@ -183,7 +193,7 @@
           profilesOrder = ["system" "direnv"];
           profiles.direnv = {
             user = "pub-solar";
-            path = deploy.lib.x86_64-linux.activate.home-manager self.homeConfigurationsPortable.x86_64-linux.pub-solar;
+            path = self.channels.latest.deploy-rs.lib.x86_64-linux.activate.home-manager self.homeConfigurationsPortable.x86_64-linux.pub-solar;
           };
         };
         powder = {
@@ -192,7 +202,7 @@
           profilesOrder = ["system" "direnv"];
           profiles.direnv = {
             user = "pub-solar";
-            path = deploy.lib.x86_64-linux.activate.home-manager self.homeConfigurationsPortable.x86_64-linux.pub-solar;
+            path = self.channels.latest.deploy-rs.lib.x86_64-linux.activate.home-manager self.homeConfigurationsPortable.x86_64-linux.pub-solar;
           };
         };
       };
diff --git a/shell/devos.nix b/shell/devos.nix
index a8cf0bcb..af355057 100644
--- a/shell/devos.nix
+++ b/shell/devos.nix
@@ -60,6 +60,6 @@ in {
     ]
     ++ lib.optionals (pkgs.stdenv.hostPlatform.isLinux && !pkgs.stdenv.buildPlatform.isDarwin) [
       (devos nixos-generators)
-      (devos deploy-rs)
+      (devos deploy-rs.deploy-rs)
     ];
 }