diff options
Diffstat (limited to 'pkgs/tools/networking')
90 files changed, 207 insertions, 127 deletions
diff --git a/pkgs/tools/networking/6tunnel/default.nix b/pkgs/tools/networking/6tunnel/default.nix index fbdd23f754ef..50259f827321 100644 --- a/pkgs/tools/networking/6tunnel/default.nix +++ b/pkgs/tools/networking/6tunnel/default.nix @@ -15,6 +15,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Tunnelling for application that don't speak IPv6"; + mainProgram = "6tunnel"; homepage = "https://github.com/wojtekka/6tunnel"; license = licenses.gpl2; maintainers = with maintainers; [ Br1ght0ne ]; diff --git a/pkgs/tools/networking/airgeddon/default.nix b/pkgs/tools/networking/airgeddon/default.nix index cba25cae74f0..2bfe38203e8a 100644 --- a/pkgs/tools/networking/airgeddon/default.nix +++ b/pkgs/tools/networking/airgeddon/default.nix @@ -158,6 +158,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Multi-use TUI to audit wireless networks"; + mainProgram = "airgeddon"; homepage = "https://github.com/v1s1t0r1sh3r3/airgeddon"; changelog = "https://github.com/v1s1t0r1sh3r3/airgeddon/blob/v${version}/CHANGELOG.md"; license = licenses.gpl3Plus; diff --git a/pkgs/tools/networking/bwm-ng/default.nix b/pkgs/tools/networking/bwm-ng/default.nix index cfe0d4176a6f..e594e1bae778 100644 --- a/pkgs/tools/networking/bwm-ng/default.nix +++ b/pkgs/tools/networking/bwm-ng/default.nix @@ -36,6 +36,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "A small and simple console-based live network and disk io bandwidth monitor"; + mainProgram = "bwm-ng"; homepage = "http://www.gropp.org/?id=projects&sub=bwm-ng"; license = licenses.gpl2Plus; platforms = platforms.unix; diff --git a/pkgs/tools/networking/cantoolz/default.nix b/pkgs/tools/networking/cantoolz/default.nix index 1f9308b741b4..9da492340007 100644 --- a/pkgs/tools/networking/cantoolz/default.nix +++ b/pkgs/tools/networking/cantoolz/default.nix @@ -52,6 +52,7 @@ python3.pkgs.buildPythonApplication rec { meta = with lib; { description = "Black-box CAN network analysis framework"; + mainProgram = "cantoolz"; longDescription = '' CANToolz is a framework for analysing CAN networks and devices. It provides multiple modules that can be chained using CANToolz's pipe diff --git a/pkgs/tools/networking/carddav-util/default.nix b/pkgs/tools/networking/carddav-util/default.nix index e788de13df81..76e1b2656628 100644 --- a/pkgs/tools/networking/carddav-util/default.nix +++ b/pkgs/tools/networking/carddav-util/default.nix @@ -37,6 +37,7 @@ stdenv.mkDerivation { meta = with lib; { homepage = "https://github.com/ljanyst/carddav-util"; description = "A CardDAV import/export utility"; + mainProgram = "carddav-util.py"; platforms = platforms.unix; license = licenses.isc; }; diff --git a/pkgs/tools/networking/cfspeedtest/default.nix b/pkgs/tools/networking/cfspeedtest/default.nix index fcde1b580378..cb18d9ae1ed3 100644 --- a/pkgs/tools/networking/cfspeedtest/default.nix +++ b/pkgs/tools/networking/cfspeedtest/default.nix @@ -6,16 +6,16 @@ rustPlatform.buildRustPackage rec { pname = "cfspeedtest"; - version = "1.2.2"; + version = "1.2.3"; src = fetchFromGitHub { owner = "code-inflation"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-0BX9nEhSyYY/fDJHZOw0URLPIXZGRGZyXB1Tm8GX1/A="; + hash = "sha256-xg5jSA3J6QzqiItNV+poVxxXmKKPE7TsEYMGdKv4k+k="; }; - cargoHash = "sha256-GNoYLps6OaA3Ubb0nG6hQfe6r52lhnIb19n1PLCsbXs="; + cargoHash = "sha256-ZXETP60R2121xTFqsvIFziUtKhL+ODGCpG98Mlt/zlg="; meta = with lib; { description = "Unofficial CLI for speed.cloudflare.com"; diff --git a/pkgs/tools/networking/cloud-custodian/default.nix b/pkgs/tools/networking/cloud-custodian/default.nix index c5e1f7527dac..01e9d9a85722 100644 --- a/pkgs/tools/networking/cloud-custodian/default.nix +++ b/pkgs/tools/networking/cloud-custodian/default.nix @@ -41,6 +41,7 @@ buildPythonApplication rec { meta = with lib; { description = "Rules engine for cloud security, cost optimization, and governance"; + mainProgram = "custodian"; homepage = "https://cloudcustodian.io"; license = licenses.asl20; maintainers = with maintainers; [ bhipple ]; diff --git a/pkgs/tools/networking/cmst/default.nix b/pkgs/tools/networking/cmst/default.nix index e86ffeed9576..fd484798677c 100644 --- a/pkgs/tools/networking/cmst/default.nix +++ b/pkgs/tools/networking/cmst/default.nix @@ -27,6 +27,7 @@ mkDerivation rec { meta = with lib; { description = "QT GUI for Connman with system tray icon"; + mainProgram = "cmst"; homepage = "https://github.com/andrew-bibb/cmst"; maintainers = with maintainers; [ matejc romildo ]; platforms = platforms.linux; diff --git a/pkgs/tools/networking/curl-impersonate/default.nix b/pkgs/tools/networking/curl-impersonate/default.nix index 070aab8d53f2..f4373e09b052 100644 --- a/pkgs/tools/networking/curl-impersonate/default.nix +++ b/pkgs/tools/networking/curl-impersonate/default.nix @@ -11,7 +11,10 @@ , python3 , ninja , perl -, autoconf +# autoconf-2.71 fails on problematic configure: +# checking curl version... 7.84.0 +# ./configure: line 6713: syntax error near unexpected token `;;' +, autoconf269 , automake , libtool , darwin @@ -40,6 +43,10 @@ let ./curl-impersonate-0.5.2-fix-shebangs.patch ]; + # Disable blanket -Werror to fix build on `gcc-13` related to minor + # warnings on `boringssl`. + env.NIX_CFLAGS_COMPILE = "-Wno-error"; + strictDeps = true; nativeBuildInputs = lib.optionals stdenv.isDarwin [ @@ -52,7 +59,7 @@ let python3.pkgs.gyp ninja perl - autoconf + autoconf269 automake libtool unzip diff --git a/pkgs/tools/networking/dd-agent/datadog-process-agent.nix b/pkgs/tools/networking/dd-agent/datadog-process-agent.nix index 4d1334505f32..45088be9e29b 100644 --- a/pkgs/tools/networking/dd-agent/datadog-process-agent.nix +++ b/pkgs/tools/networking/dd-agent/datadog-process-agent.nix @@ -4,6 +4,7 @@ datadog-agent.overrideAttrs (attrs: { meta = with lib; attrs.meta // { description = "Live process collector for the DataDog Agent v7"; + mainProgram = "process-agent"; maintainers = with maintainers; [ domenkozar ]; }; subPackages = [ "cmd/process-agent" ]; diff --git a/pkgs/tools/networking/ddns-go/default.nix b/pkgs/tools/networking/ddns-go/default.nix index 720d6757da0a..c2b635c5e336 100644 --- a/pkgs/tools/networking/ddns-go/default.nix +++ b/pkgs/tools/networking/ddns-go/default.nix @@ -5,13 +5,13 @@ buildGoModule rec { pname = "ddns-go"; - version = "6.2.1"; + version = "6.2.2"; src = fetchFromGitHub { owner = "jeessy2"; repo = pname; rev = "v${version}"; - hash = "sha256-KfSOhUmV81Z8qp8MrqwJLtQ5SZgiEPbdkA1NacqpNRc="; + hash = "sha256-MwDwYoX1OT4TKMD2g+RBAlGfs8cz42dEFnV2b8Xzup8="; }; vendorHash = "sha256-zUqsuph0fn1x4dwvBY0W0+S6SzS086SHya2ViNpDXGU="; diff --git a/pkgs/tools/networking/decode-spam-headers/default.nix b/pkgs/tools/networking/decode-spam-headers/default.nix index 8f18658b52c5..0294a45be78b 100644 --- a/pkgs/tools/networking/decode-spam-headers/default.nix +++ b/pkgs/tools/networking/decode-spam-headers/default.nix @@ -37,6 +37,7 @@ python3Packages.buildPythonApplication rec { meta = with lib; { homepage = "https://github.com/mgeeky/decode-spam-headers/"; description = "A script that helps you understand why your E-Mail ended up in Spam"; + mainProgram = "decode-spam-headers"; longDescription = '' Whether you are trying to understand why a specific e-mail ended up in SPAM/Junk for your daily Administrative duties or for your Red-Team diff --git a/pkgs/tools/networking/discord-sh/default.nix b/pkgs/tools/networking/discord-sh/default.nix index 50e84034428d..cb6821ab4bc8 100644 --- a/pkgs/tools/networking/discord-sh/default.nix +++ b/pkgs/tools/networking/discord-sh/default.nix @@ -42,6 +42,7 @@ stdenvNoCC.mkDerivation rec { meta = with lib; { description = "Write-only command-line Discord webhook integration written in 100% Bash script"; + mainProgram = "discord.sh"; homepage = "https://github.com/ChaoticWeg/discord.sh"; license = licenses.gpl3; platforms = platforms.unix; diff --git a/pkgs/tools/networking/dnschef/default.nix b/pkgs/tools/networking/dnschef/default.nix index 5dbb8980f063..2907a0f578e5 100644 --- a/pkgs/tools/networking/dnschef/default.nix +++ b/pkgs/tools/networking/dnschef/default.nix @@ -21,6 +21,7 @@ buildPythonApplication rec { meta = with lib; { homepage = "https://github.com/iphelix/dnschef"; description = "Highly configurable DNS proxy for penetration testers and malware analysts"; + mainProgram = "dnschef"; license = licenses.bsd3; maintainers = [ maintainers.gfrascadorio ]; }; diff --git a/pkgs/tools/networking/dnstwist/default.nix b/pkgs/tools/networking/dnstwist/default.nix index 1d075a75de24..9165c550eaec 100644 --- a/pkgs/tools/networking/dnstwist/default.nix +++ b/pkgs/tools/networking/dnstwist/default.nix @@ -37,6 +37,7 @@ python3.pkgs.buildPythonApplication rec { meta = with lib; { description = "Domain name permutation engine for detecting homograph phishing attacks"; + mainProgram = "dnstwist"; homepage = "https://github.com/elceef/dnstwist"; changelog = "https://github.com/elceef/dnstwist/releases/tag/${version}"; license = with licenses; [ gpl3Only ]; diff --git a/pkgs/tools/networking/dnsviz/default.nix b/pkgs/tools/networking/dnsviz/default.nix index aebf7e3cd14f..b275734f8889 100644 --- a/pkgs/tools/networking/dnsviz/default.nix +++ b/pkgs/tools/networking/dnsviz/default.nix @@ -39,6 +39,7 @@ buildPythonApplication rec { meta = with lib; { description = "Tool suite for analyzing and visualizing DNS and DNSSEC behavior"; + mainProgram = "dnsviz"; longDescription = '' DNSViz is a tool suite for analysis and visualization of Domain Name System (DNS) behavior, including its security extensions (DNSSEC). diff --git a/pkgs/tools/networking/evillimiter/default.nix b/pkgs/tools/networking/evillimiter/default.nix index 20cc10728d60..a96151a3355f 100644 --- a/pkgs/tools/networking/evillimiter/default.nix +++ b/pkgs/tools/networking/evillimiter/default.nix @@ -40,6 +40,7 @@ buildPythonApplication rec { meta = with lib; { description = "Tool that monitors, analyzes and limits the bandwidth"; + mainProgram = "evillimiter"; longDescription = '' A tool to monitor, analyze and limit the bandwidth (upload/download) of devices on your local network without physical or administrative access. diff --git a/pkgs/tools/networking/flannel/default.nix b/pkgs/tools/networking/flannel/default.nix index 95dda1485ed6..03cf372e2f07 100644 --- a/pkgs/tools/networking/flannel/default.nix +++ b/pkgs/tools/networking/flannel/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "flannel"; - version = "0.24.3"; + version = "0.24.4"; rev = "v${version}"; - vendorHash = "sha256-YCedMUxcME0NFEtYhLA4G1WZU8SMBvDOBZ/U7X7Tx3k="; + vendorHash = "sha256-meBo4KsM0qcpW/FIF32NG9MYWK945EaBpzopkmT1WMI="; src = fetchFromGitHub { inherit rev; owner = "flannel-io"; repo = "flannel"; - sha256 = "sha256-f6jHK0h0NVgHaWT6l+WS9P9WXVLzxxujdjXND01lLNM="; + sha256 = "sha256-Qw1TAkToKgDt2/GHqlsM5vyTslI0dutJlwTA5xKqbFo="; }; ldflags = [ "-X github.com/flannel-io/flannel/pkg/version.Version=${rev}" ]; diff --git a/pkgs/tools/networking/flannel/plugin.nix b/pkgs/tools/networking/flannel/plugin.nix index db8b89fa0bfe..0ff8e600ff44 100644 --- a/pkgs/tools/networking/flannel/plugin.nix +++ b/pkgs/tools/networking/flannel/plugin.nix @@ -35,6 +35,7 @@ buildGoModule rec { meta = with lib; { description = "flannel CNI plugin"; + mainProgram = "flannel"; homepage = "https://github.com/flannel-io/cni-plugin/"; license = licenses.asl20; platforms = platforms.linux; diff --git a/pkgs/tools/networking/gandi-cli/default.nix b/pkgs/tools/networking/gandi-cli/default.nix index d7394ac94d88..8f703320f253 100644 --- a/pkgs/tools/networking/gandi-cli/default.nix +++ b/pkgs/tools/networking/gandi-cli/default.nix @@ -31,6 +31,7 @@ buildPythonApplication rec { meta = with lib; { description = "Command-line interface to the public Gandi.net API"; + mainProgram = "gandi"; homepage = "https://cli.gandi.net/"; license = licenses.gpl3Plus; maintainers = with maintainers; [ ]; diff --git a/pkgs/tools/networking/gmrender-resurrect/default.nix b/pkgs/tools/networking/gmrender-resurrect/default.nix index 70ad352a6aad..70c07b4eac9b 100644 --- a/pkgs/tools/networking/gmrender-resurrect/default.nix +++ b/pkgs/tools/networking/gmrender-resurrect/default.nix @@ -28,6 +28,7 @@ in meta = with lib; { description = "Resource efficient UPnP/DLNA renderer, optimal for Raspberry Pi, CuBox or a general MediaServer"; + mainProgram = "gmediarender"; homepage = "https://github.com/hzeller/gmrender-resurrect"; license = licenses.gpl2Plus; platforms = platforms.linux; diff --git a/pkgs/tools/networking/gnirehtet/default.nix b/pkgs/tools/networking/gnirehtet/default.nix index be511c756587..2281822d2e77 100644 --- a/pkgs/tools/networking/gnirehtet/default.nix +++ b/pkgs/tools/networking/gnirehtet/default.nix @@ -49,6 +49,7 @@ rustPlatform.buildRustPackage rec { meta = with lib; { description = "Reverse tethering over adb for Android"; + mainProgram = "gnirehtet"; longDescription = '' This project provides reverse tethering over adb for Android: it allows devices to use the internet connection of the computer they are plugged on. It does not require any root access (neither on the device nor on the computer). diff --git a/pkgs/tools/networking/godns/default.nix b/pkgs/tools/networking/godns/default.nix deleted file mode 100644 index a41d1993270b..000000000000 --- a/pkgs/tools/networking/godns/default.nix +++ /dev/null @@ -1,39 +0,0 @@ -{ lib -, buildGoModule -, fetchFromGitHub -, nix-update-script -}: - -buildGoModule rec { - pname = "godns"; - version = "3.0.7"; - - src = fetchFromGitHub { - owner = "TimothyYe"; - repo = "godns"; - rev = "refs/tags/v${version}"; - hash = "sha256-7zgvrEVt8xg54NijcqnXoZcXetzOu9h3Ucw7w03YagU="; - }; - - vendorHash = "sha256-veDrGB6gjUa8G/UyKzEgH2ItGGEPlXDePahq2XP2nAo="; - - # Some tests require internet access, broken in sandbox - doCheck = false; - - ldflags = [ - "-s" - "-w" - "-X main.Version=${version}" - ]; - - passthru.updateScript = nix-update-script { }; - - meta = with lib; { - description = "A dynamic DNS client tool supports AliDNS, Cloudflare, Google Domains, DNSPod, HE.net & DuckDNS & DreamHost, etc"; - homepage = "https://github.com/TimothyYe/godns"; - changelog = "https://github.com/TimothyYe/godns/releases/tag/v${version}"; - license = licenses.asl20; - maintainers = with maintainers; [ yinfeng ]; - mainProgram = "godns"; - }; -} diff --git a/pkgs/tools/networking/gost/default.nix b/pkgs/tools/networking/gost/default.nix index 4c31ce88cbf5..2921fab6f2a9 100644 --- a/pkgs/tools/networking/gost/default.nix +++ b/pkgs/tools/networking/gost/default.nix @@ -2,24 +2,24 @@ buildGoModule rec { pname = "gost"; - version = "2.11.5"; + version = "2.11.5-unstable-2024-02-02"; src = fetchFromGitHub { owner = "ginuerzh"; repo = "gost"; - rev = "v${version}"; - sha256 = "sha256-UBjrWeBw9+qKQ/+1T1W/3e0vrigp540URIyM2d9iCE8="; + rev = "fd57e80709aba9581757b1cd63b7d8f75e2385d2"; + sha256 = "sha256-GkXsiUcH5hppgkkt4ddVMLm5riUDORVhjWBGHZXti5A="; }; patches = [ - # Add go1.20 support. Remove with the next release. + # Bump quic-go to v0.41.0 for go 1.22 compatibility. (fetchpatch { - url = "https://github.com/ginuerzh/gost/commit/0f7376bd10c913c7e6b1e7e02dd5fd7769975d78.patch"; - hash = "sha256-pQNCvl7/huNrkM3+XHkGnvLYCzdjbMV6nef1KcMnKEw="; + url = "https://github.com/ginuerzh/gost/pull/1016/commits/c2e3f7e493bbb6ff1bc348f36e1a148d9d0c16ad.patch"; + hash = "sha256-9OtuPIzzCymMAVbrDuhhPcxcac69gjAUm4ykXbH/pbo="; }) ]; - vendorHash = "sha256-wAdNfhSPj9JUcI6Gcja6nRy68bVhV8B4PARR0WS9rjQ="; + vendorHash = "sha256-mq95eHyW8XkqyLApSqVB3bv5VFSu6FuPap/mTQj8a9M="; postPatch = '' substituteInPlace http2_test.go \ diff --git a/pkgs/tools/networking/gp-saml-gui/default.nix b/pkgs/tools/networking/gp-saml-gui/default.nix index 8a7ad11a2fe7..348d47b667f6 100644 --- a/pkgs/tools/networking/gp-saml-gui/default.nix +++ b/pkgs/tools/networking/gp-saml-gui/default.nix @@ -39,6 +39,7 @@ buildPythonPackage rec { meta = with lib; { description = "Interactively authenticate to GlobalProtect VPNs that require SAML"; + mainProgram = "gp-saml-gui"; homepage = "https://github.com/dlenski/gp-saml-gui"; license = licenses.gpl3Only; maintainers = [ maintainers.pallix ]; diff --git a/pkgs/tools/networking/haguichi/default.nix b/pkgs/tools/networking/haguichi/default.nix index fd228c141b5d..a921884dda06 100644 --- a/pkgs/tools/networking/haguichi/default.nix +++ b/pkgs/tools/networking/haguichi/default.nix @@ -48,6 +48,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Graphical frontend for Hamachi on Linux"; + mainProgram = "haguichi"; homepage = "https://haguichi.net/"; license = licenses.gpl3Plus; platforms = platforms.linux; diff --git a/pkgs/tools/networking/hblock/default.nix b/pkgs/tools/networking/hblock/default.nix index 19e7dde77c85..6615c27fe629 100644 --- a/pkgs/tools/networking/hblock/default.nix +++ b/pkgs/tools/networking/hblock/default.nix @@ -32,6 +32,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Improve your security and privacy by blocking ads, tracking and malware domains"; + mainProgram = "hblock"; homepage = "https://github.com/hectorm/hblock"; license = licenses.mit; maintainers = with maintainers; [ alanpearce ]; diff --git a/pkgs/tools/networking/http-prompt/default.nix b/pkgs/tools/networking/http-prompt/default.nix index 8fce232cdb17..02bb42800abf 100644 --- a/pkgs/tools/networking/http-prompt/default.nix +++ b/pkgs/tools/networking/http-prompt/default.nix @@ -27,6 +27,7 @@ python3Packages.buildPythonApplication rec { meta = with lib; { description = "An interactive command-line HTTP client featuring autocomplete and syntax highlighting"; + mainProgram = "http-prompt"; homepage = "https://github.com/eliangcs/http-prompt"; license = licenses.mit; maintainers = with maintainers; [ matthiasbeyer ]; diff --git a/pkgs/tools/networking/httplz/default.nix b/pkgs/tools/networking/httplz/default.nix index 2a0f665f863a..c85c763635d3 100644 --- a/pkgs/tools/networking/httplz/default.nix +++ b/pkgs/tools/networking/httplz/default.nix @@ -45,6 +45,7 @@ rustPlatform.buildRustPackage rec { meta = with lib; { description = "A basic http server for hosting a folder fast and simply"; + mainProgram = "httplz"; homepage = "https://github.com/thecoshman/http"; changelog = "https://github.com/thecoshman/http/releases/tag/v${version}"; license = licenses.mit; diff --git a/pkgs/tools/networking/httpstat/default.nix b/pkgs/tools/networking/httpstat/default.nix index be4a8f2a168d..971c973ada21 100644 --- a/pkgs/tools/networking/httpstat/default.nix +++ b/pkgs/tools/networking/httpstat/default.nix @@ -17,6 +17,7 @@ python3Packages.buildPythonApplication rec { meta = { description = "curl statistics made simple"; + mainProgram = "httpstat"; homepage = "https://github.com/reorx/httpstat"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ nequissimus ]; diff --git a/pkgs/tools/networking/ifwifi/default.nix b/pkgs/tools/networking/ifwifi/default.nix index f04c3369bacf..8777df72b5e1 100644 --- a/pkgs/tools/networking/ifwifi/default.nix +++ b/pkgs/tools/networking/ifwifi/default.nix @@ -31,6 +31,7 @@ rustPlatform.buildRustPackage rec { meta = with lib; { description = "A simple wrapper over nmcli using wifiscanner made in rust"; + mainProgram = "ifwifi"; longDescription = '' In the author's words: diff --git a/pkgs/tools/networking/imapsync/default.nix b/pkgs/tools/networking/imapsync/default.nix index 0fb519ad5af7..4c2b4a36e064 100644 --- a/pkgs/tools/networking/imapsync/default.nix +++ b/pkgs/tools/networking/imapsync/default.nix @@ -64,6 +64,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Mail folder synchronizer between IMAP servers"; + mainProgram = "imapsync"; homepage = "https://imapsync.lamiral.info/"; license = licenses.nlpl; maintainers = with maintainers; [ pSub ]; diff --git a/pkgs/tools/networking/iperf3d/default.nix b/pkgs/tools/networking/iperf3d/default.nix index 1edcaf86ed2e..eb1fa052131b 100644 --- a/pkgs/tools/networking/iperf3d/default.nix +++ b/pkgs/tools/networking/iperf3d/default.nix @@ -21,6 +21,7 @@ rustPlatform.buildRustPackage rec { meta = with lib; { description = "A iperf3 client and server wrapper for dynamic server ports"; + mainProgram = "iperf3d"; homepage = "https://github.com/wobcom/iperf3d"; license = licenses.mit; maintainers = with maintainers; [ netali ] ++ teams.wdz.members; diff --git a/pkgs/tools/networking/ipfetch/default.nix b/pkgs/tools/networking/ipfetch/default.nix index f264deaa8a35..38d1e309bc97 100644 --- a/pkgs/tools/networking/ipfetch/default.nix +++ b/pkgs/tools/networking/ipfetch/default.nix @@ -31,6 +31,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Neofetch but for ip addresses"; + mainProgram = "ipfetch"; homepage = "https://github.com/trakBan/ipfetch"; license = licenses.gpl3Only; platforms = platforms.all; diff --git a/pkgs/tools/networking/ipgrep/default.nix b/pkgs/tools/networking/ipgrep/default.nix index d1f5316c27b4..04f39f8d28fb 100644 --- a/pkgs/tools/networking/ipgrep/default.nix +++ b/pkgs/tools/networking/ipgrep/default.nix @@ -27,6 +27,7 @@ python3Packages.buildPythonApplication rec { meta = with lib; { description = "Extract, defang, resolve names and IPs from text"; + mainProgram = "ipgrep.py"; longDescription = '' ipgrep extracts possibly obfuscated host names and IP addresses from text, resolves host names, and prints them, sorted by ASN. diff --git a/pkgs/tools/networking/kea/default.nix b/pkgs/tools/networking/kea/default.nix index 574afb68e237..5bdb7bd7607b 100644 --- a/pkgs/tools/networking/kea/default.nix +++ b/pkgs/tools/networking/kea/default.nix @@ -87,7 +87,6 @@ stdenv.mkDerivation rec { passthru.tests = { kea = nixosTests.kea; prefix-delegation = nixosTests.systemd-networkd-ipv6-prefix-delegation; - prometheus-exporter = nixosTests.prometheus-exporters.kea; networking-scripted = lib.recurseIntoAttrs { inherit (nixosTests.networking.scripted) dhcpDefault dhcpSimple dhcpOneIf; }; networking-networkd = lib.recurseIntoAttrs { inherit (nixosTests.networking.networkd) dhcpDefault dhcpSimple dhcpOneIf; }; }; diff --git a/pkgs/tools/networking/labctl/default.nix b/pkgs/tools/networking/labctl/default.nix index 00cb63b31d1d..921bf7c4e3bf 100644 --- a/pkgs/tools/networking/labctl/default.nix +++ b/pkgs/tools/networking/labctl/default.nix @@ -1,6 +1,7 @@ { lib , buildGoModule , fetchFromGitHub +, fetchpatch , installShellFiles }: @@ -15,9 +16,18 @@ buildGoModule rec { hash = "sha256-84t7qhLafNyPLgHmFQUsizEn6Us44dDTercGEm9lup4="; }; + patches = [ + # Fix build failure with Go 1.21 by updating go4.org/unsafe/assume-no-moving-gc + # See https://github.com/labctl/labctl/pull/4 + (fetchpatch { + url = "https://github.com/labctl/labctl/commit/615d05e94b991362beddce71c7ee34eae7fc93ff.patch"; + hash = "sha256-4JrXSsg8rfuH6i8XyLd/qO6AibkRMDBIpfT8r1yS75c="; + }) + ]; + nativeBuildInputs = [ installShellFiles ]; - vendorHash = "sha256-vJ9aTMVwKrqjckdfCMvheTSG+gEtMLLQuBCz8Wc5blE="; + vendorHash = "sha256-Ycr/IZckIFysS9Goes58hhgh96UMRHjYWfWlQU23mXk="; ldflags = [ "-X=github.com/labctl/labctl/app.version=${version}" diff --git a/pkgs/tools/networking/linkchecker/default.nix b/pkgs/tools/networking/linkchecker/default.nix index 018da51f7701..2adf2c8f82d1 100644 --- a/pkgs/tools/networking/linkchecker/default.nix +++ b/pkgs/tools/networking/linkchecker/default.nix @@ -54,6 +54,7 @@ python3.pkgs.buildPythonApplication rec { meta = with lib; { description = "Check websites for broken links"; + mainProgram = "linkchecker"; homepage = "https://linkcheck.github.io/linkchecker/"; changelog = "https://github.com/linkchecker/linkchecker/releases/tag/v${version}"; license = licenses.gpl2Plus; diff --git a/pkgs/tools/networking/mbidled/default.nix b/pkgs/tools/networking/mbidled/default.nix index 9e07d1afbe21..d37862cf8eba 100644 --- a/pkgs/tools/networking/mbidled/default.nix +++ b/pkgs/tools/networking/mbidled/default.nix @@ -6,15 +6,16 @@ , libev , openssl }: + stdenv.mkDerivation { pname = "mbidled"; - version = "unstable-2022-10-30"; + version = "unstable-2023-09-30"; src = fetchFromGitHub { owner = "zsugabubus"; repo = "mbidled"; - rev = "b06152f015a470876b042e538804ebb1ac247c09"; - sha256 = "sha256-eHm10onJ7v6fhvJiGXZhuN3c9cj+NoVIW2XQb2fdmuA="; + rev = "c724a34cc01b829b19a60655fc1652a378db7f27"; + sha256 = "sha256-XQXLPjEEesBd+bATsKE2nvoNcuqtRA1JIsV7306CssA="; }; preConfigure = '' @@ -22,11 +23,13 @@ stdenv.mkDerivation { ''; nativeBuildInputs = [ - meson ninja + meson + ninja ]; buildInputs = [ - libev openssl + libev + openssl ]; meta = with lib; { diff --git a/pkgs/tools/networking/modemmanager/default.nix b/pkgs/tools/networking/modemmanager/default.nix index 6c4356d04fd4..64d61f0e323c 100644 --- a/pkgs/tools/networking/modemmanager/default.nix +++ b/pkgs/tools/networking/modemmanager/default.nix @@ -19,6 +19,7 @@ , vala , gobject-introspection , dbus +, bash }: stdenv.mkDerivation rec { @@ -39,6 +40,8 @@ stdenv.mkDerivation rec { ./no-dummy-dirs-in-sysconfdir.patch ]; + strictDeps = true; + nativeBuildInputs = [ meson ninja @@ -61,6 +64,7 @@ stdenv.mkDerivation rec { systemd bash-completion dbus + bash # shebangs in share/ModemManager/fcc-unlock.available.d/ ]; nativeInstallCheckInputs = [ diff --git a/pkgs/tools/networking/moodle-dl/default.nix b/pkgs/tools/networking/moodle-dl/default.nix index f819fe819284..76c3e4b1a20a 100644 --- a/pkgs/tools/networking/moodle-dl/default.nix +++ b/pkgs/tools/networking/moodle-dl/default.nix @@ -26,6 +26,7 @@ python3Packages.buildPythonApplication rec { homepage = "https://github.com/C0D3D3V/Moodle-Downloader-2"; maintainers = [ maintainers.kmein ]; description = "A Moodle downloader that downloads course content fast from Moodle"; + mainProgram = "moodle-dl"; license = licenses.gpl3Plus; }; } diff --git a/pkgs/tools/networking/mozillavpn/default.nix b/pkgs/tools/networking/mozillavpn/default.nix index 194ac57d2cbf..4974c873894c 100644 --- a/pkgs/tools/networking/mozillavpn/default.nix +++ b/pkgs/tools/networking/mozillavpn/default.nix @@ -147,6 +147,7 @@ stdenv.mkDerivation { meta = { description = "Client for the Mozilla VPN service"; + mainProgram = "mozillavpn"; homepage = "https://vpn.mozilla.org/"; license = lib.licenses.mpl20; maintainers = with lib.maintainers; [ andersk ]; diff --git a/pkgs/tools/networking/muffet/default.nix b/pkgs/tools/networking/muffet/default.nix index a9fe4398afd7..3914c4af581c 100644 --- a/pkgs/tools/networking/muffet/default.nix +++ b/pkgs/tools/networking/muffet/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "muffet"; - version = "2.10.0"; + version = "2.10.1"; src = fetchFromGitHub { owner = "raviqqe"; repo = "muffet"; rev = "v${version}"; - hash = "sha256-kwEHabQYAaxC8nKewc5XHZnSvUSEQRw7qg0jtJoOw9g="; + hash = "sha256-/LkXFY7ThPuq3RvW0NLZNRjk9kblFiztG98sTfhQuGM="; }; - vendorHash = "sha256-GNwyQHqyfuzKnNAv5gpZFmhSq+jIHdfeceLSD9UphdA="; + vendorHash = "sha256-3kURSzwzM4QPCbb8C1vRb6Mr46XKNyZF0sAze5Z9xsg="; meta = with lib; { description = "A website link checker which scrapes and inspects all pages in a website recursively"; diff --git a/pkgs/tools/networking/mutt-ics/default.nix b/pkgs/tools/networking/mutt-ics/default.nix index f56e688b4110..a8f3ca9d2ae6 100644 --- a/pkgs/tools/networking/mutt-ics/default.nix +++ b/pkgs/tools/networking/mutt-ics/default.nix @@ -15,6 +15,7 @@ with python3.pkgs; buildPythonApplication rec { meta = with lib; { homepage = "https://github.com/dmedvinsky/mutt-ics"; description = "A tool to show calendar event details in Mutt"; + mainProgram = "mutt-ics"; license = licenses.mit; maintainers = with maintainers; [ mh182 ]; }; diff --git a/pkgs/tools/networking/narrowlink/default.nix b/pkgs/tools/networking/narrowlink/default.nix index 226dd15b1c9e..9000ad282cbf 100644 --- a/pkgs/tools/networking/narrowlink/default.nix +++ b/pkgs/tools/networking/narrowlink/default.nix @@ -9,16 +9,16 @@ rustPlatform.buildRustPackage rec { pname = "narrowlink"; - version = "0.2.4"; + version = "0.2.5"; src = fetchFromGitHub { owner = "narrowlink"; repo = "narrowlink"; rev = version; - hash = "sha256-priVl44VSxV+rCy/5H704I3CbNXDMP2BUguknl5Bguk="; + hash = "sha256-Ro5SfcuKy0JqSwh2HbYisE9I4BTP4o7qjEA3fU3pAuw="; }; - cargoHash = "sha256-q15T0/2Xf8L6ZEphIjZzzcqcnkWMbv3zvBAd/Ofvnfg="; + cargoHash = "sha256-XHbgwqvzfnpbu2h8rbI8XsL+og0gkjQzhHzME6crmZg="; nativeBuildInputs = [ rustPlatform.bindgenHook diff --git a/pkgs/tools/networking/networkd-dispatcher/default.nix b/pkgs/tools/networking/networkd-dispatcher/default.nix index 8f9cece27169..a2a03d1f8404 100644 --- a/pkgs/tools/networking/networkd-dispatcher/default.nix +++ b/pkgs/tools/networking/networkd-dispatcher/default.nix @@ -79,6 +79,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Dispatcher service for systemd-networkd connection status changes"; + mainProgram = "networkd-dispatcher"; homepage = "https://gitlab.com/craftyguy/networkd-dispatcher"; license = licenses.gpl3Only; platforms = platforms.linux; diff --git a/pkgs/tools/networking/networkd-notify/default.nix b/pkgs/tools/networking/networkd-notify/default.nix index b80a7d450966..8a58b894d9bd 100644 --- a/pkgs/tools/networking/networkd-notify/default.nix +++ b/pkgs/tools/networking/networkd-notify/default.nix @@ -41,6 +41,7 @@ buildPythonApplication rec { meta = with lib; { description = "Desktop notification integration for systemd-networkd"; + mainProgram = "networkd-notify"; homepage = "https://gitlab.com/wavexx/networkd-notify"; maintainers = with maintainers; [ danc86 ]; license = licenses.gpl3; diff --git a/pkgs/tools/networking/networkmanager/default.nix b/pkgs/tools/networking/networkmanager/default.nix index 5490977df12d..c1e14dcfecb1 100644 --- a/pkgs/tools/networking/networkmanager/default.nix +++ b/pkgs/tools/networking/networkmanager/default.nix @@ -57,11 +57,11 @@ let in stdenv.mkDerivation rec { pname = "networkmanager"; - version = "1.44.2"; + version = "1.46.0"; src = fetchurl { url = "mirror://gnome/sources/NetworkManager/${lib.versions.majorMinor version}/NetworkManager-${version}.tar.xz"; - sha256 = "sha256-S1i/OsV+LO+1ZS79CUXrC0vDamPZKmGrRx2LssmkIOE="; + hash = "sha256-ciZJ4lNiaTszQ3FHOAKnKbDsnuKDN1CWkF+GiAjnQGg="; }; outputs = [ "out" "dev" "devdoc" "man" "doc" ]; diff --git a/pkgs/tools/networking/networkmanager/dmenu/default.nix b/pkgs/tools/networking/networkmanager/dmenu/default.nix index d64985adbce2..56c651b68ab2 100644 --- a/pkgs/tools/networking/networkmanager/dmenu/default.nix +++ b/pkgs/tools/networking/networkmanager/dmenu/default.nix @@ -36,6 +36,7 @@ in stdenv.mkDerivation rec { meta = with lib; { description = "Small script to manage NetworkManager connections with dmenu instead of nm-applet"; + mainProgram = "networkmanager_dmenu"; homepage = "https://github.com/firecat53/networkmanager-dmenu"; license = lib.licenses.mit; maintainers = [ lib.maintainers.jensbin ]; diff --git a/pkgs/tools/networking/networkmanager/fix-install-paths.patch b/pkgs/tools/networking/networkmanager/fix-install-paths.patch index 2b2af0b2ad46..6b5f58194c58 100644 --- a/pkgs/tools/networking/networkmanager/fix-install-paths.patch +++ b/pkgs/tools/networking/networkmanager/fix-install-paths.patch @@ -1,8 +1,8 @@ diff --git a/meson.build b/meson.build -index f71c9fd4aa..deddf28816 100644 +index 61c025b9d7..d2ae60da34 100644 --- a/meson.build +++ b/meson.build -@@ -1022,9 +1022,9 @@ meson.add_install_script( +@@ -1025,9 +1025,9 @@ meson.add_install_script( join_paths('tools', 'meson-post-install.sh'), nm_datadir, nm_bindir, diff --git a/pkgs/tools/networking/networkmanager/fix-paths.patch b/pkgs/tools/networking/networkmanager/fix-paths.patch index 6c97b672e679..2a1cc23e3079 100644 --- a/pkgs/tools/networking/networkmanager/fix-paths.patch +++ b/pkgs/tools/networking/networkmanager/fix-paths.patch @@ -24,10 +24,10 @@ index f09ae86ceb..b2ecb405ef 100644 ExecStart=@sbindir@/NetworkManager --no-daemon Restart=on-failure diff --git a/src/core/devices/nm-device.c b/src/core/devices/nm-device.c -index 2038e2f205..90bf9fa28b 100644 +index a9e8c08508..875d6cc2cd 100644 --- a/src/core/devices/nm-device.c +++ b/src/core/devices/nm-device.c -@@ -14275,14 +14275,14 @@ nm_device_start_ip_check(NMDevice *self) +@@ -14645,14 +14645,14 @@ nm_device_start_ip_check(NMDevice *self) gw = nm_l3_config_data_get_best_default_route(l3cd, AF_INET); if (gw) { nm_inet4_ntop(NMP_OBJECT_CAST_IP4_ROUTE(gw)->gateway, buf); @@ -45,25 +45,25 @@ index 2038e2f205..90bf9fa28b 100644 } } diff --git a/src/libnm-client-impl/meson.build b/src/libnm-client-impl/meson.build -index fb879dca47..13cc2867e1 100644 +index 79ac95598a..83f7ab1373 100644 --- a/src/libnm-client-impl/meson.build +++ b/src/libnm-client-impl/meson.build -@@ -173,7 +173,6 @@ if enable_introspection - input: libnm_core_settings_sources, - output: 'nm-propery-infos-' + info + '.xml', +@@ -191,7 +191,6 @@ if enable_introspection + input: [gen_infos_cmd, libnm_gir[0]] + libnm_core_settings_sources, + output: 'nm-property-infos-' + name + '.xml', command: [ - python.path(), - join_paths(meson.source_root(), 'tools', 'generate-docs-nm-property-infos.py'), - info, + gen_infos_cmd, + name, '@OUTPUT@', -@@ -230,7 +229,6 @@ if enable_introspection - 'env', - 'GI_TYPELIB_PATH=' + gi_typelib_path, - 'LD_LIBRARY_PATH=' + ld_library_path, -- python.path(), - join_paths(meson.source_root(), 'tools', 'generate-docs-nm-settings-docs-gir.py'), - '--lib-path', meson.current_build_dir(), - '--gir', '@INPUT@', +@@ -207,7 +206,6 @@ if enable_introspection + 'env', + 'GI_TYPELIB_PATH=' + gi_typelib_path, + 'LD_LIBRARY_PATH=' + ld_library_path, +- python.path(), + gen_gir_cmd, + '--lib-path', meson.current_build_dir(), + '--gir', libnm_gir[0], diff --git a/src/libnmc-base/nm-vpn-helpers.c b/src/libnmc-base/nm-vpn-helpers.c index cbe76f5f1c..8515f94994 100644 --- a/src/libnmc-base/nm-vpn-helpers.c @@ -102,25 +102,25 @@ index cbe76f5f1c..8515f94994 100644 oc_argv[oc_argc++] = path; oc_argv[oc_argc++] = "--authenticate"; diff --git a/src/libnmc-setting/meson.build b/src/libnmc-setting/meson.build -index cf8a21fc80..61d8e140e2 100644 +index 7fb460dc33..790a2b75fc 100644 --- a/src/libnmc-setting/meson.build +++ b/src/libnmc-setting/meson.build -@@ -7,7 +7,6 @@ if enable_docs - input: [nm_settings_docs_xml_gir, nm_property_infos_xml['nmcli']], +@@ -9,7 +9,6 @@ if enable_docs + input: [merge_cmd, nm_settings_docs_xml_gir['nmcli'], nm_property_infos_xml['nmcli']], output: 'settings-docs-input.xml', command: [ - python.path(), - join_paths(meson.source_root(), 'tools', 'generate-docs-nm-settings-docs-merge.py'), + merge_cmd, '@OUTPUT@', nm_property_infos_xml['nmcli'], -@@ -20,7 +19,6 @@ if enable_docs - input: settings_docs_input_xml, +@@ -23,7 +22,6 @@ if enable_docs + input: [gen_cmd, settings_docs_input_xml], output: 'settings-docs.h', command: [ - python.path(), - join_paths(meson.source_root(), 'tools', 'generate-docs-settings-docs.py'), + gen_cmd, '--output', '@OUTPUT@', - '--xml', '@INPUT@' + '--xml', settings_docs_input_xml diff --git a/src/tests/client/meson.build b/src/tests/client/meson.build index 8c36e40559..cfb6649a21 100644 --- a/src/tests/client/meson.build diff --git a/pkgs/tools/networking/networkmanager/tray.nix b/pkgs/tools/networking/networkmanager/tray.nix index 69b1e3023b04..01725b1fb381 100644 --- a/pkgs/tools/networking/networkmanager/tray.nix +++ b/pkgs/tools/networking/networkmanager/tray.nix @@ -23,6 +23,7 @@ mkDerivation rec { meta = with lib; { description = "Simple Network Manager frontend written in Qt"; + mainProgram = "nm-tray"; homepage = "https://github.com/palinek/nm-tray"; license = licenses.gpl2Plus; maintainers = with maintainers; [ dtzWill ]; diff --git a/pkgs/tools/networking/nikto/default.nix b/pkgs/tools/networking/nikto/default.nix index df03cc8c3ce7..098171de09df 100644 --- a/pkgs/tools/networking/nikto/default.nix +++ b/pkgs/tools/networking/nikto/default.nix @@ -57,6 +57,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Web server scanner"; + mainProgram = "nikto"; license = licenses.gpl2Plus; homepage = "https://cirt.net/Nikto2"; changelog = "https://github.com/sullo/nikto/releases/tag/${version}"; diff --git a/pkgs/tools/networking/norouter/default.nix b/pkgs/tools/networking/norouter/default.nix index 3513cb0cdfbc..efc50fbad2ad 100644 --- a/pkgs/tools/networking/norouter/default.nix +++ b/pkgs/tools/networking/norouter/default.nix @@ -27,6 +27,9 @@ buildGoModule rec { ''; meta = with lib; { + # Doesn't build with Go >=1.21 + # https://github.com/norouter/norouter/issues/165 + broken = true; description = "Tool to handle unprivileged networking by using multiple loopback addresses"; homepage = "https://github.com/norouter/norouter"; license = licenses.asl20; diff --git a/pkgs/tools/networking/nss-mdns/default.nix b/pkgs/tools/networking/nss-mdns/default.nix index f0c47fe945e1..eb231f0ce036 100644 --- a/pkgs/tools/networking/nss-mdns/default.nix +++ b/pkgs/tools/networking/nss-mdns/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { version = "0.15.1"; src = fetchFromGitHub { - owner = "lathiat"; + owner = "avahi"; repo = "nss-mdns"; rev = "v${version}"; hash = "sha256-iRaf9/gu9VkGi1VbGpxvC5q+0M8ivezCz/oAKEg5V1M="; @@ -22,6 +22,8 @@ stdenv.mkDerivation rec { "--enable-avahi" # Connect to the daemon at `/var/run/avahi-daemon/socket'. "--localstatedir=/var" + # Read configuration at `/etc/mdns.allow`, not `$out/etc/mdns.allow`. + "--sysconfdir=/etc" ]; meta = { @@ -33,7 +35,7 @@ stdenv.mkDerivation rec { resolution by common Unix/Linux programs in the ad-hoc mDNS domain `.local'. ''; - homepage = "http://0pointer.de/lennart/projects/nss-mdns/"; + homepage = "https://github.com/avahi/nss-mdns/"; license = lib.licenses.lgpl2Plus; # Supports both the GNU and FreeBSD NSS. platforms = lib.platforms.gnu ++ lib.platforms.linux ++ lib.platforms.freebsd; diff --git a/pkgs/tools/networking/nxdomain/default.nix b/pkgs/tools/networking/nxdomain/default.nix index a90c7f0c23ae..2a23230ce778 100644 --- a/pkgs/tools/networking/nxdomain/default.nix +++ b/pkgs/tools/networking/nxdomain/default.nix @@ -22,6 +22,7 @@ buildPythonApplication rec { meta = with lib; { homepage = "https://github.com/zopieux/nxdomain"; description = "A domain (ad) block list creator"; + mainProgram = "nxdomain"; platforms = platforms.all; license = licenses.gpl3Only; maintainers = with maintainers; [ zopieux ]; diff --git a/pkgs/tools/networking/nyx/default.nix b/pkgs/tools/networking/nyx/default.nix index 844d692425b9..cb697e0f5e66 100644 --- a/pkgs/tools/networking/nyx/default.nix +++ b/pkgs/tools/networking/nyx/default.nix @@ -18,6 +18,7 @@ buildPythonApplication rec { meta = with lib; { description = "Command-line monitor for Tor"; + mainProgram = "nyx"; homepage = "https://nyx.torproject.org/"; license = licenses.gpl3; maintainers = with maintainers; [ offline ]; diff --git a/pkgs/tools/networking/nzbget/default.nix b/pkgs/tools/networking/nzbget/default.nix index 2c698ae6c831..9a57a2e8a3b5 100644 --- a/pkgs/tools/networking/nzbget/default.nix +++ b/pkgs/tools/networking/nzbget/default.nix @@ -2,6 +2,7 @@ , stdenv , fetchFromGitHub , autoreconfHook +, boost , pkg-config , gnutls , libgcrypt @@ -17,18 +18,19 @@ stdenv.mkDerivation (finalAttrs: { pname = "nzbget-ng"; - version = "21.4-rc2"; + version = "23.0"; src = fetchFromGitHub { - owner = "nzbget-ng"; + owner = "nzbgetcom"; repo = "nzbget"; rev = "v${finalAttrs.version}"; - hash = "sha256-JJML5mtAog5xC7DkthCtoyn5QeC2Z+fdzSuEa/Te0Ew="; + hash = "sha256-JqC82zpsIqRYB7128gTSOQMWJFR/t63NJXlPgGqP0jE="; }; nativeBuildInputs = [ autoreconfHook pkg-config ]; buildInputs = [ + boost gnutls libgcrypt libpar2 @@ -49,11 +51,11 @@ stdenv.mkDerivation (finalAttrs: { passthru.tests = { inherit (nixosTests) nzbget; }; meta = with lib; { - homepage = "https://nzbget-ng.github.io/"; - changelog = "https://github.com/nzbget-ng/nzbget/releases/tag/v${finalAttrs.version}"; + homepage = "https://nzbget.com/"; + changelog = "https://github.com/nzbgetcom/nzbget/releases/tag/v${finalAttrs.version}"; license = licenses.gpl2Plus; description = "A command line tool for downloading files from news servers"; - maintainers = with maintainers; [ pSub ]; + maintainers = with maintainers; [ pSub devusb ]; platforms = with platforms; unix; mainProgram = "nzbget"; }; diff --git a/pkgs/tools/networking/openresolv/default.nix b/pkgs/tools/networking/openresolv/default.nix index e937c6bcdf60..956584bfae9a 100644 --- a/pkgs/tools/networking/openresolv/default.nix +++ b/pkgs/tools/networking/openresolv/default.nix @@ -34,6 +34,7 @@ stdenv.mkDerivation rec { meta = { description = "A program to manage /etc/resolv.conf"; + mainProgram = "resolvconf"; homepage = "https://roy.marples.name/projects/openresolv"; license = lib.licenses.bsd2; maintainers = [ lib.maintainers.eelco ]; diff --git a/pkgs/tools/networking/p2p/gtk-gnutella/default.nix b/pkgs/tools/networking/p2p/gtk-gnutella/default.nix index a9708dd4713c..53622d30db48 100644 --- a/pkgs/tools/networking/p2p/gtk-gnutella/default.nix +++ b/pkgs/tools/networking/p2p/gtk-gnutella/default.nix @@ -58,6 +58,7 @@ stdenv.mkDerivation (finalAttrs: { meta = with lib; { description = "A GTK Gnutella client, optimized for speed and scalability"; + mainProgram = "gtk-gnutella"; homepage = "https://gtk-gnutella.sourceforge.net/"; # Code: https://github.com/gtk-gnutella/gtk-gnutella changelog = "https://raw.githubusercontent.com/gtk-gnutella/gtk-gnutella/v${version}/ChangeLog"; maintainers = [ maintainers.doronbehar ]; diff --git a/pkgs/tools/networking/p2p/tahoe-lafs/default.nix b/pkgs/tools/networking/p2p/tahoe-lafs/default.nix index 3d2298e8b70e..abeabc337a15 100644 --- a/pkgs/tools/networking/p2p/tahoe-lafs/default.nix +++ b/pkgs/tools/networking/p2p/tahoe-lafs/default.nix @@ -89,6 +89,7 @@ python3Packages.buildPythonApplication rec { meta = with lib; { description = "Tahoe-LAFS, a decentralized, fault-tolerant, distributed storage system"; + mainProgram = "tahoe"; longDescription = '' Tahoe-LAFS is a secure, decentralized, fault-tolerant filesystem. This filesystem is encrypted and spread over multiple peers in diff --git a/pkgs/tools/networking/persepolis/default.nix b/pkgs/tools/networking/persepolis/default.nix index 35727c13e694..28d5b113c336 100644 --- a/pkgs/tools/networking/persepolis/default.nix +++ b/pkgs/tools/networking/persepolis/default.nix @@ -84,6 +84,7 @@ buildPythonApplication rec { meta = with lib; { description = "Persepolis Download Manager is a GUI for aria2"; + mainProgram = "persepolis"; homepage = "https://persepolisdm.github.io/"; license = licenses.gpl3; maintainers = with maintainers; [ iFreilicht ]; diff --git a/pkgs/tools/networking/picosnitch/default.nix b/pkgs/tools/networking/picosnitch/default.nix index 6007d3ec227f..c874fbf80c1b 100644 --- a/pkgs/tools/networking/picosnitch/default.nix +++ b/pkgs/tools/networking/picosnitch/default.nix @@ -33,6 +33,7 @@ python3.pkgs.buildPythonApplication rec { meta = with lib; { description = "Monitor network traffic per executable with hashing"; + mainProgram = "picosnitch"; homepage = "https://github.com/elesiuta/picosnitch"; changelog = "https://github.com/elesiuta/picosnitch/releases"; license = licenses.gpl3Plus; diff --git a/pkgs/tools/networking/pirate-get/default.nix b/pkgs/tools/networking/pirate-get/default.nix index c1b43a00f52f..5a28858621b0 100644 --- a/pkgs/tools/networking/pirate-get/default.nix +++ b/pkgs/tools/networking/pirate-get/default.nix @@ -15,6 +15,7 @@ buildPythonApplication rec { meta = with lib; { description = "A command line interface for The Pirate Bay"; + mainProgram = "pirate-get"; homepage = "https://github.com/vikstrous/pirate-get"; license = licenses.gpl3Plus; maintainers = with maintainers; [ rnhmjoj ]; diff --git a/pkgs/tools/networking/polygon-cli/default.nix b/pkgs/tools/networking/polygon-cli/default.nix index 75c80bd12b7d..07bfa9704557 100644 --- a/pkgs/tools/networking/polygon-cli/default.nix +++ b/pkgs/tools/networking/polygon-cli/default.nix @@ -25,6 +25,7 @@ python3.pkgs.buildPythonPackage rec { meta = { description = "Command-line tool for polygon.codeforces.com"; + mainProgram = "polygon-cli"; homepage = "https://github.com/kunyavskiy/polygon-cli"; changelog = "https://github.com/kunyavskiy/polygon-cli/releases/tag/${version}"; license = lib.licenses.mit; diff --git a/pkgs/tools/networking/ratman/default.nix b/pkgs/tools/networking/ratman/default.nix index a78840095d88..65f32add0f6b 100644 --- a/pkgs/tools/networking/ratman/default.nix +++ b/pkgs/tools/networking/ratman/default.nix @@ -87,7 +87,7 @@ rustPlatform.buildRustPackage rec { description = "A modular decentralised peer-to-peer packet router and associated tools"; homepage = "https://git.irde.st/we/irdest"; platforms = platforms.unix; - license = licenses.agpl3; + license = licenses.agpl3Only; maintainers = with maintainers; [ spacekookie yuka ]; }; } diff --git a/pkgs/tools/networking/s3cmd/default.nix b/pkgs/tools/networking/s3cmd/default.nix index b07ea24abf9d..18aed1301355 100644 --- a/pkgs/tools/networking/s3cmd/default.nix +++ b/pkgs/tools/networking/s3cmd/default.nix @@ -18,6 +18,7 @@ buildPythonApplication rec { meta = with lib; { homepage = "https://s3tools.org/s3cmd"; description = "Command line tool for managing Amazon S3 and CloudFront services"; + mainProgram = "s3cmd"; license = licenses.gpl2; maintainers = [ ]; }; diff --git a/pkgs/tools/networking/saldl/default.nix b/pkgs/tools/networking/saldl/default.nix index b7281d3a20a7..7f1551cd85b8 100644 --- a/pkgs/tools/networking/saldl/default.nix +++ b/pkgs/tools/networking/saldl/default.nix @@ -52,7 +52,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "CLI downloader optimized for speed and early preview"; homepage = "https://saldl.github.io"; - license = licenses.agpl3; + license = licenses.agpl3Only; maintainers = with maintainers; [ zowoq ]; platforms = platforms.all; mainProgram = "saldl"; diff --git a/pkgs/tools/networking/sish/default.nix b/pkgs/tools/networking/sish/default.nix index afac612d0604..3cf5b6a509ab 100644 --- a/pkgs/tools/networking/sish/default.nix +++ b/pkgs/tools/networking/sish/default.nix @@ -7,16 +7,16 @@ buildGoModule rec { pname = "sish"; - version = "2.12.0"; + version = "2.14.0"; src = fetchFromGitHub { owner = "antoniomika"; - repo = pname; + repo = "sish"; rev = "refs/tags/v${version}"; - hash = "sha256-dn64M/DGnyaoEtbdeytpRsKCXQPvR+dJDI7yFt2IqU0="; + hash = "sha256-nDmmq8Yv+iCZPor7sLdJWqWudb3yxrllZgPH4d9mP38="; }; - vendorHash = "sha256-P5Y5DwF9Tb9j098XiEJZaEGZhT2Ce2emnV2SawElosI="; + vendorHash = "sha256-4HcWD/u7aCEzQ3tYRmFwvdjPuv5eyHlCVHtxA6cBiW0="; ldflags = [ "-s" diff --git a/pkgs/tools/networking/sitespeed-io/default.nix b/pkgs/tools/networking/sitespeed-io/default.nix index 505807129318..96d2f4dc9cb1 100644 --- a/pkgs/tools/networking/sitespeed-io/default.nix +++ b/pkgs/tools/networking/sitespeed-io/default.nix @@ -24,13 +24,13 @@ assert (!withFirefox && !withChromium) -> throw "Either `withFirefox` or `withChromium` must be enabled."; buildNpmPackage rec { pname = "sitespeed-io"; - version = "33.2.0"; + version = "33.3.0"; src = fetchFromGitHub { owner = "sitespeedio"; repo = "sitespeed.io"; rev = "v${version}"; - hash = "sha256-GU7eQfh44zAuZ0oPb/9wGxK/+AfKvNPyuRgmEP0NaMM="; + hash = "sha256-voH0/F11fSMpEccyjcX3YUKaXjegJRwQwlRoa8R8sDg="; }; nodejs = nodejs_18; @@ -46,7 +46,7 @@ buildNpmPackage rec { dontNpmBuild = true; npmInstallFlags = [ "--omit=dev" ]; - npmDepsHash = "sha256-t11JMu+MjTRsDuud/mDvLglvdcj1mlZfx67ueejdw/0="; + npmDepsHash = "sha256-IiDfvID3h6kBue54p6J9qpjwwO5LwKkK0fw7TNptsxA="; postInstall = '' mv $out/bin/sitespeed{.,-}io diff --git a/pkgs/tools/networking/snowflake/default.nix b/pkgs/tools/networking/snowflake/default.nix index f48824f04054..aa29bd8d11f7 100644 --- a/pkgs/tools/networking/snowflake/default.nix +++ b/pkgs/tools/networking/snowflake/default.nix @@ -2,7 +2,7 @@ buildGoModule rec { pname = "snowflake"; - version = "2.9.1"; + version = "2.9.2"; src = fetchFromGitLab { domain = "gitlab.torproject.org"; @@ -10,10 +10,10 @@ buildGoModule rec { owner = "anti-censorship/pluggable-transports"; repo = "snowflake"; rev = "v${version}"; - sha256 = "sha256-LDr/Fzg1fC2lf7W+yTD1y5q4C2pPXZz+ZJf9sI1BxcQ="; + sha256 = "sha256-QyTyFz4NIuUV7g5f6qV/ujfHYZDnnZmjeBinvcWlo0U="; }; - vendorHash = "sha256-IT2+5HmgkV6BKPEARkCZbULyVr7VDLtwGUCF22YuodA="; + vendorHash = "sha256-Qn8JFzrLCUrr6WGvVmaSYC7ooiMGl8iPMXkRvALho1A="; meta = with lib; { description = "System to defeat internet censorship"; diff --git a/pkgs/tools/networking/sockdump/default.nix b/pkgs/tools/networking/sockdump/default.nix index 95920a91eef3..98e88d0d6f83 100644 --- a/pkgs/tools/networking/sockdump/default.nix +++ b/pkgs/tools/networking/sockdump/default.nix @@ -2,13 +2,13 @@ python3.pkgs.buildPythonApplication rec { pname = "sockdump"; - version = "unstable-2023-09-16"; + version = "unstable-2023-12-11"; src = fetchFromGitHub { owner = "mechpen"; repo = pname; - rev = "713759e383366feae76863881e851a6411c73b68"; - hash = "sha256-q6jdwFhl2G9o2C0BVU6Xz7xizO00yaSQ2KSR/z4fixY="; + rev = "d40ec77e960d021861220bc14a273c5dcad13160"; + hash = "sha256-FLK1rgWvIoFGv/6+DtDhZGeOZrn7V1jYNS3S8qwL/dc="; }; propagatedBuildInputs = [ bcc ]; @@ -19,7 +19,8 @@ python3.pkgs.buildPythonApplication rec { meta = src.meta // { description = "Dump unix domain socket traffic with bpf"; + mainProgram = "sockdump"; license = lib.licenses.unlicense; - maintainers = with lib.maintainers; [ ehmry ]; + maintainers = with lib.maintainers; [ ehmry picnoir ]; }; } diff --git a/pkgs/tools/networking/sshoogr/default.nix b/pkgs/tools/networking/sshoogr/default.nix index e20978c277d9..abd42dcb5aa4 100644 --- a/pkgs/tools/networking/sshoogr/default.nix +++ b/pkgs/tools/networking/sshoogr/default.nix @@ -22,6 +22,7 @@ stdenv.mkDerivation rec { description = '' A Groovy-based DSL for working with remote SSH servers ''; + mainProgram = "sshoogr"; longDescription = '' The sshoogr (pronounced [ʃʊgə]) is a Groovy-based DSL library for working with remote servers through SSH. The DSL allows: connecting, executing diff --git a/pkgs/tools/networking/swaks/default.nix b/pkgs/tools/networking/swaks/default.nix index 471cc74d9d7f..1ca00b6beaea 100644 --- a/pkgs/tools/networking/swaks/default.nix +++ b/pkgs/tools/networking/swaks/default.nix @@ -25,6 +25,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "http://www.jetmore.org/john/code/swaks/"; description = "A featureful, flexible, scriptable, transaction-oriented SMTP test tool"; + mainProgram = "swaks"; license = licenses.gpl2Plus; maintainers = with maintainers; []; platforms = platforms.all; diff --git a/pkgs/tools/networking/telepresence/default.nix b/pkgs/tools/networking/telepresence/default.nix index 4866cfea41ee..dee55ad5687c 100644 --- a/pkgs/tools/networking/telepresence/default.nix +++ b/pkgs/tools/networking/telepresence/default.nix @@ -38,6 +38,7 @@ in pythonPackages.buildPythonPackage rec { meta = { homepage = "https://www.telepresence.io/"; description = "Local development against a remote Kubernetes or OpenShift cluster"; + mainProgram = "telepresence"; license = with lib.licenses; [ asl20 ]; maintainers = with lib.maintainers; [ offline ]; }; diff --git a/pkgs/tools/networking/termshark/default.nix b/pkgs/tools/networking/termshark/default.nix index 84dbf7ed3311..bdca008cc94c 100644 --- a/pkgs/tools/networking/termshark/default.nix +++ b/pkgs/tools/networking/termshark/default.nix @@ -29,6 +29,7 @@ buildGoModule rec { meta = with lib; { homepage = "https://termshark.io/"; description = "A terminal UI for wireshark-cli, inspired by Wireshark"; + mainProgram = "termshark"; license = licenses.mit; maintainers = with maintainers; [ winpat ]; }; diff --git a/pkgs/tools/networking/tinystatus/default.nix b/pkgs/tools/networking/tinystatus/default.nix index e4e930e799a8..d58d853b5e10 100644 --- a/pkgs/tools/networking/tinystatus/default.nix +++ b/pkgs/tools/networking/tinystatus/default.nix @@ -50,6 +50,7 @@ stdenvNoCC.mkDerivation rec { meta = with lib; { description = "A static HTML status page generator written in pure shell"; + mainProgram = "tinystatus"; homepage = "https://github.com/bderenzo/tinystatus"; license = licenses.mit; platforms = platforms.unix; diff --git a/pkgs/tools/networking/tuntox/default.nix b/pkgs/tools/networking/tuntox/default.nix index 64a13e99669a..e59a615e2627 100644 --- a/pkgs/tools/networking/tuntox/default.nix +++ b/pkgs/tools/networking/tuntox/default.nix @@ -71,6 +71,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Tunnel TCP connections over the Tox protocol"; + mainProgram = "tuntox"; homepage = "https://github.com/gjedeer/tuntox"; license = licenses.gpl3; maintainers = with maintainers; [ diff --git a/pkgs/tools/networking/udp2raw/default.nix b/pkgs/tools/networking/udp2raw/default.nix index b6466ce0be57..e10db84eb49f 100644 --- a/pkgs/tools/networking/udp2raw/default.nix +++ b/pkgs/tools/networking/udp2raw/default.nix @@ -45,6 +45,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://github.com/wangyu-/udp2raw"; description = "A tunnel which turns UDP traffic into encrypted UDP/FakeTCP/ICMP traffic by using a raw socket"; + mainProgram = "udp2raw"; license = licenses.mit; changelog = "https://github.com/wangyu-/udp2raw/releases/tag/${version}"; maintainers = with maintainers; [ chvp ]; diff --git a/pkgs/tools/networking/uget-integrator/default.nix b/pkgs/tools/networking/uget-integrator/default.nix index 2d069ea07f02..3ab9a0bafef4 100644 --- a/pkgs/tools/networking/uget-integrator/default.nix +++ b/pkgs/tools/networking/uget-integrator/default.nix @@ -31,6 +31,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Native messaging host to integrate uGet Download Manager with web browsers"; + mainProgram = "uget-integrator"; homepage = "https://github.com/ugetdm/uget-integrator"; license = licenses.gpl3; platforms = platforms.linux; diff --git a/pkgs/tools/networking/unbound/default.nix b/pkgs/tools/networking/unbound/default.nix index 0c7d378eb2a0..617f5f03f1c3 100644 --- a/pkgs/tools/networking/unbound/default.nix +++ b/pkgs/tools/networking/unbound/default.nix @@ -51,17 +51,42 @@ stdenv.mkDerivation (finalAttrs: { pname = "unbound"; - version = "1.19.1"; + version = "1.19.2"; src = fetchurl { url = "https://nlnetlabs.nl/downloads/unbound/unbound-${finalAttrs.version}.tar.gz"; - hash = "sha256-vB1Xbz3YRqBzmtxB/6pwJATGdn0rYILeufL5fLsko6k="; + hash = "sha256-zFYNNFc0ImwbOecadpeX5/3eImXLt3685UJwS7pInlU="; }; + + # Cherry pick some already merged upstream patches for configure + patches = [ + # Search for protobuf-c with pkg-config + # https://github.com/NLnetLabs/unbound/pull/999 + (fetchpatch { + url = "https://github.com/NLnetLabs/unbound/commit/59d98b9ef64e597c331c27160715d7a1b40c8638.patch"; + hash = "sha256-DvYoYBTXOwbR8Z0GRgt724WqX3dbIEOdICU2/VMRSVQ="; + }) + # Fix for previous patch + # https://github.com/NLnetLabs/unbound/issues/1006 + (fetchpatch { + url = "https://github.com/NLnetLabs/unbound/commit/93490a0fc1bf9e62e6edcd6b69f1463c7ac410e9.patch"; + hash = "sha256-mBo63ZlayD3YkOgIoQN0dG+xuFq/BxcjBmSo1vapiYA="; + excludes = [ "doc/Changelog" ]; + }) + # Fix for previous patch + # https://github.com/NLnetLabs/unbound/commit/3f5175584b0bb9ff7d417bc195ec6e4316ae58d3 + (fetchpatch { + url = "https://github.com/NLnetLabs/unbound/commit/3f5175584b0bb9ff7d417bc195ec6e4316ae58d3.patch"; + hash = "sha256-DcWfvmk+4K3c9Z+4grwzEGIkEBYNpbTK3xuBqRI33fY="; + }) + ]; + outputs = [ "out" "lib" "man" ]; # "dev" would only split ~20 kB nativeBuildInputs = lib.optionals withMakeWrapper [ makeWrapper ] + ++ lib.optionals withDNSTAP [ protobufc ] ++ [ pkg-config ] ++ lib.optionals withPythonModule [ swig ]; @@ -97,7 +122,6 @@ stdenv.mkDerivation (finalAttrs: { "--with-libsodium=${symlinkJoin { name = "libsodium-full"; paths = [ libsodium.dev libsodium.out ]; }}" ] ++ lib.optionals withDNSTAP [ "--enable-dnstap" - "--with-protobuf-c=${protobufc}" ] ++ lib.optionals withTFO [ "--enable-tfo-client" "--enable-tfo-server" diff --git a/pkgs/tools/networking/updog/default.nix b/pkgs/tools/networking/updog/default.nix index 7fb8e0bfec37..c5cccac026ba 100644 --- a/pkgs/tools/networking/updog/default.nix +++ b/pkgs/tools/networking/updog/default.nix @@ -19,6 +19,7 @@ python3Packages.buildPythonApplication rec { meta = with lib; { description = "Updog is a replacement for Python's SimpleHTTPServer"; + mainProgram = "updog"; homepage = "https://github.com/sc0tfree/updog"; license = licenses.mit; maintainers = with maintainers; [ ethancedwards8 ]; diff --git a/pkgs/tools/networking/urlwatch/default.nix b/pkgs/tools/networking/urlwatch/default.nix index 36ad0ba77ce7..0335ed765479 100644 --- a/pkgs/tools/networking/urlwatch/default.nix +++ b/pkgs/tools/networking/urlwatch/default.nix @@ -46,6 +46,7 @@ python3Packages.buildPythonApplication rec { meta = with lib; { description = "A tool for monitoring webpages for updates"; + mainProgram = "urlwatch"; homepage = "https://thp.io/2008/urlwatch/"; license = licenses.bsd3; maintainers = with maintainers; [ kmein tv ]; diff --git a/pkgs/tools/networking/v2ray/default.nix b/pkgs/tools/networking/v2ray/default.nix index aa398dfcb9f3..0bd4f1fff80b 100644 --- a/pkgs/tools/networking/v2ray/default.nix +++ b/pkgs/tools/networking/v2ray/default.nix @@ -6,13 +6,13 @@ buildGoModule rec { pname = "v2ray-core"; - version = "5.15.0"; + version = "5.15.1"; src = fetchFromGitHub { owner = "v2fly"; repo = "v2ray-core"; rev = "v${version}"; - hash = "sha256-XxmzJfZa05Kf32Lh6FapYpQZProJyzlXoXKnDPiWqMQ="; + hash = "sha256-EENeJQfIKHtbh5dmWeUtnVepIGsBsXMs6Yhi/QzeRRs="; }; # `nix-update` doesn't support `vendorHash` yet. @@ -55,6 +55,7 @@ buildGoModule rec { meta = { homepage = "https://www.v2fly.org/en_US/"; description = "A platform for building proxies to bypass network restrictions"; + mainProgram = "v2ray"; license = with lib.licenses; [ mit ]; maintainers = with lib.maintainers; [ servalcatty ]; }; diff --git a/pkgs/tools/networking/vpn-slice/default.nix b/pkgs/tools/networking/vpn-slice/default.nix index 75cfe2bba0e9..0cde0170b78f 100644 --- a/pkgs/tools/networking/vpn-slice/default.nix +++ b/pkgs/tools/networking/vpn-slice/default.nix @@ -41,6 +41,7 @@ buildPythonApplication rec { homepage = "https://github.com/dlenski/vpn-slice"; description = "vpnc-script replacement for easy and secure split-tunnel VPN setup"; + mainProgram = "vpn-slice"; license = licenses.gpl3; maintainers = with maintainers; [ liketechnik ]; }; diff --git a/pkgs/tools/networking/vpnc-scripts/default.nix b/pkgs/tools/networking/vpnc-scripts/default.nix index 7b6a760f5f00..e0319ed4bf14 100644 --- a/pkgs/tools/networking/vpnc-scripts/default.nix +++ b/pkgs/tools/networking/vpnc-scripts/default.nix @@ -43,6 +43,7 @@ stdenv.mkDerivation { meta = with lib; { homepage = "https://www.infradead.org/openconnect/"; description = "Script for vpnc to configure the network routing and name service"; + mainProgram = "vpnc-script"; license = licenses.gpl2Only; maintainers = with maintainers; [ jerith666 ]; platforms = platforms.linux ++ platforms.darwin; diff --git a/pkgs/tools/networking/whatip/default.nix b/pkgs/tools/networking/whatip/default.nix index 08979e71e35e..85a2fdf3f7b3 100644 --- a/pkgs/tools/networking/whatip/default.nix +++ b/pkgs/tools/networking/whatip/default.nix @@ -55,6 +55,7 @@ python3.pkgs.buildPythonApplication rec { meta = with lib; { description = "Info on your IP"; + mainProgram = "whatip"; homepage = "https://gitlab.gnome.org/GabMus/whatip"; license = licenses.gpl3Plus; platforms = platforms.linux; diff --git a/pkgs/tools/networking/wifish/default.nix b/pkgs/tools/networking/wifish/default.nix index a9e30710c1a2..7f474bc98442 100644 --- a/pkgs/tools/networking/wifish/default.nix +++ b/pkgs/tools/networking/wifish/default.nix @@ -40,6 +40,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://github.com/bougyman/wifish"; description = "Simple wifi shell script for linux"; + mainProgram = "wifish"; license = licenses.wtfpl; maintainers = with maintainers; [ AndersonTorres ]; platforms = with platforms; linux; diff --git a/pkgs/tools/networking/wuzz/default.nix b/pkgs/tools/networking/wuzz/default.nix index 0ee71eb1e651..c428b40547f1 100644 --- a/pkgs/tools/networking/wuzz/default.nix +++ b/pkgs/tools/networking/wuzz/default.nix @@ -25,7 +25,7 @@ buildGoModule rec { meta = with lib; { homepage = "https://github.com/asciimoo/wuzz"; description = "Interactive cli tool for HTTP inspection"; - license = licenses.agpl3; + license = licenses.agpl3Only; maintainers = with maintainers; [ pradeepchhetri ]; mainProgram = "wuzz"; }; diff --git a/pkgs/tools/networking/xray/default.nix b/pkgs/tools/networking/xray/default.nix index 2c2fce54e608..285b29f22885 100644 --- a/pkgs/tools/networking/xray/default.nix +++ b/pkgs/tools/networking/xray/default.nix @@ -52,6 +52,7 @@ buildGoModule rec { meta = { description = "A platform for building proxies to bypass network restrictions. A replacement for v2ray-core, with XTLS support and fully compatible configuration"; + mainProgram = "xray"; homepage = "https://github.com/XTLS/Xray-core"; license = with lib.licenses; [ mpl20 ]; maintainers = with lib.maintainers; [ iopq ]; |