From 66da98e46ae602f8b89553e2eb3b28c946ce2a22 Mon Sep 17 00:00:00 2001
From: Gerg-L <GregLeyda@proton.me>
Date: Wed, 9 Apr 2025 19:02:33 -0400
Subject: [PATCH 1/3] espup: 0.14.1 -> 0.15.0

---
 pkgs/by-name/es/espup/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/es/espup/package.nix b/pkgs/by-name/es/espup/package.nix
index cc0916d2f808..7955b09a50a9 100644
--- a/pkgs/by-name/es/espup/package.nix
+++ b/pkgs/by-name/es/espup/package.nix
@@ -17,17 +17,17 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "espup";
-  version = "0.14.1";
+  version = "0.15.0";
 
   src = fetchFromGitHub {
     owner = "esp-rs";
     repo = "espup";
     rev = "v${version}";
-    hash = "sha256-sPWGpQi9JrkdaPV2jvwaY9zjb8urK+ibhvxw/CC2UOQ=";
+    hash = "sha256-1muyZd7jhhDkif/8mX7QZEMnV105jNMHT0RaZPinD/4=";
   };
 
   useFetchCargoVendor = true;
-  cargoHash = "sha256-k6hczvuEvutUWOrKYFUltA0ZD+AHa8E0+5YW1+0TKQA=";
+  cargoHash = "sha256-fX6nl0DZZNiH/VWR9eWMnTuBW9r1jz3IWIxbOGC4Amg=";
 
   nativeBuildInputs = [
     pkg-config

From 1f066ccc53c0d24abb6e5ae67c1453df3ade319d Mon Sep 17 00:00:00 2001
From: Gerg-L <GregLeyda@proton.me>
Date: Wed, 9 Apr 2025 18:57:25 -0400
Subject: [PATCH 2/3] Revert "espup: Set passthru.updateScript"

This reverts commit 4f0aca8b23fa21a3faac08b211faf7fa6ba5e388.
---
 pkgs/by-name/es/espup/package.nix | 2 --
 1 file changed, 2 deletions(-)

diff --git a/pkgs/by-name/es/espup/package.nix b/pkgs/by-name/es/espup/package.nix
index 7955b09a50a9..69b280ab5fe0 100644
--- a/pkgs/by-name/es/espup/package.nix
+++ b/pkgs/by-name/es/espup/package.nix
@@ -12,7 +12,6 @@
   darwin,
   testers,
   espup,
-  gitUpdater,
 }:
 
 rustPlatform.buildRustPackage rec {
@@ -68,7 +67,6 @@ rustPlatform.buildRustPackage rec {
       --zsh <($out/bin/espup completions zsh)
   '';
 
-  passthru.updateScript = gitUpdater { };
   passthru.tests.version = testers.testVersion {
     package = espup;
   };

From 85a3655ba712fac21bed51fe7b0347545df3cb2a Mon Sep 17 00:00:00 2001
From: Gerg-L <GregLeyda@proton.me>
Date: Wed, 9 Apr 2025 19:04:21 -0400
Subject: [PATCH 3/3] espup: cleanup

---
 pkgs/by-name/es/espup/package.nix | 21 ++++++++++++---------
 1 file changed, 12 insertions(+), 9 deletions(-)

diff --git a/pkgs/by-name/es/espup/package.nix b/pkgs/by-name/es/espup/package.nix
index 69b280ab5fe0..94a47fd236b0 100644
--- a/pkgs/by-name/es/espup/package.nix
+++ b/pkgs/by-name/es/espup/package.nix
@@ -11,17 +11,17 @@
   stdenv,
   darwin,
   testers,
-  espup,
+  nix-update-script,
 }:
 
-rustPlatform.buildRustPackage rec {
+rustPlatform.buildRustPackage (finalAttrs: {
   pname = "espup";
   version = "0.15.0";
 
   src = fetchFromGitHub {
     owner = "esp-rs";
     repo = "espup";
-    rev = "v${version}";
+    tag = "v${finalAttrs.version}";
     hash = "sha256-1muyZd7jhhDkif/8mX7QZEMnV105jNMHT0RaZPinD/4=";
   };
 
@@ -67,21 +67,24 @@ rustPlatform.buildRustPackage rec {
       --zsh <($out/bin/espup completions zsh)
   '';
 
-  passthru.tests.version = testers.testVersion {
-    package = espup;
+  passthru = {
+    updateScript = nix-update-script { };
+    tests.version = testers.testVersion {
+      package = finalAttrs.finalPackage;
+    };
   };
 
-  meta = with lib; {
+  meta = {
     description = "Tool for installing and maintaining Espressif Rust ecosystem";
     homepage = "https://github.com/esp-rs/espup/";
-    license = with licenses; [
+    license = with lib.licenses; [
       mit
       asl20
     ];
-    maintainers = with maintainers; [
+    maintainers = with lib.maintainers; [
       knightpp
       beeb
     ];
     mainProgram = "espup";
   };
-}
+})