From b25b0431765309225486aa46f35017b4223efce1 Mon Sep 17 00:00:00 2001
From: teutat3s <teutates@mailbox.org>
Date: Tue, 9 Aug 2022 11:54:19 +0200
Subject: [PATCH 1/2] nvfetcher: use nixpkgs version

---
 flake.nix       | 1 -
 shell/devos.nix | 6 +++---
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/flake.nix b/flake.nix
index 7f3c2803..f18df6df 100644
--- a/flake.nix
+++ b/flake.nix
@@ -76,7 +76,6 @@
             overlays = [
               nur.overlay
               agenix.overlay
-              nvfetcher.overlay
               ./pkgs/default.nix
             ];
           };
diff --git a/shell/devos.nix b/shell/devos.nix
index bb9f1744..f49254fa 100644
--- a/shell/devos.nix
+++ b/shell/devos.nix
@@ -38,9 +38,9 @@ in
     (devos agenix)
     {
       category = "devos";
-      name = pkgs.nvfetcher-bin.pname;
-      help = pkgs.nvfetcher-bin.meta.description;
-      command = "cd $PRJ_ROOT/pkgs; ${pkgs.nvfetcher-bin}/bin/nvfetcher -c ./sources.toml $@";
+      name = pkgs.nvfetcher.pname;
+      help = pkgs.nvfetcher.meta.description;
+      command = "cd $PRJ_ROOT/pkgs; ${pkgs.nvfetcher}/bin/nvfetcher -c ./sources.toml $@";
     }
     (linter nixpkgs-fmt)
     (linter editorconfig-checker)

From 0cc621a4ec2b5363b058c3111145aaedbef70803 Mon Sep 17 00:00:00 2001
From: teutat3s <teutates@mailbox.org>
Date: Tue, 9 Aug 2022 11:54:49 +0200
Subject: [PATCH 2/2] deploy-rs: use nixpkgs version

---
 shell/devos.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/shell/devos.nix b/shell/devos.nix
index f49254fa..f799ca03 100644
--- a/shell/devos.nix
+++ b/shell/devos.nix
@@ -46,7 +46,7 @@ in
     (linter editorconfig-checker)
     # (docs python3Packages.grip) too many deps
     (docs mdbook)
-    (devos inputs.deploy.packages.${pkgs.system}.deploy-rs)
+    (devos deploy-rs)
   ]
   ++ lib.optional
     (system != "i686-linux")