From daeb280fa52dbdec4baedecd1bebd8ac0341985e Mon Sep 17 00:00:00 2001 From: Taylor Everding Date: Sat, 29 Oct 2022 21:43:12 -0600 Subject: [PATCH 1/2] maintainers: add taylor1791 --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index bd0b543a1d0f..3da0dfe2a0ad 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -13305,6 +13305,12 @@ githubId = 102685; name = "Thomas Friese"; }; + taylor1791 = { + email = "nixpkgs@tayloreverding.com"; + github = "taylor1791"; + githubId = 555003; + name = "Taylor Everding"; + }; tazjin = { email = "mail@tazj.in"; github = "tazjin"; From 4f9179c1f6d5c92a8012a6a89f86cd6c7b756ef1 Mon Sep 17 00:00:00 2001 From: Taylor Everding Date: Sat, 29 Oct 2022 21:43:44 -0600 Subject: [PATCH 2/2] cargo-lambda: init at 0.11.2 --- .../tools/rust/cargo-lambda/default.nix | 37 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 3 ++ 2 files changed, 40 insertions(+) create mode 100644 pkgs/development/tools/rust/cargo-lambda/default.nix diff --git a/pkgs/development/tools/rust/cargo-lambda/default.nix b/pkgs/development/tools/rust/cargo-lambda/default.nix new file mode 100644 index 000000000000..068b7e36dfad --- /dev/null +++ b/pkgs/development/tools/rust/cargo-lambda/default.nix @@ -0,0 +1,37 @@ +{ stdenv, lib, rustPlatform, fetchFromGitHub, makeWrapper, cargo-watch, zig, Security }: + +rustPlatform.buildRustPackage rec { + pname = "cargo-lambda"; + version = "0.11.2"; + + src = fetchFromGitHub { + owner = pname; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-IK4HVj8Y8Vz+mza8G9C+m5JRfNT3BWWdlbQQkJPu6RI="; + }; + + cargoSha256 = "sha256-oSqoSvv8IiChtduQQA31wItHcsnRBAQgOCrQN4sjcx8="; + + buildInputs = lib.optionals stdenv.isDarwin [ Security ]; + + nativeBuildInputs = [ makeWrapper ]; + + postInstall = '' + wrapProgram $out/bin/cargo-lambda --prefix PATH : ${lib.makeBinPath [ cargo-watch zig ]} + ''; + + checkFlags = [ + # Disabled because it accesses the network. + "--skip test_download_example" + # Disabled because it makes assumptions about the file system. + "--skip test_target_dir_from_env" + ]; + + meta = with lib; { + description = "A Cargo subcommand to help you work with AWS Lambda"; + homepage = "https://cargo-lambda.info"; + license = licenses.mit; + maintainers = with maintainers; [ taylor1791 ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index eaaf3e3be7a5..1dc8757bd67b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -14974,6 +14974,9 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) Security; }; cargo-insta = callPackage ../development/tools/rust/cargo-insta { }; + cargo-lambda = callPackage ../development/tools/rust/cargo-lambda { + inherit (darwin.apple_sdk.frameworks) Security; + }; cargo-limit = callPackage ../development/tools/rust/cargo-limit { }; cargo-make = callPackage ../development/tools/rust/cargo-make { inherit (darwin.apple_sdk.frameworks) Security SystemConfiguration;