From 6607c17a21415b05f3cee2bbf3139395efb7fc0b Mon Sep 17 00:00:00 2001
From: Petr Portnov <mrjarviscraft+nix@gmail.com>
Date: Mon, 1 Dec 2025 18:41:40 +0300
Subject: [PATCH 01/30] cargo-benchcmp: add progrm_jarvis to maintainers

---
 pkgs/by-name/ca/cargo-benchcmp/package.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/by-name/ca/cargo-benchcmp/package.nix b/pkgs/by-name/ca/cargo-benchcmp/package.nix
index c81559855a73..3981898f7630 100644
--- a/pkgs/by-name/ca/cargo-benchcmp/package.nix
+++ b/pkgs/by-name/ca/cargo-benchcmp/package.nix
@@ -39,6 +39,6 @@ rustPlatform.buildRustPackage rec {
       mit
       unlicense
     ];
-    maintainers = [ ];
+    maintainers = [ maintainers.progrm_jarvis ];
   };
 }

From 9f08b2b4c366165453c46be0b7d3d059a31e4f90 Mon Sep 17 00:00:00 2001
From: Petr Portnov <mrjarviscraft+nix@gmail.com>
Date: Mon, 1 Dec 2025 18:41:48 +0300
Subject: [PATCH 02/30] cargo-benchcmp: use finalAttrs

---
 pkgs/by-name/ca/cargo-benchcmp/package.nix | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/by-name/ca/cargo-benchcmp/package.nix b/pkgs/by-name/ca/cargo-benchcmp/package.nix
index 3981898f7630..12926d7b2cbb 100644
--- a/pkgs/by-name/ca/cargo-benchcmp/package.nix
+++ b/pkgs/by-name/ca/cargo-benchcmp/package.nix
@@ -6,14 +6,14 @@
   stdenv,
 }:
 
