From f5afdf552d733e386dd952e0c25f3206fdafdb08 Mon Sep 17 00:00:00 2001 From: jopejoe1 Date: Thu, 21 Aug 2025 08:46:03 +0200 Subject: [PATCH] dnstracer: move to by-name --- .../default.nix => by-name/dn/dnstracer/package.nix} | 4 ++-- pkgs/top-level/all-packages.nix | 4 ---- 2 files changed, 2 insertions(+), 6 deletions(-) rename pkgs/{tools/networking/dnstracer/default.nix => by-name/dn/dnstracer/package.nix} (96%) diff --git a/pkgs/tools/networking/dnstracer/default.nix b/pkgs/by-name/dn/dnstracer/package.nix similarity index 96% rename from pkgs/tools/networking/dnstracer/default.nix rename to pkgs/by-name/dn/dnstracer/package.nix index e182a086771d..dcff3ee47780 100644 --- a/pkgs/tools/networking/dnstracer/default.nix +++ b/pkgs/by-name/dn/dnstracer/package.nix @@ -2,7 +2,7 @@ lib, stdenv, fetchurl, - libresolv, + darwin, perl, }: @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { install -Dm755 -t $man/share/man/man8 dnstracer.8 ''; - buildInputs = [ ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ libresolv ]; + buildInputs = [ ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.libresolv ]; NIX_LDFLAGS = lib.optionalString stdenv.hostPlatform.isDarwin "-lresolv"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e768b65c83f3..a17d56e1c818 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -15957,10 +15957,6 @@ with pkgs; compressDrvWeb = callPackage ../build-support/compress-drv/web.nix { }; - dnstracer = callPackage ../tools/networking/dnstracer { - inherit (darwin) libresolv; - }; - diceware = with python3Packages; toPythonApplication diceware; xml2rfc = with python3Packages; toPythonApplication xml2rfc;