From 9b6376b040c2d295aa8d723f2a415e35f3a70d8c Mon Sep 17 00:00:00 2001
From: xrelkd <46590321+xrelkd@users.noreply.github.com>
Date: Sun, 31 Mar 2024 05:06:00 +0800
Subject: [PATCH 1/2] cargo-expand: 1.0.80 -> 1.0.81

Diff: https://github.com/dtolnay/cargo-expand/compare/1.0.80...1.0.81

Changelog: https://github.com/dtolnay/cargo-expand/releases/tag/1.0.81
---
 pkgs/development/tools/rust/cargo-expand/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/tools/rust/cargo-expand/default.nix b/pkgs/development/tools/rust/cargo-expand/default.nix
index 15c8706601f5..b7fd9542cd44 100644
--- a/pkgs/development/tools/rust/cargo-expand/default.nix
+++ b/pkgs/development/tools/rust/cargo-expand/default.nix
@@ -5,16 +5,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "cargo-expand";
-  version = "1.0.80";
+  version = "1.0.81";
 
   src = fetchFromGitHub {
     owner = "dtolnay";
     repo = pname;
     rev = version;
-    sha256 = "sha256-qK3ZpcY/kxOaRcmlD6AUkd4BVjX8ZcFz8NG60oHh5qo=";
+    sha256 = "sha256-ZOoMWvtuLDhbJu+qzVPHGTCqh2b3PHUggfxNtUW1DoU=";
   };
 
-  cargoHash = "sha256-c2h/ij2fWpJMoq8d60l2Ujw7Xnw8q39GmDlcPffpjMU=";
+  cargoHash = "sha256-cTz9ZR+79yPqTaDqXjSlqXd7NxHDl6Q75N26z+vi7ck=";
 
   meta = with lib; {
     description = "A utility and Cargo subcommand designed to let people expand macros in their Rust source code";

From 62ef7214325f5bb61615f63a5898c56b0e68a673 Mon Sep 17 00:00:00 2001
From: xrelkd <46590321+xrelkd@users.noreply.github.com>
Date: Fri, 29 Sep 2023 12:30:20 +0800
Subject: [PATCH 2/2] cargo-expand: migrate to by-name

---
 .../default.nix => by-name/ca/cargo-expand/package.nix}     | 6 +++---
 pkgs/top-level/all-packages.nix                             | 1 -
 2 files changed, 3 insertions(+), 4 deletions(-)
 rename pkgs/{development/tools/rust/cargo-expand/default.nix => by-name/ca/cargo-expand/package.nix} (76%)

diff --git a/pkgs/development/tools/rust/cargo-expand/default.nix b/pkgs/by-name/ca/cargo-expand/package.nix
similarity index 76%
rename from pkgs/development/tools/rust/cargo-expand/default.nix
rename to pkgs/by-name/ca/cargo-expand/package.nix
index b7fd9542cd44..62b88be9618c 100644
--- a/pkgs/development/tools/rust/cargo-expand/default.nix
+++ b/pkgs/by-name/ca/cargo-expand/package.nix
@@ -11,17 +11,17 @@ rustPlatform.buildRustPackage rec {
     owner = "dtolnay";
     repo = pname;
     rev = version;
-    sha256 = "sha256-ZOoMWvtuLDhbJu+qzVPHGTCqh2b3PHUggfxNtUW1DoU=";
+    hash = "sha256-ZOoMWvtuLDhbJu+qzVPHGTCqh2b3PHUggfxNtUW1DoU=";
   };
 
   cargoHash = "sha256-cTz9ZR+79yPqTaDqXjSlqXd7NxHDl6Q75N26z+vi7ck=";
 
   meta = with lib; {
-    description = "A utility and Cargo subcommand designed to let people expand macros in their Rust source code";
-    mainProgram = "cargo-expand";
+    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}";
     license = with licenses; [ mit asl20 ];
     maintainers = with maintainers; [ figsoda xrelkd ];
+    mainProgram = "cargo-expand";
   };
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index c3f73e100e74..c1305561c363 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -16877,7 +16877,6 @@ with pkgs;
   cargo-diet = callPackage ../development/tools/rust/cargo-diet { };
   cargo-dist = callPackage ../development/tools/rust/cargo-dist { };
   cargo-espmonitor = callPackage ../development/tools/rust/cargo-espmonitor { };
-  cargo-expand = callPackage ../development/tools/rust/cargo-expand { };
   cargo-hakari = callPackage ../development/tools/rust/cargo-hakari { };
   cargo-feature = callPackage ../development/tools/rust/cargo-feature { };
   cargo-fund = callPackage ../development/tools/rust/cargo-fund {