Skip to content

Commit d9b16fd

Browse files
[Backport release-24.11] cargo-lambda: move to pkgs/by-name, small refactorings (#380155)
2 parents ef503dd + 40c4716 commit d9b16fd

File tree

2 files changed

+7
-12
lines changed

2 files changed

+7
-12
lines changed

pkgs/development/tools/rust/cargo-lambda/default.nix pkgs/by-name/ca/cargo-lambda/package.nix

+6-10
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,6 @@
88
pkg-config,
99
openssl,
1010
stdenv,
11-
CoreServices,
12-
Security,
1311
zig,
1412
nix-update-script,
1513
}:
@@ -19,9 +17,9 @@ rustPlatform.buildRustPackage rec {
1917
version = "1.5.0";
2018

2119
src = fetchFromGitHub {
22-
owner = pname;
23-
repo = pname;
24-
rev = "v${version}";
20+
owner = "cargo-lambda";
21+
repo = "cargo-lambda";
22+
tag = "v${version}";
2523
hash = "sha256-58kVtwBZEAlv9eVesqmWMZ+KxAwEiGMm8mCf9X5tPMI=";
2624
};
2725

@@ -38,8 +36,6 @@ rustPlatform.buildRustPackage rec {
3836
[ openssl ]
3937
++ lib.optionals stdenv.hostPlatform.isDarwin [
4038
curl
41-
CoreServices
42-
Security
4339
];
4440

4541
checkFlags = [
@@ -63,12 +59,12 @@ rustPlatform.buildRustPackage rec {
6359

6460
passthru.updateScript = nix-update-script { };
6561

66-
meta = with lib; {
62+
meta = {
6763
description = "Cargo subcommand to help you work with AWS Lambda";
6864
mainProgram = "cargo-lambda";
6965
homepage = "https://cargo-lambda.info";
70-
license = licenses.mit;
71-
maintainers = with maintainers; [
66+
license = lib.licenses.mit;
67+
maintainers = with lib.maintainers; [
7268
taylor1791
7369
calavera
7470
];

pkgs/top-level/all-packages.nix

+1-2
Original file line numberDiff line numberDiff line change
@@ -7010,9 +7010,8 @@ with pkgs;
70107010
cargo-inspect = callPackage ../development/tools/rust/cargo-inspect {
70117011
inherit (darwin.apple_sdk.frameworks) Security;
70127012
};
7013-
cargo-lambda = callPackage ../development/tools/rust/cargo-lambda {
7013+
cargo-lambda = callPackage ../by-name/ca/cargo-lambda/package.nix {
70147014
zig = buildPackages.zig_0_12;
7015-
inherit (darwin.apple_sdk.frameworks) CoreServices Security;
70167015
};
70177016
cargo-msrv = callPackage ../development/tools/rust/cargo-msrv {
70187017
inherit (darwin.apple_sdk.frameworks) Security;

0 commit comments

Comments
 (0)