-rustPlatform.buildRustPackage rec {
+rustPlatform.buildRustPackage (finalAttrs: {
   pname = "cargo-benchcmp";
   version = "0.4.5";
 
   src = fetchFromGitHub {
     owner = "BurntSushi";
     repo = "cargo-benchcmp";
-    tag = version;
+    tag = finalAttrs.version;
     hash = "sha256-J8KFI0V/mOhUlYtVnFAQgPIpXL9/dLhOFxSly4bR00I=";
   };
 
@@ -31,14 +31,14 @@ rustPlatform.buildRustPackage rec {
     "--skip=different_input_colored"
   ];
 
-  meta = with lib; {
+  meta = {
     description = "Small utility to compare Rust micro-benchmarks";
     mainProgram = "cargo-benchcmp";
     homepage = "https://github.com/BurntSushi/cargo-benchcmp";
-    license = with licenses; [
+    license = with lib.licenses; [
       mit
       unlicense
     ];
-    maintainers = [ maintainers.progrm_jarvis ];
+    maintainers = [ lib.maintainers.progrm_jarvis ];
   };
-}
+})

From c38bd731f68c0ec73310fd624f0ce4b2ddfa9376 Mon Sep 17 00:00:00 2001
From: Petr Portnov <mrjarviscraft+nix@gmail.com>
Date: Mon, 1 Dec 2025 18:41:55 +0300
Subject: [PATCH 03/30] cargo-benchcmp: add nix-update-script

---
 pkgs/by-name/ca/cargo-benchcmp/package.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/by-name/ca/cargo-benchcmp/package.nix b/pkgs/by-name/ca/cargo-benchcmp/package.nix
index 12926d7b2cbb..e802bbf99f41 100644
--- a/pkgs/by-name/ca/cargo-benchcmp/package.nix
+++ b/pkgs/by-name/ca/cargo-benchcmp/package.nix
@@ -4,6 +4,7 @@
   fetchFromGitHub,
   replaceVars,
   stdenv,
+  nix-update-script,
 }:
 
 rustPlatform.buildRustPackage (finalAttrs: {
@@ -31,6 +32,8 @@ rustPlatform.buildRustPackage (finalAttrs: {
     "--skip=different_input_colored"
   ];
 
+  passthru.updateScript = nix-update-script { };
+
   meta = {
     description = "Small utility to compare Rust micro-benchmarks";
     mainProgram = "cargo-benchcmp";

From 93ddc6b22d6d13a14262eb23ad6f8461d65f3149 Mon Sep 17 00:00:00 2001
From: Petr Portnov <mrjarviscraft+nix@gmail.com>
Date: Mon, 1 Dec 2025 18:42:03 +0300
Subject: [PATCH 04/30] cargo-component: add progrm_jarvis to maintainers

---
 pkgs/by-name/ca/cargo-component/package.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/by-name/ca/cargo-component/package.nix b/pkgs/by-name/ca/cargo-component/package.nix
index 237829ae0dcf..a27e0e8ceeae 100644
--- a/pkgs/by-name/ca/cargo-component/package.nix
+++ b/pkgs/by-name/ca/cargo-component/package.nix
@@ -35,7 +35,7 @@ rustPlatform.buildRustPackage rec {
     homepage = "https://github.com/bytecodealliance/cargo-component";
     changelog = "https://github.com/bytecodealliance/cargo-component/releases/tag/${src.rev}";
     license = licenses.asl20;
-    maintainers = [ ];
+    maintainers = [ maintainers.progrm_jarvis ];
     mainProgram = "cargo-component";
   };
 }

From 9ebc1661ede86c789ba40f60942cd8fab9e78393 Mon Sep 17 00:00:00 2001
From: Petr Portnov <mrjarviscraft+nix@gmail.com>
Date: Mon, 1 Dec 2025 18:42:12 +0300
Subject: [PATCH 05/30] cargo-component: use finalAttrs

---
 pkgs/by-name/ca/cargo-component/package.nix | 19 ++++++++++++-------
 1 file changed, 12 insertions(+), 7 deletions(-)

diff --git a/pkgs/by-name/ca/cargo-component/package.nix b/pkgs/by-name/ca/cargo-component/package.nix
index a27e0e8ceeae..0976389f2c66 100644
--- a/pkgs/by-name/ca/cargo-component/package.nix
+++ b/pkgs/by-name/ca/cargo-component/package.nix
@@ -4,16 +4,17 @@
   fetchFromGitHub,
   pkg-config,
   openssl,
+  versionCheckHook,
 }:
 
-rustPlatform.buildRustPackage rec {
+rustPlatform.buildRustPackage (finalAttrs: {
   pname = "cargo-component";
   version = "0.21.1";
 
   src = fetchFromGitHub {
     owner = "bytecodealliance";
     repo = "cargo-component";
-    rev = "v${version}";
+    tag = "v${finalAttrs.version}";
     hash = "sha256-Tlx14q/2k/0jZZ1nECX7zF/xNTeMCZg/fN+fhRM4uhc=";
   };
 
@@ -30,12 +31,16 @@ rustPlatform.buildRustPackage rec {
   # requires the wasm32-wasi target
   doCheck = false;
 
-  meta = with lib; {
+  doInstallCheck = true;
+  nativeInstallCheckInputs = [ versionCheckHook ];
+  versionCheckProgramArg = "--version";
+
+  meta = {
     description = "Cargo subcommand for creating WebAssembly components based on the component model proposal";
     homepage = "https://github.com/bytecodealliance/cargo-component";
-    changelog = "https://github.com/bytecodealliance/cargo-component/releases/tag/${src.rev}";
-    license = licenses.asl20;
-    maintainers = [ maintainers.progrm_jarvis ];
+    changelog = "https://github.com/bytecodealliance/cargo-component/releases/tag/v${finalAttrs.version}";
+    license = lib.licenses.asl20;
+    maintainers = [ lib.maintainers.progrm_jarvis ];
     mainProgram = "cargo-component";
   };
-}
+})

From e6c834ce421099d08878e46eebdd3571c5fc75c4 Mon Sep 17 00:00:00 2001
From: Petr Portnov <mrjarviscraft+nix@gmail.com>
Date: Mon, 1 Dec 2025 18:42:20 +0300
Subject: [PATCH 06/30] cargo-component: add nix-update-script

---
 pkgs/by-name/ca/cargo-component/package.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/by-name/ca/cargo-component/package.nix b/pkgs/by-name/ca/cargo-component/package.nix
index 0976389f2c66..c3b68694e7ca 100644
--- a/pkgs/by-name/ca/cargo-component/package.nix
+++ b/pkgs/by-name/ca/cargo-component/package.nix
@@ -5,6 +5,7 @@
   pkg-config,
   openssl,
   versionCheckHook,
+  nix-update-script,
 }:
 
 rustPlatform.buildRustPackage (finalAttrs: {
@@ -35,6 +36,8 @@ rustPlatform.buildRustPackage (finalAttrs: {
   nativeInstallCheckInputs = [ versionCheckHook ];
   versionCheckProgramArg = "--version";
 
+  passthru.updateScript = nix-update-script { };
+
   meta = {
     description = "Cargo subcommand for creating WebAssembly components based on the component model proposal";
     homepage = "https://github.com/bytecodealliance/cargo-component";

From a6c45a6273c47e39a0899c2720d13174a9a1c80d Mon Sep 17 00:00:00 2001
From: Petr Portnov <mrjarviscraft+nix@gmail.com>
Date: Mon, 1 Dec 2025 18:42:28 +0300
Subject: [PATCH 07/30] cargo-cranky: add progrm_jarvis to maintainers

---
 pkgs/by-name/ca/cargo-cranky/package.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/by-name/ca/cargo-cranky/package.nix b/pkgs/by-name/ca/cargo-cranky/package.nix
index e03271e5b52c..619370ce3e2b 100644
--- a/pkgs/by-name/ca/cargo-cranky/package.nix
+++ b/pkgs/by-name/ca/cargo-cranky/package.nix
@@ -26,6 +26,6 @@ rustPlatform.buildRustPackage rec {
       asl20
       mit
     ];
-    maintainers = [ ];
+    maintainers = [ maintainers.progrm_jarvis ];
   };
 }

From 980c1232963aed43a868466da9650e19070e6b86 Mon Sep 17 00:00:00 2001
From: Petr Portnov <mrjarviscraft+nix@gmail.com>
Date: Mon, 1 Dec 2025 18:42:35 +0300
Subject: [PATCH 08/30] cargo-cranky: use finalAttrs

---
 pkgs/by-name/ca/cargo-cranky/package.nix | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/pkgs/by-name/ca/cargo-cranky/package.nix b/pkgs/by-name/ca/cargo-cranky/package.nix
index 619370ce3e2b..015cf4169b0e 100644
--- a/pkgs/by-name/ca/cargo-cranky/package.nix
+++ b/pkgs/by-name/ca/cargo-cranky/package.nix
@@ -4,28 +4,28 @@
   fetchFromGitHub,
 }:
 
-rustPlatform.buildRustPackage rec {
+rustPlatform.buildRustPackage (finalAttrs: {
   pname = "cargo-cranky";
   version = "0.3.0";
 
   src = fetchFromGitHub {
     owner = "ericseppanen";
     repo = "cargo-cranky";
-    rev = "v${version}";
+    tag = "v${finalAttrs.version}";
     hash = "sha256-3ARl3z+2nz05UaKf8ChN6mvPY2qMjUNxGnGJ1P0xkas=";
   };
 
   cargoHash = "sha256-m9n2YyrMpuz/X/kvHgn+g4w9/Pg+n6VnnfwjaOnyPvY=";
 
-  meta = with lib; {
+  meta = {
     description = "Easy to configure wrapper for Rust's clippy";
     mainProgram = "cargo-cranky";
     homepage = "https://github.com/ericseppanen/cargo-cranky";
-    changelog = "https://github.com/ericseppanen/cargo-cranky/releases/tag/${src.rev}";
-    license = with licenses; [
+    changelog = "https://github.com/ericseppanen/cargo-cranky/releases/tag/v${finalAttrs.version}";
+    license = with lib.licenses; [
       asl20
       mit
     ];
-    maintainers = [ maintainers.progrm_jarvis ];
+    maintainers = [ lib.maintainers.progrm_jarvis ];
   };
-}
+})

From 22123247eea9eac4d310b812cb28e62e53fe4071 Mon Sep 17 00:00:00 2001
From: Petr Portnov <mrjarviscraft+nix@gmail.com>
Date: Mon, 1 Dec 2025 18:42:43 +0300
Subject: [PATCH 09/30] cargo-cranky: add nix-update-script

---
 pkgs/by-name/ca/cargo-cranky/package.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/by-name/ca/cargo-cranky/package.nix b/pkgs/by-name/ca/cargo-cranky/package.nix
index 015cf4169b0e..1b8dca6d1caf 100644
--- a/pkgs/by-name/ca/cargo-cranky/package.nix
+++ b/pkgs/by-name/ca/cargo-cranky/package.nix
@@ -2,6 +2,7 @@
   lib,
   rustPlatform,
   fetchFromGitHub,
+  nix-update-script,
 }:
 
 rustPlatform.buildRustPackage (finalAttrs: {
@@ -17,6 +18,8 @@ rustPlatform.buildRustPackage (finalAttrs: {
 
   cargoHash = "sha256-m9n2YyrMpuz/X/kvHgn+g4w9/Pg+n6VnnfwjaOnyPvY=";
 
+  passthru.updateScript = nix-update-script { };
+
   meta = {
     description = "Easy to configure wrapper for Rust's clippy";
     mainProgram = "cargo-cranky";

From 60289a6d12f770e0f58c3557c10364b50bce270f Mon Sep 17 00:00:00 2001
From: Petr Portnov <mrjarviscraft+nix@gmail.com>
Date: Mon, 1 Dec 2025 18:42:50 +0300
Subject: [PATCH 10/30] cargo-local-registry: add progrm_jarvis to maintainers

---
 pkgs/by-name/ca/cargo-local-registry/package.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/by-name/ca/cargo-local-registry/package.nix b/pkgs/by-name/ca/cargo-local-registry/package.nix
index ac8bea9754ac..07068e90b9df 100644
--- a/pkgs/by-name/ca/cargo-local-registry/package.nix
+++ b/pkgs/by-name/ca/cargo-local-registry/package.nix
@@ -46,6 +46,6 @@ rustPlatform.buildRustPackage rec {
       asl20
       mit
     ];
-    maintainers = [ ];
+    maintainers = [ maintainers.progrm_jarvis ];
   };
 }

From cb2845991856efb06d52b8edf750d0a9a1d7cf9b Mon Sep 17 00:00:00 2001
From: Petr Portnov <mrjarviscraft+nix@gmail.com>
Date: Mon, 1 Dec 2025 18:42:57 +0300
Subject: [PATCH 11/30] cargo-local-registry: use finalAttrs

---
 .../ca/cargo-local-registry/package.nix       | 19 ++++++++++++-------
 1 file changed, 12 insertions(+), 7 deletions(-)

diff --git a/pkgs/by-name/ca/cargo-local-registry/package.nix b/pkgs/by-name/ca/cargo-local-registry/package.nix
index 07068e90b9df..7ad765899799 100644
--- a/pkgs/by-name/ca/cargo-local-registry/package.nix
+++ b/pkgs/by-name/ca/cargo-local-registry/package.nix
@@ -7,16 +7,17 @@
   libgit2,
   openssl,
   zlib,
+  versionCheckHook,
 }:
 
-rustPlatform.buildRustPackage rec {
+rustPlatform.buildRustPackage (finalAttrs: {
   pname = "cargo-local-registry";
   version = "0.2.9";
 
   src = fetchFromGitHub {
     owner = "dhovart";
     repo = "cargo-local-registry";
-    rev = "v${version}";
+    tag = "v${finalAttrs.version}";
     hash = "sha256-DzBD7N7GQZ9nhF22DnxRse0P8MUGReOcXHQ56KOqW6I=";
   };
 
@@ -37,15 +38,19 @@ rustPlatform.buildRustPackage rec {
   # tests require internet access
   doCheck = false;
 
-  meta = with lib; {
+  doInstallCheck = true;
+  nativeInstallCheckInputs = [ versionCheckHook ];
+  versionCheckProgramArg = "--version";
+
+  meta = {
     description = "Cargo subcommand to manage local registries";
     mainProgram = "cargo-local-registry";
     homepage = "https://github.com/dhovart/cargo-local-registry";
-    changelog = "https://github.com/dhovart/cargo-local-registry/releases/tag/${src.rev}";
-    license = with licenses; [
+    changelog = "https://github.com/dhovart/cargo-local-registry/releases/tag/v${finalAttrs.version}";
+    license = with lib.licenses; [
       asl20
       mit
     ];
-    maintainers = [ maintainers.progrm_jarvis ];
+    maintainers = [ lib.maintainers.progrm_jarvis ];
   };
-}
+})

From ed16ac66bdbeb3bd05bb98e863839ce76056e668 Mon Sep 17 00:00:00 2001
From: Petr Portnov <mrjarviscraft+nix@gmail.com>
Date: Mon, 1 Dec 2025 18:44:21 +0300
Subject: [PATCH 12/30] cargo-local-registry: add nix-update-script

---
 pkgs/by-name/ca/cargo-local-registry/package.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/by-name/ca/cargo-local-registry/package.nix b/pkgs/by-name/ca/cargo-local-registry/package.nix
index 7ad765899799..48b57c5399d2 100644
--- a/pkgs/by-name/ca/cargo-local-registry/package.nix
+++ b/pkgs/by-name/ca/cargo-local-registry/package.nix
@@ -8,6 +8,7 @@
   openssl,
   zlib,
   versionCheckHook,
+  nix-update-script,
 }:
 
 rustPlatform.buildRustPackage (finalAttrs: {
@@ -42,6 +43,8 @@ rustPlatform.buildRustPackage (finalAttrs: {
   nativeInstallCheckInputs = [ versionCheckHook ];
   versionCheckProgramArg = "--version";
 
+  passthru.updateScript = nix-update-script { };
+
   meta = {
     description = "Cargo subcommand to manage local registries";
     mainProgram = "cargo-local-registry";

From 4f832d680f0ffe97b346de15e12491a4d07bdbe4 Mon Sep 17 00:00:00 2001
From: Petr Portnov <mrjarviscraft+nix@gmail.com>
Date: Mon, 1 Dec 2025 18:51:09 +0300
Subject: [PATCH 13/30] cargo-mutants: add progrm_jarvis to maintainers

---
 pkgs/by-name/ca/cargo-mutants/package.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/by-name/ca/cargo-mutants/package.nix b/pkgs/by-name/ca/cargo-mutants/package.nix
index 3a90d9d2c976..b64fefedc72d 100644
--- a/pkgs/by-name/ca/cargo-mutants/package.nix
+++ b/pkgs/by-name/ca/cargo-mutants/package.nix
@@ -26,6 +26,6 @@ rustPlatform.buildRustPackage rec {
     homepage = "https://github.com/sourcefrog/cargo-mutants";
     changelog = "https://github.com/sourcefrog/cargo-mutants/releases/tag/${src.rev}";
     license = licenses.mit;
-    maintainers = [ ];
+    maintainers = [ maintainers.progrm_jarvis ];
   };
 }

From 6d800119e048cc945e8a57b5f65a05702ddbdcca Mon Sep 17 00:00:00 2001
From: Petr Portnov <mrjarviscraft+nix@gmail.com>
Date: Mon, 1 Dec 2025 18:52:47 +0300
Subject: [PATCH 14/30] cargo-mutants: use finalAttrs

---
 pkgs/by-name/ca/cargo-mutants/package.nix | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/pkgs/by-name/ca/cargo-mutants/package.nix b/pkgs/by-name/ca/cargo-mutants/package.nix
index b64fefedc72d..253269b4ca4b 100644
--- a/pkgs/by-name/ca/cargo-mutants/package.nix
+++ b/pkgs/by-name/ca/cargo-mutants/package.nix
@@ -4,14 +4,14 @@
   fetchFromGitHub,
 }:
 
-rustPlatform.buildRustPackage rec {
+rustPlatform.buildRustPackage (finalAttrs: {
   pname = "cargo-mutants";
   version = "25.3.1";
 
   src = fetchFromGitHub {
     owner = "sourcefrog";
     repo = "cargo-mutants";
-    rev = "v${version}";
+    tag = "v${finalAttrs.version}";
     hash = "sha256-T+BMLjp74IO71u/ftNfz67FPSt1LYCgsRP65gL0wScg=";
   };
 
@@ -20,12 +20,12 @@ rustPlatform.buildRustPackage rec {
   # too many tests require internet access
   doCheck = false;
 
-  meta = with lib; {
+  meta = {
     description = "Mutation testing tool for Rust";
     mainProgram = "cargo-mutants";
     homepage = "https://github.com/sourcefrog/cargo-mutants";
-    changelog = "https://github.com/sourcefrog/cargo-mutants/releases/tag/${src.rev}";
-    license = licenses.mit;
-    maintainers = [ maintainers.progrm_jarvis ];
+    changelog = "https://github.com/sourcefrog/cargo-mutants/releases/tag/v${finalAttrs.version}";
+    license = lib.licenses.mit;
+    maintainers = [ lib.maintainers.progrm_jarvis ];
   };
-}
+})

From ed0ce64702288c69db9fe7307355a39219fea53e Mon Sep 17 00:00:00 2001
From: Petr Portnov <mrjarviscraft+nix@gmail.com>
Date: Mon, 1 Dec 2025 18:53:45 +0300
Subject: [PATCH 15/30] cargo-mutants: add nix-update-script

---
 pkgs/by-name/ca/cargo-mutants/package.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/by-name/ca/cargo-mutants/package.nix b/pkgs/by-name/ca/cargo-mutants/package.nix
index 253269b4ca4b..6fc869706b68 100644
--- a/pkgs/by-name/ca/cargo-mutants/package.nix
+++ b/pkgs/by-name/ca/cargo-mutants/package.nix
@@ -2,6 +2,7 @@
   lib,
   rustPlatform,
   fetchFromGitHub,
+  nix-update-script,
 }:
 
 rustPlatform.buildRustPackage (finalAttrs: {
@@ -20,6 +21,8 @@ rustPlatform.buildRustPackage (finalAttrs: {
   # too many tests require internet access
   doCheck = false;
 
+  passthru.updateScript = nix-update-script { };
+
   meta = {
     description = "Mutation testing tool for Rust";
     mainProgram = "cargo-mutants";

From 79ae97f92de036deabd7d5916e0d5958be785a3e Mon Sep 17 00:00:00 2001
From: Petr Portnov <mrjarviscraft+nix@gmail.com>
Date: Mon, 1 Dec 2025 18:54:52 +0300
Subject: [PATCH 16/30] cargo-play: add progrm_jarvis to maintainers

---
 pkgs/by-name/ca/cargo-play/package.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/by-name/ca/cargo-play/package.nix b/pkgs/by-name/ca/cargo-play/package.nix
index ead15cb184a1..c025dddd90f0 100644
--- a/pkgs/by-name/ca/cargo-play/package.nix
+++ b/pkgs/by-name/ca/cargo-play/package.nix
@@ -28,6 +28,6 @@ rustPlatform.buildRustPackage rec {
     mainProgram = "cargo-play";
     homepage = "https://github.com/fanzeyi/cargo-play";
     license = licenses.mit;
-    maintainers = [ ];
+    maintainers = [ maintainers.progrm_jarvis ];
   };
 }

From a20112b6a492aa4d9bda2941227c2b8c4982fe44 Mon Sep 17 00:00:00 2001
From: Petr Portnov <mrjarviscraft+nix@gmail.com>
Date: Mon, 1 Dec 2025 18:57:42 +0300
Subject: [PATCH 17/30] cargo-play: use finalAttrs

---
 pkgs/by-name/ca/cargo-play/package.nix | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

diff --git a/pkgs/by-name/ca/cargo-play/package.nix b/pkgs/by-name/ca/cargo-play/package.nix
index c025dddd90f0..5e0160e51d0b 100644
--- a/pkgs/by-name/ca/cargo-play/package.nix
+++ b/pkgs/by-name/ca/cargo-play/package.nix
@@ -2,16 +2,17 @@
   lib,
   rustPlatform,
   fetchFromGitHub,
+  versionCheckHook,
 }:
 
-rustPlatform.buildRustPackage rec {
+rustPlatform.buildRustPackage (finalAttrs: {
   pname = "cargo-play";
   version = "0.5.1";
 
   src = fetchFromGitHub {
     owner = "fanzeyi";
     repo = "cargo-play";
-    tag = version;
+    tag = finalAttrs.version;
     sha256 = "sha256-Z5zcLQYfQeGybsnt2U+4Z+peRHxNPbDriPMKWhJ+PeA=";
   };
 
@@ -23,11 +24,16 @@ rustPlatform.buildRustPackage rec {
     "--skip=infer_override"
   ];
 
-  meta = with lib; {
+  doInstallCheck = true;
+  nativeInstallCheckInputs = [ versionCheckHook ];
+  versionCheckProgramArg = "--version";
+
+  meta = {
     description = "Run your rust code without setting up cargo";
     mainProgram = "cargo-play";
     homepage = "https://github.com/fanzeyi/cargo-play";
-    license = licenses.mit;
-    maintainers = [ maintainers.progrm_jarvis ];
+    changelog = "https://github.com/fanzeyi/cargo-play/releases/tag/v${finalAttrs.version}";
+    license = lib.licenses.mit;
+    maintainers = [ lib.maintainers.progrm_jarvis ];
   };
-}
+})

From ba8600d82f75505e8edf35000eb464a9c0d93f3e Mon Sep 17 00:00:00 2001
From: Petr Portnov <mrjarviscraft+nix@gmail.com>
Date: Mon, 1 Dec 2025 18:58:03 +0300
Subject: [PATCH 18/30] cargo-play: add nix-update-script

---
 pkgs/by-name/ca/cargo-play/package.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/by-name/ca/cargo-play/package.nix b/pkgs/by-name/ca/cargo-play/package.nix
index 5e0160e51d0b..8cdf0a59b69c 100644
--- a/pkgs/by-name/ca/cargo-play/package.nix
+++ b/pkgs/by-name/ca/cargo-play/package.nix
@@ -3,6 +3,7 @@
   rustPlatform,
   fetchFromGitHub,
   versionCheckHook,
+  nix-update-script,
 }:
 
 rustPlatform.buildRustPackage (finalAttrs: {
@@ -28,6 +29,8 @@ rustPlatform.buildRustPackage (finalAttrs: {
   nativeInstallCheckInputs = [ versionCheckHook ];
   versionCheckProgramArg = "--version";
 
+  passthru.updateScript = nix-update-script { };
+
   meta = {
     description = "Run your rust code without setting up cargo";
     mainProgram = "cargo-play";

From 451fd93483f4c00adc55c23ed46b4aadb76104ae Mon Sep 17 00:00:00 2001
From: Petr Portnov <mrjarviscraft+nix@gmail.com>
Date: Mon, 1 Dec 2025 18:59:12 +0300
Subject: [PATCH 19/30] cargo-release: add progrm_jarvis to maintainers

---
 pkgs/by-name/ca/cargo-release/package.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/by-name/ca/cargo-release/package.nix b/pkgs/by-name/ca/cargo-release/package.nix
index 64d3256ebc57..6d95cd4e5755 100644
--- a/pkgs/by-name/ca/cargo-release/package.nix
+++ b/pkgs/by-name/ca/cargo-release/package.nix
@@ -53,6 +53,7 @@ rustPlatform.buildRustPackage rec {
     ];
     maintainers = with lib.maintainers; [
       gerschtli
+      progrm_jarvis
     ];
   };
 }

From 689afa2851b241125e9e176b3fbad11ba0b808d1 Mon Sep 17 00:00:00 2001
From: Petr Portnov <mrjarviscraft+nix@gmail.com>
Date: Mon, 1 Dec 2025 19:00:01 +0300
Subject: [PATCH 20/30] cargo-release: use finalAttrs

---
 pkgs/by-name/ca/cargo-release/package.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/ca/cargo-release/package.nix b/pkgs/by-name/ca/cargo-release/package.nix
index 6d95cd4e5755..782e668830d6 100644
--- a/pkgs/by-name/ca/cargo-release/package.nix
+++ b/pkgs/by-name/ca/cargo-release/package.nix
@@ -10,14 +10,14 @@
   git,
 }:
 
-rustPlatform.buildRustPackage rec {
+rustPlatform.buildRustPackage (finalAttrs: {
   pname = "cargo-release";
   version = "0.25.22";
 
   src = fetchFromGitHub {
     owner = "crate-ci";
     repo = "cargo-release";
-    tag = "v${version}";
+    tag = "v${finalAttrs.version}";
     hash = "sha256-NFI7UIHbo1xcH+pXim3ar8hvkn2EdIFpI2rpsivhVHg=";
   };
 
@@ -46,7 +46,7 @@ rustPlatform.buildRustPackage rec {
     description = ''Cargo subcommand "release": everything about releasing a rust crate'';
     mainProgram = "cargo-release";
     homepage = "https://github.com/crate-ci/cargo-release";
-    changelog = "https://github.com/crate-ci/cargo-release/blob/v${version}/CHANGELOG.md";
+    changelog = "https://github.com/crate-ci/cargo-release/blob/v${finalAttrs.version}/CHANGELOG.md";
     license = with lib.licenses; [
       asl20 # or
       mit
@@ -56,4 +56,4 @@ rustPlatform.buildRustPackage rec {
       progrm_jarvis
     ];
   };
-}
+})

From 4ef3ff86d5a7a1026a93bf81945a938035dc2043 Mon Sep 17 00:00:00 2001
From: Petr Portnov <mrjarviscraft+nix@gmail.com>
Date: Mon, 1 Dec 2025 19:00:28 +0300
Subject: [PATCH 21/30] cargo-release: add nix-update-script

---
 pkgs/by-name/ca/cargo-release/package.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/by-name/ca/cargo-release/package.nix b/pkgs/by-name/ca/cargo-release/package.nix
index 782e668830d6..e2e677dbf97a 100644
--- a/pkgs/by-name/ca/cargo-release/package.nix
+++ b/pkgs/by-name/ca/cargo-release/package.nix
@@ -8,6 +8,7 @@
   stdenv,
   curl,
   git,
+  nix-update-script,
 }:
 
 rustPlatform.buildRustPackage (finalAttrs: {
@@ -42,6 +43,8 @@ rustPlatform.buildRustPackage (finalAttrs: {
   # disable vendored-libgit2 and vendored-openssl
   buildNoDefaultFeatures = true;
 
+  passthru.updateScript = nix-update-script { };
+
   meta = {
     description = ''Cargo subcommand "release": everything about releasing a rust crate'';
     mainProgram = "cargo-release";

From ef14fa5374c9a0d22448df8eae4b144a396776d6 Mon Sep 17 00:00:00 2001
From: Petr Portnov <mrjarviscraft+nix@gmail.com>
Date: Mon, 1 Dec 2025 19:01:28 +0300
Subject: [PATCH 22/30] cargo-shuttle: add progrm_jarvis to maintainers

---
 pkgs/by-name/ca/cargo-shuttle/package.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/by-name/ca/cargo-shuttle/package.nix b/pkgs/by-name/ca/cargo-shuttle/package.nix
index 9de6d2810b68..fcdc4a83d3d2 100644
--- a/pkgs/by-name/ca/cargo-shuttle/package.nix
+++ b/pkgs/by-name/ca/cargo-shuttle/package.nix
@@ -43,6 +43,6 @@ rustPlatform.buildRustPackage rec {
     homepage = "https://shuttle.rs";
     changelog = "https://github.com/shuttle-hq/shuttle/releases/tag/${src.rev}";
     license = licenses.asl20;
-    maintainers = [ ];
+    maintainers = [ maintainers.progrm_jarvis ];
   };
 }

From 7f66450be93a598822d7c91c1041801ee476cf33 Mon Sep 17 00:00:00 2001
From: Petr Portnov <mrjarviscraft+nix@gmail.com>
Date: Mon, 1 Dec 2025 19:09:34 +0300
Subject: [PATCH 23/30] cargo-shuttle: use finalAttrs

---
 pkgs/by-name/ca/cargo-shuttle/package.nix | 21 +++++++++++++--------
 1 file changed, 13 insertions(+), 8 deletions(-)

diff --git a/pkgs/by-name/ca/cargo-shuttle/package.nix b/pkgs/by-name/ca/cargo-shuttle/package.nix
index fcdc4a83d3d2..994306bf9b9c 100644
--- a/pkgs/by-name/ca/cargo-shuttle/package.nix
+++ b/pkgs/by-name/ca/cargo-shuttle/package.nix
@@ -5,16 +5,17 @@
   pkg-config,
   openssl,
   zlib,
+  versionCheckHook,
 }:
 
-rustPlatform.buildRustPackage rec {
+rustPlatform.buildRustPackage (finalAttrs: {
   pname = "cargo-shuttle";
   version = "0.57.3";
 
   src = fetchFromGitHub {
     owner = "shuttle-hq";
     repo = "shuttle";
-    rev = "v${version}";
+    tag = "v${finalAttrs.version}";
     hash = "sha256-qPevl75wmOYVhTgMiJOi+6j8LBWKzM7HPhd5mdf2B+8=";
   };
 
@@ -32,17 +33,21 @@ rustPlatform.buildRustPackage rec {
     "cargo-shuttle"
   ];
 
-  cargoTestFlags = cargoBuildFlags ++ [
+  cargoTestFlags = finalAttrs.cargoBuildFlags ++ [
     # other tests are failing for different reasons
     "init::shuttle_init_tests::"
   ];
 
-  meta = with lib; {
+  doInstallCheck = true;
+  nativeInstallCheckInputs = [ versionCheckHook ];
+  versionCheckProgramArg = "--version";
+
+  meta = {
     description = "Cargo command for the shuttle platform";
     mainProgram = "cargo-shuttle";
     homepage = "https://shuttle.rs";
-    changelog = "https://github.com/shuttle-hq/shuttle/releases/tag/${src.rev}";
-    license = licenses.asl20;
-    maintainers = [ maintainers.progrm_jarvis ];
+    changelog = "https://github.com/shuttle-hq/shuttle/releases/tag/v${finalAttrs.version}";
+    license = lib.licenses.asl20;
+    maintainers = [ lib.maintainers.progrm_jarvis ];
   };
-}
+})

From 9f35394b70e35b138647896b40fcf2d618b69726 Mon Sep 17 00:00:00 2001
From: Petr Portnov <mrjarviscraft+nix@gmail.com>
Date: Mon, 1 Dec 2025 19:35:32 +0300
Subject: [PATCH 24/30] cargo-shuttle: add nix-update-script

---
 pkgs/by-name/ca/cargo-shuttle/package.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/by-name/ca/cargo-shuttle/package.nix b/pkgs/by-name/ca/cargo-shuttle/package.nix
index 994306bf9b9c..c76d6b282209 100644
--- a/pkgs/by-name/ca/cargo-shuttle/package.nix
+++ b/pkgs/by-name/ca/cargo-shuttle/package.nix
@@ -6,6 +6,7 @@
   openssl,
   zlib,
   versionCheckHook,
+  nix-update-script,
 }:
 
 rustPlatform.buildRustPackage (finalAttrs: {
@@ -42,6 +43,8 @@ rustPlatform.buildRustPackage (finalAttrs: {
   nativeInstallCheckInputs = [ versionCheckHook ];
   versionCheckProgramArg = "--version";
 
+  passthru.updateScript = nix-update-script { };
+
   meta = {
     description = "Cargo command for the shuttle platform";
     mainProgram = "cargo-shuttle";

From f0b8c3e302f1296ef0b0d34491bad9385bb8fe7a Mon Sep 17 00:00:00 2001
From: Petr Portnov <mrjarviscraft+nix@gmail.com>
Date: Mon, 1 Dec 2025 19:46:35 +0300
Subject: [PATCH 25/30] cargo-tarpaulin: add progrm_jarvis to maintainers

---
 pkgs/by-name/ca/cargo-tarpaulin/package.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/by-name/ca/cargo-tarpaulin/package.nix b/pkgs/by-name/ca/cargo-tarpaulin/package.nix
index 80c2986f4e77..9f2e1cabdc75 100644
--- a/pkgs/by-name/ca/cargo-tarpaulin/package.nix
+++ b/pkgs/by-name/ca/cargo-tarpaulin/package.nix
@@ -44,6 +44,7 @@ rustPlatform.buildRustPackage rec {
     ];
     maintainers = with maintainers; [
       hugoreeves
+      progrm_jarvis
     ];
   };
 }

From 3d5bc7bc1876fad9cb71a42a6804872468d0c241 Mon Sep 17 00:00:00 2001
From: Petr Portnov <mrjarviscraft+nix@gmail.com>
Date: Mon, 1 Dec 2025 19:51:14 +0300
Subject: [PATCH 26/30] cargo-tarpaulin: use finalAttrs

---
 pkgs/by-name/ca/cargo-tarpaulin/package.nix | 19 ++++++++++++-------
 1 file changed, 12 insertions(+), 7 deletions(-)

diff --git a/pkgs/by-name/ca/cargo-tarpaulin/package.nix b/pkgs/by-name/ca/cargo-tarpaulin/package.nix
index 9f2e1cabdc75..77ae2bee6c5f 100644
--- a/pkgs/by-name/ca/cargo-tarpaulin/package.nix
+++ b/pkgs/by-name/ca/cargo-tarpaulin/package.nix
@@ -6,16 +6,17 @@
   openssl,
   stdenv,
   curl,
+  versionCheckHook,
 }:
 
-rustPlatform.buildRustPackage rec {
+rustPlatform.buildRustPackage (finalAttrs: {
   pname = "cargo-tarpaulin";
   version = "0.34.1";
 
   src = fetchFromGitHub {
     owner = "xd009642";
     repo = "tarpaulin";
-    tag = version;
+    tag = finalAttrs.version;
     hash = "sha256-HJgcFQrHINm4BPfZ4c5ZHQYBTSBVYdSl/n0qBlSsNOI=";
   };
 
@@ -33,18 +34,22 @@ rustPlatform.buildRustPackage rec {
 
   doCheck = false;
 
-  meta = with lib; {
+  doInstallCheck = true;
+  nativeInstallCheckInputs = [ versionCheckHook ];
+  versionCheckProgramArg = "--version";
+
+  meta = {
     description = "Code coverage tool for Rust projects";
     mainProgram = "cargo-tarpaulin";
     homepage = "https://github.com/xd009642/tarpaulin";
-    changelog = "https://github.com/xd009642/tarpaulin/blob/${src.rev}/CHANGELOG.md";
-    license = with licenses; [
+    changelog = "https://github.com/xd009642/tarpaulin/blob/${finalAttrs.version}/CHANGELOG.md";
+    license = with lib.licenses; [
       mit # or
       asl20
     ];
-    maintainers = with maintainers; [
+    maintainers = with lib.maintainers; [
       hugoreeves
       progrm_jarvis
     ];
   };
-}
+})

From 716c8f166c3bc187732d96f2816d33559ff5b810 Mon Sep 17 00:00:00 2001
From: Petr Portnov <mrjarviscraft+nix@gmail.com>
Date: Mon, 1 Dec 2025 19:52:15 +0300
Subject: [PATCH 27/30] cargo-tarpaulin: add nix-update-script

---
 pkgs/by-name/ca/cargo-tarpaulin/package.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/by-name/ca/cargo-tarpaulin/package.nix b/pkgs/by-name/ca/cargo-tarpaulin/package.nix
index 77ae2bee6c5f..272194901b8c 100644
--- a/pkgs/by-name/ca/cargo-tarpaulin/package.nix
+++ b/pkgs/by-name/ca/cargo-tarpaulin/package.nix
@@ -7,6 +7,7 @@
   stdenv,
   curl,
   versionCheckHook,
+  nix-update-script,
 }:
 
 rustPlatform.buildRustPackage (finalAttrs: {
@@ -38,6 +39,8 @@ rustPlatform.buildRustPackage (finalAttrs: {
   nativeInstallCheckInputs = [ versionCheckHook ];
   versionCheckProgramArg = "--version";
 
+  passthru.updateScript = nix-update-script { };
+
   meta = {
     description = "Code coverage tool for Rust projects";
     mainProgram = "cargo-tarpaulin";

From 66603cb734af46ffb2e008531280df402bc14eda Mon Sep 17 00:00:00 2001
From: Petr Portnov <mrjarviscraft+nix@gmail.com>
Date: Mon, 1 Dec 2025 19:53:18 +0300
Subject: [PATCH 28/30] cargo-zigbuild: add progrm_jarvis to maintainers

---
 pkgs/by-name/ca/cargo-zigbuild/package.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/by-name/ca/cargo-zigbuild/package.nix b/pkgs/by-name/ca/cargo-zigbuild/package.nix
index f5f7927f82ee..2f2b12561aae 100644
--- a/pkgs/by-name/ca/cargo-zigbuild/package.nix
+++ b/pkgs/by-name/ca/cargo-zigbuild/package.nix
@@ -32,6 +32,6 @@ rustPlatform.buildRustPackage rec {
     homepage = "https://github.com/messense/cargo-zigbuild";
     changelog = "https://github.com/messense/cargo-zigbuild/releases/tag/v${version}";
     license = lib.licenses.mit;
-    maintainers = [ ];
+    maintainers = [ lib.maintainers.progrm_jarvis ];
   };
 }

From 42d41382cef1adb918dc60e7f8b9873a660e1469 Mon Sep 17 00:00:00 2001
From: Petr Portnov <mrjarviscraft+nix@gmail.com>
Date: Mon, 1 Dec 2025 19:55:25 +0300
Subject: [PATCH 29/30] cargo-zigbuild: use finalAttrs

---
 pkgs/by-name/ca/cargo-zigbuild/package.nix | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/ca/cargo-zigbuild/package.nix b/pkgs/by-name/ca/cargo-zigbuild/package.nix
index 2f2b12561aae..8bf12964f702 100644
--- a/pkgs/by-name/ca/cargo-zigbuild/package.nix
+++ b/pkgs/by-name/ca/cargo-zigbuild/package.nix
@@ -4,16 +4,17 @@
   fetchFromGitHub,
   makeWrapper,
   zig,
+  versionCheckHook,
 }:
 
-rustPlatform.buildRustPackage rec {
+rustPlatform.buildRustPackage (finalAttrs: {
   pname = "cargo-zigbuild";
   version = "0.20.1";
 
   src = fetchFromGitHub {
     owner = "messense";
     repo = "cargo-zigbuild";
-    rev = "v${version}";
+    tag = "v${finalAttrs.version}";
     hash = "sha256-xJiYtVrvWEBsyTbcHKsbnTpbcTryX+ZP/OjD7GP6gQU=";
   };
 
@@ -26,12 +27,16 @@ rustPlatform.buildRustPackage rec {
       --prefix PATH : ${zig}/bin
   '';
 
+  doInstallCheck = true;
+  nativeInstallCheckInputs = [ versionCheckHook ];
+  versionCheckProgramArg = "--version";
+
   meta = {
     description = "Tool to compile Cargo projects with zig as the linker";
     mainProgram = "cargo-zigbuild";
     homepage = "https://github.com/messense/cargo-zigbuild";
-    changelog = "https://github.com/messense/cargo-zigbuild/releases/tag/v${version}";
+    changelog = "https://github.com/messense/cargo-zigbuild/releases/tag/v${finalAttrs.version}";
     license = lib.licenses.mit;
     maintainers = [ lib.maintainers.progrm_jarvis ];
   };
-}
+})

From 7b5ab1da3deb81d23bb6db7eead3e11966815601 Mon Sep 17 00:00:00 2001
From: Petr Portnov <mrjarviscraft+nix@gmail.com>
Date: Mon, 1 Dec 2025 19:56:30 +0300
Subject: [PATCH 30/30] cargo-zigbuild: add nix-update-script

---
 pkgs/by-name/ca/cargo-zigbuild/package.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/by-name/ca/cargo-zigbuild/package.nix b/pkgs/by-name/ca/cargo-zigbuild/package.nix
index 8bf12964f702..876d4cce48d1 100644
--- a/pkgs/by-name/ca/cargo-zigbuild/package.nix
+++ b/pkgs/by-name/ca/cargo-zigbuild/package.nix
@@ -5,6 +5,7 @@
   makeWrapper,
   zig,
   versionCheckHook,
+  nix-update-script,
 }:
 
 rustPlatform.buildRustPackage (finalAttrs: {
@@ -31,6 +32,8 @@ rustPlatform.buildRustPackage (finalAttrs: {
   nativeInstallCheckInputs = [ versionCheckHook ];
   versionCheckProgramArg = "--version";
 
+  passthru.updateScript = nix-update-script { };
+
   meta = {
     description = "Tool to compile Cargo projects with zig as the linker";
     mainProgram = "cargo-zigbuild";