From c2e4f3c99f4cc249040ac95ed405539035a69cce Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 3 Dec 2024 10:51:05 +0100 Subject: [PATCH] rustcat: move to pkgs/by-name --- .../rustcat/default.nix => by-name/ru/rustcat/package.nix} | 4 ++-- pkgs/top-level/all-packages.nix | 4 ---- 2 files changed, 2 insertions(+), 6 deletions(-) rename pkgs/{tools/networking/rustcat/default.nix => by-name/ru/rustcat/package.nix} (88%) diff --git a/pkgs/tools/networking/rustcat/default.nix b/pkgs/by-name/ru/rustcat/package.nix similarity index 88% rename from pkgs/tools/networking/rustcat/default.nix rename to pkgs/by-name/ru/rustcat/package.nix index 0933137335eb..d61e84588068 100644 --- a/pkgs/tools/networking/rustcat/default.nix +++ b/pkgs/by-name/ru/rustcat/package.nix @@ -1,9 +1,9 @@ { lib, stdenv, + darwin, fetchFromGitHub, rustPlatform, - Security, versionCheckHook, }: @@ -20,7 +20,7 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-wqoU9UfXDmf7KIHgFif5rZfZY8Zu0SsaMVfwTtXLzHg="; - buildInputs = lib.optional stdenv.hostPlatform.isDarwin Security; + buildInputs = lib.optional stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Security ]; nativeInstallCheckInputs = [ versionCheckHook ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e6d18c1a3849..d1dc98ee7dbb 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5161,10 +5161,6 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) Security; }; - rustcat = callPackage ../tools/networking/rustcat { - inherit (darwin.apple_sdk.frameworks) Security; - }; - rustscan = callPackage ../tools/security/rustscan { inherit (darwin.apple_sdk.frameworks) Security; };