From 53038c609fd344e585bb69bf2675477f1f9bc90c Mon Sep 17 00:00:00 2001 From: Aaron Jheng Date: Sun, 22 Dec 2024 00:47:18 +0000 Subject: [PATCH] sd: use new Darwin SDK pattern --- .../text/sd/default.nix => by-name/sd/sd/package.nix} | 10 +++------- pkgs/top-level/all-packages.nix | 4 ---- 2 files changed, 3 insertions(+), 11 deletions(-) rename pkgs/{tools/text/sd/default.nix => by-name/sd/sd/package.nix} (80%) diff --git a/pkgs/tools/text/sd/default.nix b/pkgs/by-name/sd/sd/package.nix similarity index 80% rename from pkgs/tools/text/sd/default.nix rename to pkgs/by-name/sd/sd/package.nix index 4469739ce162..5734960eb074 100644 --- a/pkgs/tools/text/sd/default.nix +++ b/pkgs/by-name/sd/sd/package.nix @@ -1,10 +1,8 @@ { lib, - stdenv, fetchFromGitHub, rustPlatform, installShellFiles, - Security, }: rustPlatform.buildRustPackage rec { @@ -22,8 +20,6 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ installShellFiles ]; - buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ Security ]; - postInstall = '' installManPage gen/sd.1 @@ -31,12 +27,12 @@ rustPlatform.buildRustPackage rec { installShellCompletion --zsh gen/completions/_sd ''; - meta = with lib; { + meta = { description = "Intuitive find & replace CLI (sed alternative)"; mainProgram = "sd"; homepage = "https://github.com/chmln/sd"; - license = licenses.mit; - maintainers = with maintainers; [ + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ amar1729 Br1ght0ne ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f0de88d9b682..da36bff117a8 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5124,10 +5124,6 @@ with pkgs; scfbuild = python3.pkgs.callPackage ../tools/misc/scfbuild { }; - sd = callPackage ../tools/text/sd { - inherit (darwin.apple_sdk.frameworks) Security; - }; - securefs = darwin.apple_sdk_11_0.callPackage ../tools/filesystems/securefs { }; segger-jlink-headless = callPackage ../by-name/se/segger-jlink/package.nix { headless = true; };