From 78ab67015fbabca7df37ea588a45e93f00041d42 Mon Sep 17 00:00:00 2001
From: Defelo <mail@defelo.de>
Date: Tue, 4 Nov 2025 17:07:28 +0100
Subject: [PATCH 1/4] cargo-expand: use finalAttrs pattern

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

diff --git a/pkgs/by-name/ca/cargo-expand/package.nix b/pkgs/by-name/ca/cargo-expand/package.nix
index 4df4374750de..42a236deb93a 100644
--- a/pkgs/by-name/ca/cargo-expand/package.nix
+++ b/pkgs/by-name/ca/cargo-expand/package.nix
@@ -4,14 +4,14 @@
   fetchFromGitHub,
 }:
 
-rustPlatform.buildRustPackage rec {
+rustPlatform.buildRustPackage (finalAttrs: {
   pname = "cargo-expand";
   version = "1.0.118";
 
   src = fetchFromGitHub {
     owner = "dtolnay";
     repo = "cargo-expand";
-    tag = version;
+    tag = finalAttrs.version;
     hash = "sha256-+n4eiwcToXtWMPmvE41kOcZHzgugjekxQkodDagDjhI=";
   };
 
@@ -20,7 +20,7 @@ rustPlatform.buildRustPackage rec {
   meta = {
     description = "Cargo subcommand to show result of macro expansion";
     homepage = "https://github.com/dtolnay/cargo-expand";
-    changelog = "https://github.com/dtolnay/cargo-expand/releases/tag/${version}";
+    changelog = "https://github.com/dtolnay/cargo-expand/releases/tag/${finalAttrs.version}";
     license = with lib.licenses; [
       mit
       asl20
@@ -30,4 +30,4 @@ rustPlatform.buildRustPackage rec {
     ];
     mainProgram = "cargo-expand";
   };
-}
+})

From 03580a4bca9617ae4a5575acbb95088888256001 Mon Sep 17 00:00:00 2001
From: Defelo <mail@defelo.de>
Date: Tue, 4 Nov 2025 17:08:26 +0100
Subject: [PATCH 2/4] cargo-expand: add versionCheckHook

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

diff --git a/pkgs/by-name/ca/cargo-expand/package.nix b/pkgs/by-name/ca/cargo-expand/package.nix
index 42a236deb93a..7dac06d39b22 100644
--- a/pkgs/by-name/ca/cargo-expand/package.nix
+++ b/pkgs/by-name/ca/cargo-expand/package.nix
@@ -2,6 +2,7 @@
   lib,
   rustPlatform,
   fetchFromGitHub,
+  versionCheckHook,
 }:
 
 rustPlatform.buildRustPackage (finalAttrs: {
@@ -17,6 +18,10 @@ rustPlatform.buildRustPackage (finalAttrs: {
 
   cargoHash = "sha256-Di7Nnp8qYqpTkKmmUYoKxSkntepG80vVF2AkaN5yW+U=";
 
+  nativeInstallCheckInputs = [ versionCheckHook ];
+  versionCheckProgramArg = "--version";
+  doInstallCheck = true;
+
   meta = {
     description = "Cargo subcommand to show result of macro expansion";
     homepage = "https://github.com/dtolnay/cargo-expand";

From b23f0366964cb59d743d048a7bd0b097cdb0b548 Mon Sep 17 00:00:00 2001
From: Defelo <mail@defelo.de>
Date: Tue, 4 Nov 2025 17:08:26 +0100
Subject: [PATCH 3/4] cargo-expand: add updateScript

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

diff --git a/pkgs/by-name/ca/cargo-expand/package.nix b/pkgs/by-name/ca/cargo-expand/package.nix
index 7dac06d39b22..5eb7042ae5ec 100644
--- a/pkgs/by-name/ca/cargo-expand/package.nix
+++ b/pkgs/by-name/ca/cargo-expand/package.nix
@@ -3,6 +3,7 @@
   rustPlatform,
   fetchFromGitHub,
   versionCheckHook,
+  nix-update-script,
 }:
 
 rustPlatform.buildRustPackage (finalAttrs: {
@@ -22,6 +23,8 @@ rustPlatform.buildRustPackage (finalAttrs: {
   versionCheckProgramArg = "--version";
   doInstallCheck = true;
 
+  passthru.updateScript = nix-update-script { };
+
   meta = {
     description = "Cargo subcommand to show result of macro expansion";
     homepage = "https://github.com/dtolnay/cargo-expand";

From 1cb07de49a06615a1ecb33c18a3cb6726ffa6566 Mon Sep 17 00:00:00 2001
From: Defelo <mail@defelo.de>
Date: Tue, 4 Nov 2025 13:07:00 +0100
Subject: [PATCH 4/4] cargo-expand: add defelo to maintainers

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

diff --git a/pkgs/by-name/ca/cargo-expand/package.nix b/pkgs/by-name/ca/cargo-expand/package.nix
index 5eb7042ae5ec..5aca7c581568 100644
--- a/pkgs/by-name/ca/cargo-expand/package.nix
+++ b/pkgs/by-name/ca/cargo-expand/package.nix
@@ -35,6 +35,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
     ];
     maintainers = with lib.maintainers; [
       xrelkd
+      defelo
     ];
     mainProgram = "cargo-expand";
   };