From 1dd45da83f7eb852855729c9ee15d5168d5a2cfc Mon Sep 17 00:00:00 2001
From: nartsisss <nartsiss@proton.me>
Date: Sun, 6 Oct 2024 23:20:52 +0300
Subject: [PATCH 1/4] cargo-hakari: 0.9.30 -> 0.9.33

---
 pkgs/development/tools/rust/cargo-hakari/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/tools/rust/cargo-hakari/default.nix b/pkgs/development/tools/rust/cargo-hakari/default.nix
index c8429896be45..ff148aab88ba 100644
--- a/pkgs/development/tools/rust/cargo-hakari/default.nix
+++ b/pkgs/development/tools/rust/cargo-hakari/default.nix
@@ -6,16 +6,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "cargo-hakari";
-  version = "0.9.30";
+  version = "0.9.33";
 
   src = fetchFromGitHub {
     owner = "guppy-rs";
     repo = "guppy";
     rev = "cargo-hakari-${version}";
-    sha256 = "sha256-fwqMV8oTEYqS0Y/IXar1DSZ0Gns1qJ9oGhbdehScrgw=";
+    sha256 = "sha256-oJZiGXsOl00Bim/olYYSqt/p3j6dTw25IURcwdXYrAo=";
   };
 
-  cargoHash = "sha256-DkPnQcoiytIYz780veSAhPnk70qkP3QvTJJ41csUThY=";
+  cargoHash = "sha256-V9QmaZYBXj26HJrP8gABwhhUPwBxnyLoO4O45lnPyew=";
 
   cargoBuildFlags = [
     "-p"

From 83e6cbda1ab5942982f7c64496c2c672ac8a1d2c Mon Sep 17 00:00:00 2001
From: nartsisss <nartsiss@proton.me>
Date: Sun, 6 Oct 2024 23:25:08 +0300
Subject: [PATCH 2/4] cargo-hakari: refactor meta

---
 pkgs/development/tools/rust/cargo-hakari/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/tools/rust/cargo-hakari/default.nix b/pkgs/development/tools/rust/cargo-hakari/default.nix
index ff148aab88ba..cfdf5d6e65a3 100644
--- a/pkgs/development/tools/rust/cargo-hakari/default.nix
+++ b/pkgs/development/tools/rust/cargo-hakari/default.nix
@@ -26,7 +26,7 @@ rustPlatform.buildRustPackage rec {
     "cargo-hakari"
   ];
 
-  meta = with lib; {
+  meta = {
     description = "Manage workspace-hack packages to speed up builds in large workspaces";
     mainProgram = "cargo-hakari";
     longDescription = ''
@@ -36,11 +36,11 @@ rustPlatform.buildRustPackage rec {
     '';
     homepage = "https://crates.io/crates/cargo-hakari";
     changelog = "https://github.com/guppy-rs/guppy/blob/cargo-hakari-${version}/tools/cargo-hakari/CHANGELOG.md";
-    license = with licenses; [
+    license = with lib.licenses; [
       mit
       asl20
     ];
-    maintainers = with maintainers; [
+    maintainers = with lib.maintainers; [
       figsoda
       macalinao
     ];

From 5a994fa2d84e536199c296a93048750da80dc74a Mon Sep 17 00:00:00 2001
From: nartsisss <nartsiss+git@proton.me>
Date: Mon, 21 Oct 2024 03:00:09 +0300
Subject: [PATCH 3/4] cargo-hakari: move to pkgs/by-name

---
 .../default.nix => by-name/ca/cargo-hakari/package.nix}          | 0
 pkgs/top-level/all-packages.nix                                  | 1 -
 2 files changed, 1 deletion(-)
 rename pkgs/{development/tools/rust/cargo-hakari/default.nix => by-name/ca/cargo-hakari/package.nix} (100%)

diff --git a/pkgs/development/tools/rust/cargo-hakari/default.nix b/pkgs/by-name/ca/cargo-hakari/package.nix
similarity index 100%
rename from pkgs/development/tools/rust/cargo-hakari/default.nix
rename to pkgs/by-name/ca/cargo-hakari/package.nix
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index f8cd809caae6..1f22328e733a 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -15699,7 +15699,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-hakari = callPackage ../development/tools/rust/cargo-hakari { };
   cargo-feature = callPackage ../development/tools/rust/cargo-feature { };
   cargo-fund = callPackage ../development/tools/rust/cargo-fund {
     inherit (darwin.apple_sdk.frameworks) Security;

From cb944a2fae660ebe2c08238e6607c7798a75f100 Mon Sep 17 00:00:00 2001
From: nartsisss <nartsiss+git@proton.me>
Date: Mon, 21 Oct 2024 03:01:45 +0300
Subject: [PATCH 4/4] cargo-hakari: add maintainer nartsiss

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

diff --git a/pkgs/by-name/ca/cargo-hakari/package.nix b/pkgs/by-name/ca/cargo-hakari/package.nix
index cfdf5d6e65a3..ba5c2e999776 100644
--- a/pkgs/by-name/ca/cargo-hakari/package.nix
+++ b/pkgs/by-name/ca/cargo-hakari/package.nix
@@ -43,6 +43,7 @@ rustPlatform.buildRustPackage rec {
     maintainers = with lib.maintainers; [
       figsoda
       macalinao
+      nartsiss
     ];
   };
 }