[Backport release-24.11] cargo-lambda: move to pkgs/by-name, small re…

…factorings (#380155)
NixOS · Feb 9, 2025 · d9b16fd · d9b16fd
2 parents ef503dd + 40c4716
commit d9b16fd
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 12 deletions.
diff --git a/...pment/tools/rust/cargo-lambda/default.nix → pkgs/by-name/ca/cargo-lambda/package.nix b/...pment/tools/rust/cargo-lambda/default.nix → pkgs/by-name/ca/cargo-lambda/package.nix
@@ -8,8 +8,6 @@
   pkg-config,
   openssl,
   stdenv,
-  CoreServices,
-  Security,
   zig,
   nix-update-script,
 }:
@@ -19,9 +17,9 @@ rustPlatform.buildRustPackage rec {
   version = "1.5.0";
 
   src = fetchFromGitHub {
-    owner = pname;
-    repo = pname;
-    rev = "v${version}";
+    owner = "cargo-lambda";
+    repo = "cargo-lambda";
+    tag = "v${version}";
     hash = "sha256-58kVtwBZEAlv9eVesqmWMZ+KxAwEiGMm8mCf9X5tPMI=";
   };
 
@@ -38,8 +36,6 @@ rustPlatform.buildRustPackage rec {
     [ openssl ]
     ++ lib.optionals stdenv.hostPlatform.isDarwin [
       curl
-      CoreServices
-      Security
     ];
 
   checkFlags = [
@@ -63,12 +59,12 @@ rustPlatform.buildRustPackage rec {
 
   passthru.updateScript = nix-update-script { };
 
-  meta = with lib; {
+  meta = {
     description = "Cargo subcommand to help you work with AWS Lambda";
     mainProgram = "cargo-lambda";
     homepage = "https://cargo-lambda.info";
-    license = licenses.mit;
-    maintainers = with maintainers; [
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [
       taylor1791
       calavera
     ];

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
@@ -7010,9 +7010,8 @@ with pkgs;
   cargo-inspect = callPackage ../development/tools/rust/cargo-inspect {
     inherit (darwin.apple_sdk.frameworks) Security;
   };
-  cargo-lambda = callPackage ../development/tools/rust/cargo-lambda {
+  cargo-lambda = callPackage ../by-name/ca/cargo-lambda/package.nix {
     zig = buildPackages.zig_0_12;
-    inherit (darwin.apple_sdk.frameworks) CoreServices Security;
   };
   cargo-msrv = callPackage ../development/tools/rust/cargo-msrv {
     inherit (darwin.apple_sdk.frameworks) Security;