From c6b3703b5b83abbaa72057edc496c8437d471e25 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Tue, 3 Dec 2024 01:25:16 -0500 Subject: [PATCH] [Backport release-24.11] cargo-spellcheck: move to pkgs/by-name (#361331) cargo-spellcheck: move to pkgs/by-name (#356513) (cherry picked from commit afd9ca8bf0e032c3f364027e404b62d022fd72ce) Co-authored-by: Alex Martens --- .../default.nix => by-name/ca/cargo-spellcheck/package.nix} | 5 ++--- pkgs/top-level/all-packages.nix | 3 --- 2 files changed, 2 insertions(+), 6 deletions(-) rename pkgs/{development/tools/rust/cargo-spellcheck/default.nix => by-name/ca/cargo-spellcheck/package.nix} (88%) diff --git a/pkgs/development/tools/rust/cargo-spellcheck/default.nix b/pkgs/by-name/ca/cargo-spellcheck/package.nix similarity index 88% rename from pkgs/development/tools/rust/cargo-spellcheck/default.nix rename to pkgs/by-name/ca/cargo-spellcheck/package.nix index 6d6bfa5ae2580..1ac4ec1265f93 100644 --- a/pkgs/development/tools/rust/cargo-spellcheck/default.nix +++ b/pkgs/by-name/ca/cargo-spellcheck/package.nix @@ -2,8 +2,7 @@ , rustPlatform , fetchFromGitHub , stdenv -, Security -, SystemConfiguration +, apple-sdk_11 }: rustPlatform.buildRustPackage rec { @@ -21,7 +20,7 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ rustPlatform.bindgenHook ]; - buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ Security SystemConfiguration ]; + buildInputs = lib.optional stdenv.hostPlatform.isDarwin apple-sdk_11; preCheck = "HOME=$(mktemp -d)"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b6f5e90a32650..446795350886e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7025,9 +7025,6 @@ with pkgs; cargo-rdme = callPackage ../by-name/ca/cargo-rdme/package.nix { inherit (darwin.apple_sdk.frameworks) Security; }; - cargo-spellcheck = callPackage ../development/tools/rust/cargo-spellcheck { - inherit (darwin.apple_sdk.frameworks) Security SystemConfiguration; - }; cargo-udeps = callPackage ../development/tools/rust/cargo-udeps { inherit (darwin.apple_sdk.frameworks) CoreServices Security SystemConfiguration; };