diff --git a/pkgs/tools/networking/apc-temp-fetch/default.nix b/pkgs/by-name/ap/apc-temp-fetch/package.nix similarity index 73% rename from pkgs/tools/networking/apc-temp-fetch/default.nix rename to pkgs/by-name/ap/apc-temp-fetch/package.nix index 887421233df2..a1b4d2a48e5d 100644 --- a/pkgs/tools/networking/apc-temp-fetch/default.nix +++ b/pkgs/by-name/ap/apc-temp-fetch/package.nix @@ -1,27 +1,25 @@ { lib, - buildPythonApplication, + python3Packages, fetchPypi, - requests, - setuptools, }: -buildPythonApplication rec { +python3Packages.buildPythonApplication (finalAttrs: { pname = "apc-temp-fetch"; version = "0.0.2"; pyproject = true; src = fetchPypi { pname = "APC-Temp-fetch"; - inherit version; + inherit (finalAttrs) version; hash = "sha256-lXGj/xrOkdMMYvuyVVSCojjQlzISFUT14VTn//iOARo="; }; - build-system = [ + build-system = with python3Packages; [ setuptools ]; - dependencies = [ + dependencies = with python3Packages; [ requests ]; @@ -35,4 +33,4 @@ buildPythonApplication rec { license = lib.licenses.asl20; maintainers = [ ]; }; -} +}) diff --git a/pkgs/tools/networking/knock/package.nix b/pkgs/by-name/kn/knock/package.nix similarity index 88% rename from pkgs/tools/networking/knock/package.nix rename to pkgs/by-name/kn/knock/package.nix index 2ac33f93294f..84badec6cbcf 100644 --- a/pkgs/tools/networking/knock/package.nix +++ b/pkgs/by-name/kn/knock/package.nix @@ -5,14 +5,16 @@ installShellFiles, }: -buildGoModule rec { +buildGoModule (finalAttrs: { pname = "knock"; version = "0.0.2"; + __structuredAttrs = true; + src = fetchFromCodeberg { owner = "nat-418"; repo = "knock"; - rev = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-K+L4F4bTERQSqISAmfyps/U5GJ2N0FdJ3RmpiUmt4uA="; }; @@ -36,4 +38,4 @@ buildGoModule rec { changelog = "https://codeberg.org/nat-418/knock/raw/branch/trunk/CHANGELOG.md"; maintainers = with lib.maintainers; [ nat-418 ]; }; -} +}) diff --git a/pkgs/tools/text/mir-qualia/default.nix b/pkgs/by-name/mi/mir-qualia/package.nix similarity index 70% rename from pkgs/tools/text/mir-qualia/default.nix rename to pkgs/by-name/mi/mir-qualia/package.nix index 95da7c83e755..cf1ca8593f11 100644 --- a/pkgs/tools/text/mir-qualia/default.nix +++ b/pkgs/by-name/mi/mir-qualia/package.nix @@ -1,19 +1,19 @@ { lib, - pythonPackages, + python3Packages, fetchurl, }: -pythonPackages.buildPythonApplication rec { +python3Packages.buildPythonApplication (finalAttrs: { pname = "mir.qualia"; version = "2.0.0"; format = "setuptools"; doCheck = false; # 2.0.0-released pytests are broken - buildInputs = with pythonPackages; [ pytest ]; + buildInputs = with python3Packages; [ pytest ]; src = fetchurl { - url = "mirror://pypi/m/mir.qualia/mir.qualia-${version}.tar.gz"; + url = "mirror://pypi/m/mir.qualia/mir.qualia-${finalAttrs.version}.tar.gz"; sha256 = "1ybq6jb5clh9hw0sp3idp4hjv2gkm9yiaph48gcc208affflc8m9"; }; @@ -24,4 +24,4 @@ pythonPackages.buildPythonApplication rec { license = lib.licenses.asl20; maintainers = [ lib.maintainers.srhb ]; }; -} +}) diff --git a/pkgs/tools/networking/openconnect/common.nix b/pkgs/by-name/op/openconnect/package.nix similarity index 82% rename from pkgs/tools/networking/openconnect/common.nix rename to pkgs/by-name/op/openconnect/package.nix index b9ff4d68382e..ff4056cfc531 100644 --- a/pkgs/tools/networking/openconnect/common.nix +++ b/pkgs/by-name/op/openconnect/package.nix @@ -1,11 +1,7 @@ -{ - version, - src, -}: - { lib, stdenv, + fetchFromGitLab, pkg-config, gnutls, p11-kit, @@ -25,7 +21,14 @@ stdenv.mkDerivation { pname = "openconnect"; - inherit version src; + version = "9.12-unstable-2025-11-03"; + + src = fetchFromGitLab { + owner = "openconnect"; + repo = "openconnect"; + rev = "0dcdff87db65daf692dc323732831391d595d98d"; + hash = "sha256-AvowUEDkXvR+QkhJbZU759fZjIqj/mO8HjP2Ka3lH1U="; + }; outputs = [ "out" diff --git a/pkgs/by-name/op/openconnect_openssl/package.nix b/pkgs/by-name/op/openconnect_openssl/package.nix new file mode 100644 index 000000000000..42b85ff0fb1c --- /dev/null +++ b/pkgs/by-name/op/openconnect_openssl/package.nix @@ -0,0 +1,7 @@ +{ + openconnect, +}: + +openconnect.override { + useOpenSSL = true; +} diff --git a/pkgs/tools/networking/privoxy/default.nix b/pkgs/by-name/pr/privoxy/package.nix similarity index 78% rename from pkgs/tools/networking/privoxy/default.nix rename to pkgs/by-name/pr/privoxy/package.nix index a0e3a713c9ac..9366d62919f0 100644 --- a/pkgs/tools/networking/privoxy/default.nix +++ b/pkgs/by-name/pr/privoxy/package.nix @@ -7,27 +7,27 @@ autoreconfHook, zlib, pcre2, - w3m, + w3m-batch, man, openssl, brotli, }: -stdenv.mkDerivation rec { - +stdenv.mkDerivation (finalAttrs: { pname = "privoxy"; version = "4.1.0"; src = fetchurl { - url = "mirror://sourceforge/ijbswa/Sources/${version}%20%28stable%29/${pname}-${version}-stable-src.tar.gz"; - sha256 = "sha256-I+RoblhIx0y2gMCcKBHwNXc57P5kH5xAcu5COZCSyXs="; + url = "mirror://sourceforge/ijbswa/Sources/${finalAttrs.version}%20%28stable%29/privoxy-${finalAttrs.version}-stable-src.tar.gz"; + hash = "sha256-I+RoblhIx0y2gMCcKBHwNXc57P5kH5xAcu5COZCSyXs="; }; nativeBuildInputs = [ autoreconfHook - w3m + w3m-batch man ]; + buildInputs = [ zlib pcre2 @@ -59,5 +59,4 @@ stdenv.mkDerivation rec { maintainers = [ ]; mainProgram = "privoxy"; }; - -} +}) diff --git a/pkgs/tools/misc/rmlint/default.nix b/pkgs/by-name/rm/rmlint/package.nix similarity index 93% rename from pkgs/tools/misc/rmlint/default.nix rename to pkgs/by-name/rm/rmlint/package.nix index 3646164672bb..069ff9e2dab7 100644 --- a/pkgs/tools/misc/rmlint/default.nix +++ b/pkgs/by-name/rm/rmlint/package.nix @@ -15,7 +15,6 @@ polkit, python3, scons, - sphinx, util-linux, wrapGAppsHook3, withGui ? false, @@ -23,15 +22,15 @@ assert withGui -> !stdenv.hostPlatform.isDarwin; -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "rmlint"; version = "2.10.2"; src = fetchFromGitHub { owner = "sahib"; repo = "rmlint"; - rev = "v${version}"; - sha256 = "sha256-pOo1YfeqHUU6xyBRFbcj2lX1MHJ+a5Hi31BMC1nYZGo="; + rev = "v${finalAttrs.version}"; + hash = "sha256-pOo1YfeqHUU6xyBRFbcj2lX1MHJ+a5Hi31BMC1nYZGo="; }; patches = [ @@ -46,7 +45,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config - sphinx + python3.pkgs.sphinx scons ] ++ lib.optionals withGui [ @@ -103,4 +102,4 @@ stdenv.mkDerivation rec { ]; mainProgram = "rmlint"; }; -} +}) diff --git a/pkgs/tools/misc/rmlint/scons-nix-env.patch b/pkgs/by-name/rm/rmlint/scons-nix-env.patch similarity index 100% rename from pkgs/tools/misc/rmlint/scons-nix-env.patch rename to pkgs/by-name/rm/rmlint/scons-nix-env.patch diff --git a/pkgs/by-name/sp/spoofer-gui/package.nix b/pkgs/by-name/sp/spoofer-gui/package.nix new file mode 100644 index 000000000000..a8267764abb9 --- /dev/null +++ b/pkgs/by-name/sp/spoofer-gui/package.nix @@ -0,0 +1,11 @@ +{ + spoofer, + ... +}@args: + +spoofer.override ( + { + withGUI = true; + } + // removeAttrs args [ "spoofer" ] +) diff --git a/pkgs/tools/networking/spoofer/default.nix b/pkgs/by-name/sp/spoofer/package.nix similarity index 85% rename from pkgs/tools/networking/spoofer/default.nix rename to pkgs/by-name/sp/spoofer/package.nix index f5520158c93e..c4d5f26a4d9f 100644 --- a/pkgs/tools/networking/spoofer/default.nix +++ b/pkgs/by-name/sp/spoofer/package.nix @@ -3,7 +3,7 @@ stdenv, fetchurl, pkg-config, - protobuf, + protobuf_21, openssl, libpcap, traceroute, @@ -15,19 +15,19 @@ let inherit (lib) optional; in -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "spoofer"; version = "1.4.13"; src = fetchurl { - url = "https://www.caida.org/projects/spoofer/downloads/${pname}-${version}.tar.gz"; - sha256 = "sha256-n3B2yAckbcm2kyv5QzBGh4nvKa0S/+EbGCxe0eyWG1U="; + url = "https://www.caida.org/projects/spoofer/downloads/spoofer-${finalAttrs.version}.tar.gz"; + hash = "sha256-n3B2yAckbcm2kyv5QzBGh4nvKa0S/+EbGCxe0eyWG1U="; }; nativeBuildInputs = [ pkg-config ]; buildInputs = [ openssl - protobuf + protobuf_21 libpcap traceroute ] @@ -56,4 +56,4 @@ stdenv.mkDerivation rec { license = lib.licenses.gpl3Plus; mainProgram = "spoofer-prober"; }; -} +}) diff --git a/pkgs/tools/networking/openconnect/default.nix b/pkgs/tools/networking/openconnect/default.nix deleted file mode 100644 index 80409477f9bf..000000000000 --- a/pkgs/tools/networking/openconnect/default.nix +++ /dev/null @@ -1,22 +0,0 @@ -{ - callPackage, - fetchFromGitLab, -}: -let - common = opts: callPackage (import ./common.nix opts) { }; -in -rec { - openconnect = common { - version = "9.12-unstable-2025-11-03"; - src = fetchFromGitLab { - owner = "openconnect"; - repo = "openconnect"; - rev = "0dcdff87db65daf692dc323732831391d595d98d"; - hash = "sha256-AvowUEDkXvR+QkhJbZU759fZjIqj/mO8HjP2Ka3lH1U="; - }; - }; - - openconnect_openssl = openconnect.override { - useOpenSSL = true; - }; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 86aaa2256976..d75b8c4ead12 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1722,8 +1722,6 @@ with pkgs; util-linux = util-linuxMinimal; }; - apc-temp-fetch = with python3.pkgs; callPackage ../tools/networking/apc-temp-fetch { }; - asciidoc-full = asciidoc.override { enableStandardFeatures = true; }; @@ -2542,10 +2540,6 @@ with pkgs; miniupnpd-nftables = miniupnpd.override { firewall = "nftables"; }; - mir-qualia = callPackage ../tools/text/mir-qualia { - pythonPackages = python3Packages; - }; - mitmproxy = with python3Packages; toPythonApplication mitmproxy; mjpegtoolsFull = mjpegtools.override { @@ -2883,10 +2877,6 @@ with pkgs; rmate = rubyPackages.rmate; - rmlint = callPackage ../tools/misc/rmlint { - inherit (python3Packages) sphinx; - }; - rpatool = with python3Packages; toPythonApplication rpatool; rpm = callPackage ../tools/package-management/rpm { @@ -2969,10 +2959,6 @@ with pkgs; libxml2 = libxml2Python; }; - privoxy = callPackage ../tools/networking/privoxy { - w3m = w3m-batch; - }; - tartube-yt-dlp = tartube.override { youtube-dl = yt-dlp; }; @@ -3036,9 +3022,9 @@ with pkgs; voxtype-vulkan = callPackage ../by-name/vo/voxtype/package.nix { vulkanSupport = true; }; voxtype-onnx = callPackage ../by-name/vo/voxtype/package.nix { onnxSupport = true; }; - openconnectPackages = callPackage ../tools/networking/openconnect { }; - - inherit (openconnectPackages) openconnect openconnect_openssl; + openconnectPackages = { + inherit openconnect openconnect_openssl; + }; buildWasmBindgenCli = callPackage ../build-support/wasm-bindgen-cli { }; @@ -5423,15 +5409,6 @@ with pkgs; flex = flex_2_5_35; }; - spoofer = callPackage ../tools/networking/spoofer { - protobuf = protobuf_21; - }; - - spoofer-gui = callPackage ../tools/networking/spoofer { - withGUI = true; - protobuf = protobuf_21; - }; - sqlite-utils = with python3Packages; toPythonApplication sqlite-utils; sqlmap = with python3Packages; toPythonApplication sqlmap;