From 892afda4fa260f0b3efcda49e0d844829036b29a Mon Sep 17 00:00:00 2001
From: xrelkd <46590321+xrelkd@users.noreply.github.com>
Date: Fri, 29 Sep 2023 11:59:16 +0800
Subject: cargo-make: migrate to by-name

---
 pkgs/by-name/ca/cargo-make/package.nix             | 47 ++++++++++++++++++++++
 pkgs/development/tools/rust/cargo-make/default.nix | 47 ----------------------
 pkgs/top-level/all-packages.nix                    |  1 -
 3 files changed, 47 insertions(+), 48 deletions(-)
 create mode 100644 pkgs/by-name/ca/cargo-make/package.nix
 delete mode 100644 pkgs/development/tools/rust/cargo-make/default.nix

diff --git a/pkgs/by-name/ca/cargo-make/package.nix b/pkgs/by-name/ca/cargo-make/package.nix
new file mode 100644
index 0000000000000..1971c81f46093
--- /dev/null
+++ b/pkgs/by-name/ca/cargo-make/package.nix
@@ -0,0 +1,47 @@
+{ lib
+, rustPlatform
+, fetchFromGitHub
+, pkg-config
+, bzip2
+, openssl
+, stdenv
+, darwin
+}:
+
+rustPlatform.buildRustPackage rec {
+  pname = "cargo-make";
+  version = "0.37.9";
+
+  src = fetchFromGitHub {
+    owner = "sagiegurari";
+    repo = "cargo-make";
+    rev = version;
+    hash = "sha256-pfLK9QGDS4KPIdXq/LI++/r1OxqmgF0qqVJNDSVrZFI=";
+  };
+
+  cargoHash = "sha256-x8cx64B+skusk0LDRQT/1g57NBQMchy2HvvryoY0R/I=";
+
+  nativeBuildInputs = [ pkg-config ];
+
+  buildInputs = [
+    bzip2
+    openssl
+  ] ++ lib.optionals stdenv.isDarwin [
+    darwin.apple_sdk.frameworks.SystemConfiguration
+  ];
+
+  # Some tests fail because they need network access.
+  # However, Travis ensures a proper build.
+  # See also:
+  #   https://travis-ci.org/sagiegurari/cargo-make
+  doCheck = false;
+
+  meta = with lib; {
+    description = "A Rust task runner and build tool";
+    homepage = "https://github.com/sagiegurari/cargo-make";
+    changelog = "https://github.com/sagiegurari/cargo-make/blob/${version}/CHANGELOG.md";
+    license = licenses.asl20;
+    maintainers = with maintainers; [ figsoda xrelkd ];
+    mainProgram = "cargo-make";
+  };
+}
diff --git a/pkgs/development/tools/rust/cargo-make/default.nix b/pkgs/development/tools/rust/cargo-make/default.nix
deleted file mode 100644
index 1971c81f46093..0000000000000
--- a/pkgs/development/tools/rust/cargo-make/default.nix
+++ /dev/null
@@ -1,47 +0,0 @@
-{ lib
-, rustPlatform
-, fetchFromGitHub
-, pkg-config
-, bzip2
-, openssl
-, stdenv
-, darwin
-}:
-
-rustPlatform.buildRustPackage rec {
-  pname = "cargo-make";
-  version = "0.37.9";
-
-  src = fetchFromGitHub {
-    owner = "sagiegurari";
-    repo = "cargo-make";
-    rev = version;
-    hash = "sha256-pfLK9QGDS4KPIdXq/LI++/r1OxqmgF0qqVJNDSVrZFI=";
-  };
-
-  cargoHash = "sha256-x8cx64B+skusk0LDRQT/1g57NBQMchy2HvvryoY0R/I=";
-
-  nativeBuildInputs = [ pkg-config ];
-
-  buildInputs = [
-    bzip2
-    openssl
-  ] ++ lib.optionals stdenv.isDarwin [
-    darwin.apple_sdk.frameworks.SystemConfiguration
-  ];
-
-  # Some tests fail because they need network access.
-  # However, Travis ensures a proper build.
-  # See also:
-  #   https://travis-ci.org/sagiegurari/cargo-make
-  doCheck = false;
-
-  meta = with lib; {
-    description = "A Rust task runner and build tool";
-    homepage = "https://github.com/sagiegurari/cargo-make";
-    changelog = "https://github.com/sagiegurari/cargo-make/blob/${version}/CHANGELOG.md";
-    license = licenses.asl20;
-    maintainers = with maintainers; [ figsoda xrelkd ];
-    mainProgram = "cargo-make";
-  };
-}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 09c674b8d94ee..3403ba13a6dc9 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -16988,7 +16988,6 @@ with pkgs;
     inherit (darwin.apple_sdk.frameworks) CoreServices Security;
   };
   cargo-limit = callPackage ../development/tools/rust/cargo-limit { };
-  cargo-make = callPackage ../development/tools/rust/cargo-make { };
   cargo-modules = callPackage ../development/tools/rust/cargo-modules { };
   cargo-mommy = callPackage ../development/tools/rust/cargo-mommy { };
   cargo-msrv = callPackage ../development/tools/rust/cargo-msrv {
-- 
cgit 1.4.1