From cf5ff2a9b1d8ac08f961226a9fbd711044192bcd Mon Sep 17 00:00:00 2001 From: Niklas Korz Date: Thu, 6 Feb 2025 18:04:09 +0100 Subject: [PATCH 1/5] cargo-lambda: remove obsolete darwin frameworks --- pkgs/development/tools/rust/cargo-lambda/default.nix | 4 ---- pkgs/top-level/all-packages.nix | 4 +--- 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/pkgs/development/tools/rust/cargo-lambda/default.nix b/pkgs/development/tools/rust/cargo-lambda/default.nix index c1d92e0f719d..630e4dec1aa8 100644 --- a/pkgs/development/tools/rust/cargo-lambda/default.nix +++ b/pkgs/development/tools/rust/cargo-lambda/default.nix @@ -8,8 +8,6 @@ pkg-config, openssl, stdenv, - CoreServices, - Security, zig, nix-update-script, }: @@ -39,8 +37,6 @@ rustPlatform.buildRustPackage rec { [ openssl ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ curl - CoreServices - Security ]; # Remove files that don't make builds reproducible: diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f625b4590645..e4cbe15d36b7 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6666,9 +6666,7 @@ with pkgs; cargo-hf2 = callPackage ../development/tools/rust/cargo-hf2 { inherit (darwin.apple_sdk.frameworks) AppKit; }; - cargo-lambda = callPackage ../development/tools/rust/cargo-lambda { - inherit (darwin.apple_sdk.frameworks) CoreServices Security; - }; + cargo-lambda = callPackage ../development/tools/rust/cargo-lambda { }; cargo-ndk = callPackage ../development/tools/rust/cargo-ndk { inherit (darwin.apple_sdk.frameworks) CoreGraphics Foundation; }; From 7565e40f8e1022722d8d38686bfc8db5a9e57c96 Mon Sep 17 00:00:00 2001 From: Niklas Korz Date: Thu, 6 Feb 2025 18:04:53 +0100 Subject: [PATCH 2/5] cargo-lambda: move to pkgs/by-name --- .../default.nix => by-name/ca/cargo-lambda/package.nix} | 0 pkgs/top-level/all-packages.nix | 1 - 2 files changed, 1 deletion(-) rename pkgs/{development/tools/rust/cargo-lambda/default.nix => by-name/ca/cargo-lambda/package.nix} (100%) diff --git a/pkgs/development/tools/rust/cargo-lambda/default.nix b/pkgs/by-name/ca/cargo-lambda/package.nix similarity index 100% rename from pkgs/development/tools/rust/cargo-lambda/default.nix rename to pkgs/by-name/ca/cargo-lambda/package.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e4cbe15d36b7..984fea1dc3e0 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6666,7 +6666,6 @@ with pkgs; cargo-hf2 = callPackage ../development/tools/rust/cargo-hf2 { inherit (darwin.apple_sdk.frameworks) AppKit; }; - cargo-lambda = callPackage ../development/tools/rust/cargo-lambda { }; cargo-ndk = callPackage ../development/tools/rust/cargo-ndk { inherit (darwin.apple_sdk.frameworks) CoreGraphics Foundation; }; From f2018a225f2f517d914e6ebd87f840cced06f933 Mon Sep 17 00:00:00 2001 From: Niklas Korz Date: Thu, 6 Feb 2025 18:06:08 +0100 Subject: [PATCH 3/5] cargo-lambda: refactor src --- pkgs/by-name/ca/cargo-lambda/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ca/cargo-lambda/package.nix b/pkgs/by-name/ca/cargo-lambda/package.nix index 630e4dec1aa8..a011be60b200 100644 --- a/pkgs/by-name/ca/cargo-lambda/package.nix +++ b/pkgs/by-name/ca/cargo-lambda/package.nix @@ -17,9 +17,9 @@ rustPlatform.buildRustPackage rec { version = "1.6.3"; src = fetchFromGitHub { - owner = pname; - repo = pname; - rev = "v${version}"; + owner = "cargo-lambda"; + repo = "cargo-lambda"; + tag = "v${version}"; hash = "sha256-GiV5yjlzU4iU4BJ8Fq8I9uOchVCF2UGb+WLMMr7n8pc="; }; From d512a965fac44cca8dc98d1feb1a494e2793f038 Mon Sep 17 00:00:00 2001 From: Niklas Korz Date: Thu, 6 Feb 2025 18:06:58 +0100 Subject: [PATCH 4/5] cargo-lambda: remove with lib; usage --- pkgs/by-name/ca/cargo-lambda/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ca/cargo-lambda/package.nix b/pkgs/by-name/ca/cargo-lambda/package.nix index a011be60b200..6f6aa2ca5366 100644 --- a/pkgs/by-name/ca/cargo-lambda/package.nix +++ b/pkgs/by-name/ca/cargo-lambda/package.nix @@ -55,12 +55,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 matthiasbeyer From cc11bdd9c68e854122a8533658dbc02c68449762 Mon Sep 17 00:00:00 2001 From: Niklas Korz Date: Thu, 6 Feb 2025 18:08:35 +0100 Subject: [PATCH 5/5] cargo-lambda: fix darwin sandbox issues --- pkgs/by-name/ca/cargo-lambda/package.nix | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/pkgs/by-name/ca/cargo-lambda/package.nix b/pkgs/by-name/ca/cargo-lambda/package.nix index 6f6aa2ca5366..006da2416bcd 100644 --- a/pkgs/by-name/ca/cargo-lambda/package.nix +++ b/pkgs/by-name/ca/cargo-lambda/package.nix @@ -53,6 +53,14 @@ rustPlatform.buildRustPackage rec { CARGO_LAMBDA_BUILD_INFO = "(nixpkgs)"; + checkFlags = lib.optionals stdenv.hostPlatform.isDarwin [ + # Fails in darwin sandbox, first because of trying to listen to a port on + # localhost. While this would be fixed by `__darwinAllowLocalNetworking = true;`, + # they then fail with other I/O issues. + "--skip=test::test_download_example" + "--skip=test::test_download_example_with_cache" + ]; + passthru.updateScript = nix-update-script { }; meta = {