From fe5fb91889ea2e2dff29b2bd363af7eca4d50bbe Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 3 Dec 2024 11:20:57 +0100 Subject: [PATCH] slowlorust: move to pkgs/by-name --- .../default.nix => by-name/sl/slowlorust/package.nix} | 6 ++---- pkgs/top-level/all-packages.nix | 4 ---- 2 files changed, 2 insertions(+), 8 deletions(-) rename pkgs/{tools/networking/slowlorust/default.nix => by-name/sl/slowlorust/package.nix} (90%) diff --git a/pkgs/tools/networking/slowlorust/default.nix b/pkgs/by-name/sl/slowlorust/package.nix similarity index 90% rename from pkgs/tools/networking/slowlorust/default.nix rename to pkgs/by-name/sl/slowlorust/package.nix index efb4fb6b463c..3d3ced6d29ec 100644 --- a/pkgs/tools/networking/slowlorust/default.nix +++ b/pkgs/by-name/sl/slowlorust/package.nix @@ -1,9 +1,9 @@ { lib, stdenv, + darwin, fetchFromGitHub, rustPlatform, - Security, versionCheckHook, }: @@ -26,9 +26,7 @@ rustPlatform.buildRustPackage rec { --replace-fail 'version = "1.0"' 'version = "${version}"' ''; - buildInputs = lib.optionals 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..ba99cad15808 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5235,10 +5235,6 @@ with pkgs; ocamlPackages = ocaml-ng.ocamlPackages_4_12; }; - slowlorust = callPackage ../tools/networking/slowlorust { - inherit (darwin.apple_sdk.frameworks) Security; - }; - slstatus = callPackage ../applications/misc/slstatus { conf = config.slstatus.conf or null; };