diff options
Diffstat (limited to 'nixpkgs/pkgs/tools/networking')
200 files changed, 1634 insertions, 2052 deletions
diff --git a/nixpkgs/pkgs/tools/networking/airfield/node.nix b/nixpkgs/pkgs/tools/networking/airfield/node.nix index 0bcd0eb4b851..e6ff9b78d386 100644 --- a/nixpkgs/pkgs/tools/networking/airfield/node.nix +++ b/nixpkgs/pkgs/tools/networking/airfield/node.nix @@ -6,7 +6,7 @@ let nodeEnv = import ../../../development/node-packages/node-env.nix { - inherit (pkgs) stdenv lib python2 runCommand writeTextFile; + inherit (pkgs) stdenv lib python2 runCommand writeTextFile writeShellScript; inherit pkgs nodejs; libtool = if pkgs.stdenv.isDarwin then pkgs.darwin.cctools else null; }; diff --git a/nixpkgs/pkgs/tools/networking/amass/default.nix b/nixpkgs/pkgs/tools/networking/amass/default.nix index caecece80ae6..c15633a4f5d4 100644 --- a/nixpkgs/pkgs/tools/networking/amass/default.nix +++ b/nixpkgs/pkgs/tools/networking/amass/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "amass"; - version = "3.14.1"; + version = "3.15.2"; src = fetchFromGitHub { owner = "OWASP"; repo = "Amass"; rev = "v${version}"; - sha256 = "sha256-AKvTnr1NeoTMBn5KNuqdR1z1P/pkQU9E1WrPQPhl8Yw="; + sha256 = "sha256-0zTnknpjTvUEai06JsRfQASclxpvaJnEfYK7biZeqU0="; }; - vendorSha256 = "sha256-v+x0S47dEgRLr2Yv8t1GnFM/iQ9bKKanPhPJMI+mF7s="; + vendorSha256 = "sha256-Lh/VN+IBXpT8e7ok5Qjfk5tgXEUVwKMHYcp9WrChN3A="; outputs = [ "out" "wordlists" ]; diff --git a/nixpkgs/pkgs/tools/networking/assh/default.nix b/nixpkgs/pkgs/tools/networking/assh/default.nix index 5bbedf0f7e5b..4300f8797b84 100644 --- a/nixpkgs/pkgs/tools/networking/assh/default.nix +++ b/nixpkgs/pkgs/tools/networking/assh/default.nix @@ -7,16 +7,16 @@ buildGoModule rec { pname = "assh"; - version = "2.11.3"; + version = "2.12.0"; src = fetchFromGitHub { repo = "advanced-ssh-config"; owner = "moul"; rev = "v${version}"; - sha256 = "sha256-NH7Dmqsu7uRhKWGFHBnh5GGqsNFOijDxsc+ATt28jtY="; + sha256 = "sha256-FqxxNTsZVmCsIGNHRWusFP2gba2+geqBubw+6PeR75c="; }; - vendorSha256 = "sha256-6OAsO7zWAgPfQWD9k+nYH7hnDDUlKIjTB61ivvoubn0="; + vendorSha256 = "sha256-AYBwuRSeam5i2gex9PSG9Qk+FHdEhIpY250CJo01cFE="; doCheck = false; diff --git a/nixpkgs/pkgs/tools/networking/atinout/default.nix b/nixpkgs/pkgs/tools/networking/atinout/default.nix index 93535531d91b..6fad1174bbf0 100644 --- a/nixpkgs/pkgs/tools/networking/atinout/default.nix +++ b/nixpkgs/pkgs/tools/networking/atinout/default.nix @@ -1,7 +1,7 @@ { lib, stdenv, fetchgit, ronn, mount }: stdenv.mkDerivation rec { - name = "atinout-${version}"; + pname = "atinout"; version = "0.9.2-alpha"; NIX_CFLAGS_COMPILE = lib.optionalString (!stdenv.cc.isClang) "-Werror=implicit-fallthrough=0"; diff --git a/nixpkgs/pkgs/tools/networking/axel/default.nix b/nixpkgs/pkgs/tools/networking/axel/default.nix index f7e761ac0fd0..eb2b109dbecd 100644 --- a/nixpkgs/pkgs/tools/networking/axel/default.nix +++ b/nixpkgs/pkgs/tools/networking/axel/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "axel"; - version = "2.17.10"; + version = "2.17.11"; src = fetchFromGitHub { owner = "axel-download-accelerator"; repo = pname; rev = "v${version}"; - sha256 = "01mpfkz98r2fx4n0gyi3b4zvlyfd5bxydp2wh431lnj0ahrsiikp"; + sha256 = "sha256-yC4TL8IXWGEwRXAyeon6QnQa+rT1xL/McLsghjZ4ky4="; }; nativeBuildInputs = [ autoreconfHook pkg-config autoconf-archive txt2man ]; diff --git a/nixpkgs/pkgs/tools/networking/bacnet-stack/default.nix b/nixpkgs/pkgs/tools/networking/bacnet-stack/default.nix index a4f2ef36360e..9e47993df602 100644 --- a/nixpkgs/pkgs/tools/networking/bacnet-stack/default.nix +++ b/nixpkgs/pkgs/tools/networking/bacnet-stack/default.nix @@ -1,7 +1,7 @@ { lib, stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { - name = "bacnet-stack"; + pname = "bacnet-stack"; version = "1.0.0"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/tools/networking/badvpn/default.nix b/nixpkgs/pkgs/tools/networking/badvpn/default.nix index fd7c3b23adfe..b1fc3b5b9b60 100644 --- a/nixpkgs/pkgs/tools/networking/badvpn/default.nix +++ b/nixpkgs/pkgs/tools/networking/badvpn/default.nix @@ -1,39 +1,33 @@ -{lib, stdenv, fetchurl, cmake, openssl, nss, pkg-config, nspr, bash, debug ? false}: -let - s = # Generated upstream information - rec { - baseName="badvpn"; - version="1.999.130"; - name="${baseName}-${version}"; - hash="02b1fra43l75mljkhrq45vcrrqv0znicjn15g7nbqx3jppzbpm5z"; - url="https://github.com/ambrop72/badvpn/archive/1.999.130.tar.gz"; - sha256="02b1fra43l75mljkhrq45vcrrqv0znicjn15g7nbqx3jppzbpm5z"; - }; +{ lib, stdenv, fetchFromGitHub, cmake, openssl, nss, pkg-config, nspr, bash, debug ? false }: + +stdenv.mkDerivation rec { + pname = "badvpn"; + version = "1.999.130"; + src = fetchFromGitHub { + owner = "ambrop72"; + repo = "badvpn"; + rev = version; + sha256 = "sha256-bLTDpq3ohUP+KooPvhv1/AZfdo0HwB3g9QOuE2E/pmY="; + }; - compileFlags = "-O3 ${lib.optionalString (!debug) "-DNDEBUG"}"; -in -stdenv.mkDerivation { - inherit (s) name version; nativeBuildInputs = [ cmake pkg-config ]; buildInputs = [ - openssl nss nspr + openssl + nss + nspr ]; - src = fetchurl { - inherit (s) url sha256; - }; preConfigure = '' find . -name '*.sh' -exec sed -e 's@#!/bin/sh@${stdenv.shell}@' -i '{}' ';' find . -name '*.sh' -exec sed -e 's@#!/bin/bash@${bash}/bin/bash@' -i '{}' ';' - cmakeFlagsArray=("-DCMAKE_BUILD_TYPE=" "-DCMAKE_C_FLAGS=${compileFlags}"); + cmakeFlagsArray=("-DCMAKE_BUILD_TYPE=" "-DCMAKE_C_FLAGS=-O3 ${lib.optionalString (!debug) "-DNDEBUG"}"); ''; - meta = { - inherit (s) version; + meta = with lib; { description = "A set of network-related (mostly VPN-related) tools"; - license = lib.licenses.bsd3 ; - maintainers = [lib.maintainers.raskin]; - platforms = lib.platforms.linux; + license = licenses.bsd3; + maintainers = with maintainers; [ raskin ]; + platforms = platforms.linux; }; } diff --git a/nixpkgs/pkgs/tools/networking/badvpn/default.upstream b/nixpkgs/pkgs/tools/networking/badvpn/default.upstream deleted file mode 100644 index 2a85ba7cb519..000000000000 --- a/nixpkgs/pkgs/tools/networking/badvpn/default.upstream +++ /dev/null @@ -1,3 +0,0 @@ -url https://github.com/ambrop72/badvpn/releases -version_link '[0-9][.]tar[.][a-z0-9]+$' -version '.*/([0-9.]+)[.]tar[.].*' '\1' diff --git a/nixpkgs/pkgs/tools/networking/bgpq3/default.nix b/nixpkgs/pkgs/tools/networking/bgpq3/default.nix index bd0a623a916d..16bebda7d3dc 100644 --- a/nixpkgs/pkgs/tools/networking/bgpq3/default.nix +++ b/nixpkgs/pkgs/tools/networking/bgpq3/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "bgpq3"; - version = "0.1.35"; + version = "0.1.36"; src = fetchFromGitHub { owner = "snar"; repo = pname; rev = "v${version}"; - sha256 = "0fd5a3krq0i906m0iivgphiqq88cw6c0w1q4n7lmzyq9201mb8wj"; + sha256 = "sha256-FBtt++w2WzCnSim+r+MVy287w2jmdNEaQIro2KaVeRI="; }; # Fix binary install location. Remove with next upstream release. diff --git a/nixpkgs/pkgs/tools/networking/bgpq4/default.nix b/nixpkgs/pkgs/tools/networking/bgpq4/default.nix index bfbb138952a9..e429b5a8cd20 100644 --- a/nixpkgs/pkgs/tools/networking/bgpq4/default.nix +++ b/nixpkgs/pkgs/tools/networking/bgpq4/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "bgpq4"; - version = "1.2"; + version = "1.4"; src = fetchFromGitHub { owner = "bgp"; repo = pname; rev = version; - sha256 = "sha256-8r70tetbTq8GxxtFe71gDYy+wg8yBwYpl1gsu5aAHTA="; + sha256 = "sha256-EFxINRFrcNXGtXpNqvBIN6pE1kG3OdeDIHYOsG2celI="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/tools/networking/bore/default.nix b/nixpkgs/pkgs/tools/networking/bore/default.nix index b22cdb0c2ae4..66334e062103 100644 --- a/nixpkgs/pkgs/tools/networking/bore/default.nix +++ b/nixpkgs/pkgs/tools/networking/bore/default.nix @@ -2,20 +2,21 @@ rustPlatform.buildRustPackage rec { pname = "bore"; - version = "0.3.3"; + version = "0.4.1"; src = fetchFromBitbucket { owner = "delan"; repo = "nonymous"; - rev = version; - sha256 = "0gws1f625izrb3armh6bay1k8l9p9csl37jx03yss1r720k4vn2x"; + rev = "${pname}-${version}"; + sha256 = "1fdnnx7d18gj4rkv1dc6q379dqabl66zks9i0rjarjwcci8m30d9"; }; - cargoSha256 = "1n09gcp1y885lz6g2f73zw3fd0fmv7nwlvaqba2yl0kylzk7naa6"; + cargoSha256 = "1xlbfzmy0wjyz3jpr17r4ma4i79d9b32yqwwi10vrcjzr7vsyhmx"; cargoBuildFlags = "-p ${pname}"; # FIXME can’t test --all-targets and --doc in a single invocation - cargoTestFlags = "--features std --all-targets --workspace"; + cargoTestFlags = [ "--all-targets" "--workspace" ]; + checkFeatures = [ "std" ]; nativeBuildInputs = [ installShellFiles ] ++ lib.optional stdenv.isDarwin llvmPackages.libclang; diff --git a/nixpkgs/pkgs/tools/networking/boundary/default.nix b/nixpkgs/pkgs/tools/networking/boundary/default.nix index 4f7b76ad8c7a..8851a4a87406 100644 --- a/nixpkgs/pkgs/tools/networking/boundary/default.nix +++ b/nixpkgs/pkgs/tools/networking/boundary/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { pname = "boundary"; - version = "0.6.2"; + version = "0.7.1"; src = let @@ -14,9 +14,9 @@ stdenv.mkDerivation rec { x86_64-darwin = "darwin_amd64"; }; sha256 = selectSystem { - x86_64-linux = "sha256-qO74R6L2kTHXCNtka9SHT4lZo4Gr15w6K3e43+p2HW4="; - aarch64-linux = "sha256-apd16BuusNI5P2Qr8Hj95dRwoAk/ZEZa6TQi+0paIzs="; - x86_64-darwin = "sha256-LdCakVru1sbB88plsGrJiMDQl5HtH1GkCkcjmIVjeec="; + x86_64-linux = "sha256-5m5ckeX3gVY82q9aQWusnq3o/+UBPJSPDdISL86OfV8="; + aarch64-linux = "sha256-+dnQh89kg3JcDL8sucMceCMRFyUjoAIYuZtDM8AUMYw="; + x86_64-darwin = "sha256-ZoWW8y048+5Ru3s7lUxLTMxuITFBC9AgwqafyHPDc54="; }; in fetchzip { diff --git a/nixpkgs/pkgs/tools/networking/brook/default.nix b/nixpkgs/pkgs/tools/networking/brook/default.nix index c45f79fb2424..ac81453e656c 100644 --- a/nixpkgs/pkgs/tools/networking/brook/default.nix +++ b/nixpkgs/pkgs/tools/networking/brook/default.nix @@ -17,7 +17,7 @@ buildGoModule rec { homepage = "https://github.com/txthinking/brook"; description = "A cross-platform Proxy/VPN software"; license = with licenses; [ gpl3Only ]; - platforms = platforms.linux; + platforms = platforms.unix; maintainers = with maintainers; [ xrelkd ]; }; } diff --git a/nixpkgs/pkgs/tools/networking/bsd-finger/default.nix b/nixpkgs/pkgs/tools/networking/bsd-finger/default.nix index 354c669b3366..4f8d946fa360 100644 --- a/nixpkgs/pkgs/tools/networking/bsd-finger/default.nix +++ b/nixpkgs/pkgs/tools/networking/bsd-finger/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { version = "0.17"; src = fetchurl { - url = "ftp://ftp.metalab.unc.edu/pub/linux/system/network/finger/bsd-finger-${version}.tar.gz"; + url = "mirror://metalab/system/network/finger/bsd-finger-${version}.tar.gz"; sha256 = "1yhkiv0in588il7f84k2xiy78g9lv12ll0y7047gazhiimk5v244"; }; diff --git a/nixpkgs/pkgs/tools/networking/burpsuite/default.nix b/nixpkgs/pkgs/tools/networking/burpsuite/default.nix index e4783ddb0ef2..b04ddf8f597a 100644 --- a/nixpkgs/pkgs/tools/networking/burpsuite/default.nix +++ b/nixpkgs/pkgs/tools/networking/burpsuite/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { pname = "burpsuite"; - version = "2021.8.1"; + version = "2021.12"; src = fetchurl { name = "burpsuite.jar"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { "https://portswigger.net/Burp/Releases/Download?productId=100&version=${version}&type=Jar" "https://web.archive.org/web/https://portswigger.net/Burp/Releases/Download?productId=100&version=${version}&type=Jar" ]; - sha256 = "sha256-R1WV3oaweW4nfszUOtmrfBlbKJm8HDNjwtbj97dFzB0="; + sha256 = "sha256-BLX/SgHctXciOZoA6Eh4zuDJoxNSZgvoj2Teg1fV80g="; }; dontUnpack = true; diff --git a/nixpkgs/pkgs/tools/networking/bwm-ng/default.nix b/nixpkgs/pkgs/tools/networking/bwm-ng/default.nix index 97f0d1823af2..cfe0d4176a6f 100644 --- a/nixpkgs/pkgs/tools/networking/bwm-ng/default.nix +++ b/nixpkgs/pkgs/tools/networking/bwm-ng/default.nix @@ -2,6 +2,7 @@ , stdenv , autoreconfHook , fetchurl +, fetchpatch , ncurses }: @@ -14,6 +15,17 @@ stdenv.mkDerivation rec { sha256 = "0ikzyvnb73msm9n7ripg1dsw9av1i0c7q2hi2173xsj8zyv559f1"; }; + patches = [ + # Pull upstream fix for ncurses-6.3 support. + (fetchpatch { + name = "ncurses-6.3.patch"; + url = "https://github.com/vgropp/bwm-ng/commit/6a2087db6cc7ac5b5f667fcd17c262c079e8dcf2.patch"; + sha256 = "1l5dii9d52v0x0sq458ybw7m9p8aan2vl94gwx5s8mgxsnbcmzzx"; + # accidentally committed changes + excludes = [ "config.h.in~" "configure.in" "configure~" ]; + }) + ]; + nativeBuildInputs = [ autoreconfHook ]; diff --git a/nixpkgs/pkgs/tools/networking/calendar-cli/default.nix b/nixpkgs/pkgs/tools/networking/calendar-cli/default.nix index 497b77b57ac0..b2a7b0bd0a13 100644 --- a/nixpkgs/pkgs/tools/networking/calendar-cli/default.nix +++ b/nixpkgs/pkgs/tools/networking/calendar-cli/default.nix @@ -5,13 +5,13 @@ python3.pkgs.buildPythonApplication rec { pname = "calendar-cli"; - version = "0.12.0"; + version = "0.13.0"; src = fetchFromGitHub { owner = "tobixen"; repo = "calendar-cli"; rev = "v${version}"; - sha256 = "0qjld2m7hl3dx90491pqbjcja82c1f5gwx274kss4lkb8aw0kmlv"; + hash = "sha256-wGigrBl5PJL+fVfnFnHDJ5zyB+Rq3Fm+q9vMvLuBBys="; }; propagatedBuildInputs = with python3.pkgs; [ diff --git a/nixpkgs/pkgs/tools/networking/cbftp/default.nix b/nixpkgs/pkgs/tools/networking/cbftp/default.nix index e78b8a93dc67..5709acb02ddb 100644 --- a/nixpkgs/pkgs/tools/networking/cbftp/default.nix +++ b/nixpkgs/pkgs/tools/networking/cbftp/default.nix @@ -21,6 +21,8 @@ stdenv.mkDerivation rec { dontConfigure = true; + makeFlags = lib.optional stdenv.isDarwin "OPTFLAGS=-O0"; + installPhase = '' runHook preInstall diff --git a/nixpkgs/pkgs/tools/networking/cdpr/default.nix b/nixpkgs/pkgs/tools/networking/cdpr/default.nix index 6ac69b95dba6..0b92fd7aa45c 100644 --- a/nixpkgs/pkgs/tools/networking/cdpr/default.nix +++ b/nixpkgs/pkgs/tools/networking/cdpr/default.nix @@ -9,6 +9,10 @@ stdenv.mkDerivation rec { sha256 = "1idyvyafkk0ifcbi7mc65b60qia6hpsdb6s66j4ggqp7if6vblrj"; }; + postPatch = '' + substituteInPlace Makefile --replace 'gcc' '"$$CC"' + ''; + buildInputs = [ libpcap ]; installPhase = '' diff --git a/nixpkgs/pkgs/tools/networking/checkip/default.nix b/nixpkgs/pkgs/tools/networking/checkip/default.nix index b379a1725de9..94d83b9f3981 100644 --- a/nixpkgs/pkgs/tools/networking/checkip/default.nix +++ b/nixpkgs/pkgs/tools/networking/checkip/default.nix @@ -5,21 +5,16 @@ buildGoModule rec { pname = "checkip"; - version = "0.2.2"; + version = "0.16.2"; src = fetchFromGitHub { owner = "jreisinger"; repo = pname; rev = "v${version}"; - sha256 = "065426z4iak72h56qvp1vk86r2vw5rdqy3qi1zbw1l0hnyq83zwq"; + sha256 = "sha256-ktAb5kUwEE4xCgsuj0gO4jP6EybOBLjdlskUF/zwrqU="; }; - vendorSha256 = "10hk2wfkpvnavs20q390qgaj1gj10j1fy8vlqb9s9f76gpb130h4"; - - postFixup = '' - # Rename binary - mv $out/bin/cmd $out/bin/${pname} - ''; + vendorSha256 = "sha256-4XA7B0gmFE52VoKiPLsa0urPS7IdzrTBXuU4wZv/Lag="; # Requires network doCheck = false; diff --git a/nixpkgs/pkgs/tools/networking/chrony/default.nix b/nixpkgs/pkgs/tools/networking/chrony/default.nix index 24968c64a093..cff2d4df8e86 100644 --- a/nixpkgs/pkgs/tools/networking/chrony/default.nix +++ b/nixpkgs/pkgs/tools/networking/chrony/default.nix @@ -5,11 +5,11 @@ assert stdenv.isLinux -> libcap != null; stdenv.mkDerivation rec { pname = "chrony"; - version = "4.1"; + version = "4.2"; src = fetchurl { url = "https://download.tuxfamily.org/chrony/${pname}-${version}.tar.gz"; - sha256 = "sha256-7Xby0/k0esYiGpGtS9VT3QVlrBiM10kNCAHQj3FxFkw="; + sha256 = "sha256-Jz+f0Vwyjtbzpfa6a67DWkIaNKc7tyVgUymxcSBI25o="; }; postPatch = '' @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { hardeningEnable = [ "pie" ]; - configureFlags = [ "--chronyvardir=$(out)/var/lib/chrony" ] + configureFlags = [ "--chronyvardir=$(out)/var/lib/chrony" "--enable-ntp-signd" ] ++ lib.optional stdenv.isLinux "--enable-scfilter"; meta = with lib; { diff --git a/nixpkgs/pkgs/tools/networking/cjdns/default.nix b/nixpkgs/pkgs/tools/networking/cjdns/default.nix index 474c9d59c9e5..b68eaeabd633 100644 --- a/nixpkgs/pkgs/tools/networking/cjdns/default.nix +++ b/nixpkgs/pkgs/tools/networking/cjdns/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, nodejs, which, python27, util-linux, nixosTests }: +{ lib, stdenv, fetchFromGitHub, nodejs, which, python3, util-linux, nixosTests }: stdenv.mkDerivation rec { pname = "cjdns"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "NOmk+vMZ8i0E2MjrUzksk+tkJ9XVVNEXlE5OOTNa+Y0="; }; - buildInputs = [ which python27 nodejs ] ++ + buildInputs = [ which python3 nodejs ] ++ # for flock lib.optional stdenv.isLinux util-linux; @@ -21,12 +21,8 @@ stdenv.mkDerivation rec { + "bash do"; installPhase = '' install -Dt "$out/bin/" cjdroute makekeys privatetopublic publictoip6 - sed -i 's,/usr/bin/env node,'$(type -P node), \ - $(find contrib -name "*.js") - sed -i 's,/usr/bin/env python,'$(type -P python), \ - $(find contrib -type f) mkdir -p $out/share/cjdns - cp -R contrib tools node_build node_modules $out/share/cjdns/ + cp -R tools node_build node_modules $out/share/cjdns/ ''; passthru.tests.basic = nixosTests.cjdns; diff --git a/nixpkgs/pkgs/tools/networking/cnping/default.nix b/nixpkgs/pkgs/tools/networking/cnping/default.nix new file mode 100644 index 000000000000..0a7aed4fcb5d --- /dev/null +++ b/nixpkgs/pkgs/tools/networking/cnping/default.nix @@ -0,0 +1,32 @@ +{ lib, stdenv, fetchFromGitHub, libglvnd, xorg }: + +stdenv.mkDerivation rec { + pname = "cnping"; + version = "unstable-2021-04-04"; + + src = fetchFromGitHub { + owner = "cntools"; + repo = "cnping"; + rev = "6b89363e6b79ecbf612306d42a8ef94a5a2f756a"; + sha256 = "sha256-E3Wm5or6C4bHq7YoyaEbtDwyd+tDVYUOMeQrprlmL4A="; + fetchSubmodules = true; + }; + + buildInputs = [ libglvnd xorg.libXinerama xorg.libXext xorg.libX11 ]; + + # The "linuxinstall" target won't work for us: + # it tries to setcap and copy to a FHS directory + installPhase = '' + mkdir -p $out/{bin,share/man/man1} + cp cnping $out/bin/cnping + cp cnping.1 $out/share/man/man1/cnping.1 + ''; + + meta = with lib; { + description = "Minimal Graphical IPV4 Ping Tool"; + homepage = "https://github.com/cntools/cnping"; + license = with licenses; [ mit bsd3 ]; # dual licensed, MIT-x11 & BSD-3-Clause + maintainers = with maintainers; [ ckie ]; + platforms = platforms.linux; + }; +} diff --git a/nixpkgs/pkgs/tools/networking/connman/connman.nix b/nixpkgs/pkgs/tools/networking/connman/connman.nix index 3ec9bce0b4c7..c92cceeabc6f 100644 --- a/nixpkgs/pkgs/tools/networking/connman/connman.nix +++ b/nixpkgs/pkgs/tools/networking/connman/connman.nix @@ -1,5 +1,6 @@ { lib, stdenv , fetchurl +, fetchpatch , pkg-config , file , glib @@ -61,23 +62,31 @@ stdenv.mkDerivation rec { sha256 = "sha256-GleufOI0qjoXRKrDvlwhIdmNzpmUQO+KucxO39XtyxI="; }; + patches = lib.optionals stdenv.hostPlatform.isMusl [ + # Fix Musl build by avoiding a Glibc-only API. + (fetchpatch { + url = "https://git.alpinelinux.org/aports/plain/community/connman/libresolv.patch?id=e393ea84386878cbde3cccadd36a30396e357d1e"; + sha256 = "1kg2nml7pdxc82h5hgsa3npvzdxy4d2jpz2f93pa97if868i8d43"; + }) + ]; + buildInputs = [ glib dbus libmnl gnutls readline - ] ++ optionals (enableOpenconnect) [ openconnect ]; + ] ++ optionals (enableOpenconnect) [ openconnect ] + ++ optionals (firewallType == "iptables") [ iptables ] + ++ optionals (firewallType == "nftables") [ libnftnl ] + ++ optionals (enablePolkit) [ polkit ] + ++ optionals (enablePptp) [ pptp ppp ] + ; nativeBuildInputs = [ pkg-config file - ] - ++ optionals (enablePolkit) [ polkit ] - ++ optionals (enablePptp) [ pptp ppp ] - ++ optionals (firewallType == "iptables") [ iptables ] - ++ optionals (firewallType == "nftables") [ libnftnl ] - ; + ]; # fix invalid path to 'file' postPatch = '' diff --git a/nixpkgs/pkgs/tools/networking/connman/connman_dmenu/default.nix b/nixpkgs/pkgs/tools/networking/connman/connman_dmenu/default.nix index 3ac730f471f7..86e5a62fb8de 100644 --- a/nixpkgs/pkgs/tools/networking/connman/connman_dmenu/default.nix +++ b/nixpkgs/pkgs/tools/networking/connman/connman_dmenu/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation { pname = "connman_dmenu"; - version = "git-29-9-2015"; + version = "unstable-2015-09-29"; src = fetchFromGitHub { owner = "march-linux"; @@ -26,10 +26,10 @@ stdenv.mkDerivation { ''; meta = { - description = "A dmenu wrapper for connmann"; - homepage = "https://github.com/march-linux/connman_dmenu"; - license = lib.licenses.free; - maintainers = [ lib.maintainers.magnetophon ]; - platforms = lib.platforms.all; + description = "A dmenu wrapper for connmann"; + homepage = "https://github.com/march-linux/connman_dmenu"; + license = lib.licenses.free; + maintainers = [ lib.maintainers.magnetophon ]; + platforms = lib.platforms.all; }; } diff --git a/nixpkgs/pkgs/tools/networking/croc/default.nix b/nixpkgs/pkgs/tools/networking/croc/default.nix index 8c9e1bcdf0f7..57b2f8be52c6 100644 --- a/nixpkgs/pkgs/tools/networking/croc/default.nix +++ b/nixpkgs/pkgs/tools/networking/croc/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "croc"; - version = "9.4.2"; + version = "9.5.0"; src = fetchFromGitHub { owner = "schollz"; repo = pname; rev = "v${version}"; - sha256 = "sha256-aB3jYQKyqfaQBcCbFbN8ZIfosyLy+bX6SJF+iiT2ELQ="; + sha256 = "sha256-BgUurfzgezbbH0pCTuRINocc5y6ANCM91VlWht86QeE="; }; - vendorSha256 = "sha256-bsggZ6e9a7tq0jgOpqIRgfj4FUu/krLWuLBZjaialO0="; + vendorSha256 = "sha256-MstlmaMEbbAY9+h5pNVCXqDOqoSv5hjuRSFS/MTg6lo="; doCheck = false; diff --git a/nixpkgs/pkgs/tools/networking/curl/7.79.1-darwin-no-systemconfiguration.patch b/nixpkgs/pkgs/tools/networking/curl/7.79.1-darwin-no-systemconfiguration.patch new file mode 100644 index 000000000000..eddc282dd87b --- /dev/null +++ b/nixpkgs/pkgs/tools/networking/curl/7.79.1-darwin-no-systemconfiguration.patch @@ -0,0 +1,52 @@ +On darwin, providing SystemConfiguration to curl currently results in a +reference loop, so we have to disable the check for it and the feature +which requires it (NAT64). + +Patching actual configure script here as we also don't want to require +autoconf in the bootstrap loop just to regenerate a patched configure.ac. + +--- a/configure 2021-10-16 00:51:59.000000000 +0100 ++++ b/configure 2021-10-16 01:06:46.000000000 +0100 +@@ -20810,7 +20810,7 @@ + if test "x$build_for_macos" != xno; then + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 + printf "%s\n" "yes" >&6; } +- LDFLAGS="$LDFLAGS -framework CoreFoundation -framework SystemConfiguration" ++ LDFLAGS="$LDFLAGS -framework CoreFoundation" + else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 + printf "%s\n" "no" >&6; } +@@ -22211,9 +22211,6 @@ + fi + + +-if test "$HAVE_GETHOSTBYNAME" != "1"; then +- as_fn_error $? "couldn't find libraries for gethostbyname()" "$LINENO" 5 +-fi + + + curl_includes_winsock2="\ +diff --git a/lib/curl_setup.h b/lib/curl_setup.h +index 99048c489..19abfbbac 100644 +--- a/lib/curl_setup.h ++++ b/lib/curl_setup.h +@@ -247,19 +247,6 @@ + # include "setup-win32.h" + #endif + +-/* +- * Use getaddrinfo to resolve the IPv4 address literal. If the current network +- * interface doesn't support IPv4, but supports IPv6, NAT64, and DNS64, +- * performing this task will result in a synthesized IPv6 address. +- */ +-#if defined(__APPLE__) && !defined(USE_ARES) +-#include <TargetConditionals.h> +-#define USE_RESOLVE_ON_IPS 1 +-# if defined(TARGET_OS_OSX) && TARGET_OS_OSX +-# define CURL_OSX_CALL_COPYPROXIES 1 +-# endif +-#endif +- + #ifdef USE_LWIPSOCK + # include <lwip/init.h> + # include <lwip/sockets.h> diff --git a/nixpkgs/pkgs/tools/networking/curl/CVE-2021-22897.patch b/nixpkgs/pkgs/tools/networking/curl/CVE-2021-22897.patch deleted file mode 100644 index a48888795036..000000000000 --- a/nixpkgs/pkgs/tools/networking/curl/CVE-2021-22897.patch +++ /dev/null @@ -1,64 +0,0 @@ -From bbb71507b7bab52002f9b1e0880bed6a32834511 Mon Sep 17 00:00:00 2001 -From: Daniel Stenberg <daniel@haxx.se> -Date: Fri, 23 Apr 2021 10:54:10 +0200 -Subject: [PATCH] schannel: don't use static to store selected ciphers - -CVE-2021-22897 - -Bug: https://curl.se/docs/CVE-2021-22897.html ---- - lib/vtls/schannel.c | 9 +++++---- - lib/vtls/schannel.h | 3 +++ - 2 files changed, 8 insertions(+), 4 deletions(-) - -diff --git a/lib/vtls/schannel.c b/lib/vtls/schannel.c -index 8c25ac5dd5a5..dba7072273a9 100644 ---- a/lib/vtls/schannel.c -+++ b/lib/vtls/schannel.c -@@ -328,12 +328,12 @@ get_alg_id_by_name(char *name) - } - - static CURLcode --set_ssl_ciphers(SCHANNEL_CRED *schannel_cred, char *ciphers) -+set_ssl_ciphers(SCHANNEL_CRED *schannel_cred, char *ciphers, -+ int *algIds) - { - char *startCur = ciphers; - int algCount = 0; -- static ALG_ID algIds[45]; /*There are 45 listed in the MS headers*/ -- while(startCur && (0 != *startCur) && (algCount < 45)) { -+ while(startCur && (0 != *startCur) && (algCount < NUMOF_CIPHERS)) { - long alg = strtol(startCur, 0, 0); - if(!alg) - alg = get_alg_id_by_name(startCur); -@@ -593,7 +593,8 @@ schannel_connect_step1(struct Curl_easy *data, struct connectdata *conn, - } - - if(SSL_CONN_CONFIG(cipher_list)) { -- result = set_ssl_ciphers(&schannel_cred, SSL_CONN_CONFIG(cipher_list)); -+ result = set_ssl_ciphers(&schannel_cred, SSL_CONN_CONFIG(cipher_list), -+ BACKEND->algIds); - if(CURLE_OK != result) { - failf(data, "Unable to set ciphers to passed via SSL_CONN_CONFIG"); - return result; -diff --git a/lib/vtls/schannel.h b/lib/vtls/schannel.h -index 2952caa1a5a1..77853aa30f96 100644 ---- a/lib/vtls/schannel.h -+++ b/lib/vtls/schannel.h -@@ -71,6 +71,8 @@ CURLcode Curl_verify_certificate(struct Curl_easy *data, - #endif - #endif - -+#define NUMOF_CIPHERS 45 /* There are 45 listed in the MS headers */ -+ - struct Curl_schannel_cred { - CredHandle cred_handle; - TimeStamp time_stamp; -@@ -102,6 +104,7 @@ struct ssl_backend_data { - #ifdef HAS_MANUAL_VERIFY_API - bool use_manual_cred_validation; /* true if manual cred validation is used */ - #endif -+ ALG_ID algIds[NUMOF_CIPHERS]; - }; - #endif /* EXPOSE_SCHANNEL_INTERNAL_STRUCTS */ - diff --git a/nixpkgs/pkgs/tools/networking/curl/CVE-2021-22898.patch b/nixpkgs/pkgs/tools/networking/curl/CVE-2021-22898.patch deleted file mode 100644 index ea4d2cb37e87..000000000000 --- a/nixpkgs/pkgs/tools/networking/curl/CVE-2021-22898.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 39ce47f219b09c380b81f89fe54ac586c8db6bde Mon Sep 17 00:00:00 2001 -From: Harry Sintonen <sintonen@iki.fi> -Date: Fri, 7 May 2021 13:09:57 +0200 -Subject: [PATCH] telnet: check sscanf() for correct number of matches - -CVE-2021-22898 - -Bug: https://curl.se/docs/CVE-2021-22898.html ---- - lib/telnet.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/lib/telnet.c b/lib/telnet.c -index 26e0658ba9cc..fdd137fb0c04 100644 ---- a/lib/telnet.c -+++ b/lib/telnet.c -@@ -922,7 +922,7 @@ static void suboption(struct Curl_easy *data) - size_t tmplen = (strlen(v->data) + 1); - /* Add the variable only if it fits */ - if(len + tmplen < (int)sizeof(temp)-6) { -- if(sscanf(v->data, "%127[^,],%127s", varname, varval)) { -+ if(sscanf(v->data, "%127[^,],%127s", varname, varval) == 2) { - msnprintf((char *)&temp[len], sizeof(temp) - len, - "%c%s%c%s", CURL_NEW_ENV_VAR, varname, - CURL_NEW_ENV_VALUE, varval); diff --git a/nixpkgs/pkgs/tools/networking/curl/CVE-2021-22901.patch b/nixpkgs/pkgs/tools/networking/curl/CVE-2021-22901.patch deleted file mode 100644 index 6bd70aa41b1e..000000000000 --- a/nixpkgs/pkgs/tools/networking/curl/CVE-2021-22901.patch +++ /dev/null @@ -1,437 +0,0 @@ -Based on upstream 7f4a9a9b2a49547eae24d2e19bc5c346e9026479, modified by ris to -apply without 0c55fbab45bedb761766109d41c3da49c4bc66c6 - -diff --git a/lib/multi.c b/lib/multi.c -index 54365f399e9b..1b3e261c682a 100644 ---- a/lib/multi.c -+++ b/lib/multi.c -@@ -878,8 +878,10 @@ bool Curl_multiplex_wanted(const struct Curl_multi *multi) - void Curl_detach_connnection(struct Curl_easy *data) - { - struct connectdata *conn = data->conn; -- if(conn) -+ if(conn) { - Curl_llist_remove(&conn->easyq, &data->conn_queue, NULL); -+ Curl_ssl_detach_conn(data, conn); -+ } - data->conn = NULL; - } - -@@ -896,6 +898,7 @@ void Curl_attach_connnection(struct Curl_easy *data, - data->conn = conn; - Curl_llist_insert_next(&conn->easyq, conn->easyq.tail, data, - &data->conn_queue); -+ Curl_ssl_associate_conn(data, conn); - } - - static int waitconnect_getsock(struct connectdata *conn, -diff --git a/lib/vtls/gskit.c b/lib/vtls/gskit.c -index c648f624579b..ca953769d1ba 100644 ---- a/lib/vtls/gskit.c -+++ b/lib/vtls/gskit.c -@@ -1304,7 +1304,9 @@ const struct Curl_ssl Curl_ssl_gskit = { - Curl_none_set_engine_default, /* set_engine_default */ - Curl_none_engines_list, /* engines_list */ - Curl_none_false_start, /* false_start */ -- NULL /* sha256sum */ -+ NULL, /* sha256sum */ -+ NULL, /* associate_connection */ -+ NULL /* disassociate_connection */ - }; - - #endif /* USE_GSKIT */ -diff --git a/lib/vtls/gtls.c b/lib/vtls/gtls.c -index a10c0dbcca05..ecde5c44deeb 100644 ---- a/lib/vtls/gtls.c -+++ b/lib/vtls/gtls.c -@@ -1656,7 +1656,9 @@ const struct Curl_ssl Curl_ssl_gnutls = { - Curl_none_set_engine_default, /* set_engine_default */ - Curl_none_engines_list, /* engines_list */ - Curl_none_false_start, /* false_start */ -- gtls_sha256sum /* sha256sum */ -+ gtls_sha256sum, /* sha256sum */ -+ NULL, /* associate_connection */ -+ NULL /* disassociate_connection */ - }; - - #endif /* USE_GNUTLS */ -diff --git a/lib/vtls/mbedtls.c b/lib/vtls/mbedtls.c -index ca77de58667c..3a0be0f04b4f 100644 ---- a/lib/vtls/mbedtls.c -+++ b/lib/vtls/mbedtls.c -@@ -1093,7 +1093,9 @@ const struct Curl_ssl Curl_ssl_mbedtls = { - Curl_none_set_engine_default, /* set_engine_default */ - Curl_none_engines_list, /* engines_list */ - Curl_none_false_start, /* false_start */ -- mbedtls_sha256sum /* sha256sum */ -+ mbedtls_sha256sum, /* sha256sum */ -+ NULL, /* associate_connection */ -+ NULL /* disassociate_connection */ - }; - - #endif /* USE_MBEDTLS */ -diff --git a/lib/vtls/mesalink.c b/lib/vtls/mesalink.c -index f16c77c27fe0..bf8600d3230b 100644 ---- a/lib/vtls/mesalink.c -+++ b/lib/vtls/mesalink.c -@@ -666,7 +666,9 @@ const struct Curl_ssl Curl_ssl_mesalink = { - Curl_none_set_engine_default, /* set_engine_default */ - Curl_none_engines_list, /* engines_list */ - Curl_none_false_start, /* false_start */ -- NULL /* sha256sum */ -+ NULL, /* sha256sum */ -+ NULL, /* associate_connection */ -+ NULL /* disassociate_connection */ - }; - - #endif -diff --git a/lib/vtls/nss.c b/lib/vtls/nss.c -index 2aa4bdaa134f..1582b1e580a9 100644 ---- a/lib/vtls/nss.c -+++ b/lib/vtls/nss.c -@@ -2465,7 +2465,9 @@ const struct Curl_ssl Curl_ssl_nss = { - Curl_none_set_engine_default, /* set_engine_default */ - Curl_none_engines_list, /* engines_list */ - nss_false_start, /* false_start */ -- nss_sha256sum /* sha256sum */ -+ nss_sha256sum, /* sha256sum */ -+ NULL, /* associate_connection */ -+ NULL /* disassociate_connection */ - }; - - #endif /* USE_NSS */ -diff --git a/lib/vtls/openssl.c b/lib/vtls/openssl.c -index 1521600dd5f6..ebd7abc3b4ac 100644 ---- a/lib/vtls/openssl.c -+++ b/lib/vtls/openssl.c -@@ -240,6 +240,10 @@ struct ssl_backend_data { - #endif - }; - -+static void ossl_associate_connection(struct Curl_easy *data, -+ struct connectdata *conn, -+ int sockindex); -+ - /* - * Number of bytes to read from the random number seed file. This must be - * a finite value (because some entropy "files" like /dev/urandom have -@@ -2581,6 +2585,7 @@ static CURLcode ossl_connect_step1(struct Curl_easy *data, - curl_socket_t sockfd = conn->sock[sockindex]; - struct ssl_connect_data *connssl = &conn->ssl[sockindex]; - ctx_option_t ctx_options = 0; -+ void *ssl_sessionid = NULL; - - #ifdef SSL_CTRL_SET_TLSEXT_HOSTNAME - bool sni; -@@ -3225,46 +3230,23 @@ static CURLcode ossl_connect_step1(struct Curl_easy *data, - } - #endif - -- /* Check if there's a cached ID we can/should use here! */ -- if(SSL_SET_OPTION(primary.sessionid)) { -- void *ssl_sessionid = NULL; -- int data_idx = ossl_get_ssl_data_index(); -- int connectdata_idx = ossl_get_ssl_conn_index(); -- int sockindex_idx = ossl_get_ssl_sockindex_index(); -- int proxy_idx = ossl_get_proxy_index(); -- -- if(data_idx >= 0 && connectdata_idx >= 0 && sockindex_idx >= 0 && -- proxy_idx >= 0) { -- /* Store the data needed for the "new session" callback. -- * The sockindex is stored as a pointer to an array element. */ -- SSL_set_ex_data(backend->handle, data_idx, data); -- SSL_set_ex_data(backend->handle, connectdata_idx, conn); -- SSL_set_ex_data(backend->handle, sockindex_idx, conn->sock + sockindex); --#ifndef CURL_DISABLE_PROXY -- SSL_set_ex_data(backend->handle, proxy_idx, SSL_IS_PROXY() ? (void *) 1: -- NULL); --#else -- SSL_set_ex_data(backend->handle, proxy_idx, NULL); --#endif -- -- } -+ ossl_associate_connection(data, conn, sockindex); - -- Curl_ssl_sessionid_lock(data); -- if(!Curl_ssl_getsessionid(data, conn, SSL_IS_PROXY() ? TRUE : FALSE, -- &ssl_sessionid, NULL, sockindex)) { -- /* we got a session id, use it! */ -- if(!SSL_set_session(backend->handle, ssl_sessionid)) { -- Curl_ssl_sessionid_unlock(data); -- failf(data, "SSL: SSL_set_session failed: %s", -- ossl_strerror(ERR_get_error(), error_buffer, -- sizeof(error_buffer))); -- return CURLE_SSL_CONNECT_ERROR; -- } -- /* Informational message */ -- infof(data, "SSL re-using session ID\n"); -+ Curl_ssl_sessionid_lock(data); -+ if(!Curl_ssl_getsessionid(data, conn, SSL_IS_PROXY() ? TRUE : FALSE, -+ &ssl_sessionid, NULL, sockindex)) { -+ /* we got a session id, use it! */ -+ if(!SSL_set_session(backend->handle, ssl_sessionid)) { -+ Curl_ssl_sessionid_unlock(data); -+ failf(data, "SSL: SSL_set_session failed: %s", -+ ossl_strerror(ERR_get_error(), error_buffer, -+ sizeof(error_buffer))); -+ return CURLE_SSL_CONNECT_ERROR; - } -- Curl_ssl_sessionid_unlock(data); -+ /* Informational message */ -+ infof(data, "SSL re-using session ID\n"); - } -+ Curl_ssl_sessionid_unlock(data); - - #ifndef CURL_DISABLE_PROXY - if(conn->proxy_ssl[sockindex].use) { -@@ -4498,6 +4480,90 @@ static void *ossl_get_internals(struct ssl_connect_data *connssl, - (void *)backend->ctx : (void *)backend->handle; - } - -+static void ossl_associate_connection(struct Curl_easy *data, -+ struct connectdata *conn, -+ int sockindex) -+{ -+ struct ssl_connect_data *connssl = &conn->ssl[sockindex]; -+ struct ssl_backend_data *backend = connssl->backend; -+ -+ /* If we don't have SSL context, do nothing. */ -+ if(!backend->handle) -+ return; -+ -+ if(SSL_SET_OPTION(primary.sessionid)) { -+ int data_idx = ossl_get_ssl_data_index(); -+ int connectdata_idx = ossl_get_ssl_conn_index(); -+ int sockindex_idx = ossl_get_ssl_sockindex_index(); -+ int proxy_idx = ossl_get_proxy_index(); -+ -+ if(data_idx >= 0 && connectdata_idx >= 0 && sockindex_idx >= 0 && -+ proxy_idx >= 0) { -+ /* Store the data needed for the "new session" callback. -+ * The sockindex is stored as a pointer to an array element. */ -+ SSL_set_ex_data(backend->handle, data_idx, data); -+ SSL_set_ex_data(backend->handle, connectdata_idx, conn); -+ SSL_set_ex_data(backend->handle, sockindex_idx, conn->sock + sockindex); -+#ifndef CURL_DISABLE_PROXY -+ SSL_set_ex_data(backend->handle, proxy_idx, SSL_IS_PROXY() ? (void *) 1: -+ NULL); -+#else -+ SSL_set_ex_data(backend->handle, proxy_idx, NULL); -+#endif -+ } -+ } -+} -+ -+/* -+ * Starting with TLS 1.3, the ossl_new_session_cb callback gets called after -+ * the handshake. If the transfer that sets up the callback gets killed before -+ * this callback arrives, we must make sure to properly clear the data to -+ * avoid UAF problems. A future optimization could be to instead store another -+ * transfer that might still be using the same connection. -+ */ -+ -+static void ossl_disassociate_connection(struct Curl_easy *data, -+ int sockindex) -+{ -+ struct connectdata *conn = data->conn; -+ struct ssl_connect_data *connssl = &conn->ssl[sockindex]; -+ struct ssl_backend_data *backend = connssl->backend; -+ -+ /* If we don't have SSL context, do nothing. */ -+ if(!backend->handle) -+ return; -+ -+ if(SSL_SET_OPTION(primary.sessionid)) { -+ bool isproxy = FALSE; -+ bool incache; -+ void *old_ssl_sessionid = NULL; -+ int data_idx = ossl_get_ssl_data_index(); -+ int connectdata_idx = ossl_get_ssl_conn_index(); -+ int sockindex_idx = ossl_get_ssl_sockindex_index(); -+ int proxy_idx = ossl_get_proxy_index(); -+ -+ if(data_idx >= 0 && connectdata_idx >= 0 && sockindex_idx >= 0 && -+ proxy_idx >= 0) { -+ /* Invalidate the session cache entry, if any */ -+ isproxy = SSL_get_ex_data(backend->handle, proxy_idx) ? TRUE : FALSE; -+ -+ /* Disable references to data in "new session" callback to avoid -+ * accessing a stale pointer. */ -+ SSL_set_ex_data(backend->handle, data_idx, NULL); -+ SSL_set_ex_data(backend->handle, connectdata_idx, NULL); -+ SSL_set_ex_data(backend->handle, sockindex_idx, NULL); -+ SSL_set_ex_data(backend->handle, proxy_idx, NULL); -+ } -+ -+ Curl_ssl_sessionid_lock(data); -+ incache = !(Curl_ssl_getsessionid(data, conn, isproxy, -+ &old_ssl_sessionid, NULL, sockindex)); -+ if(incache) -+ Curl_ssl_delsessionid(data, old_ssl_sessionid); -+ Curl_ssl_sessionid_unlock(data); -+ } -+} -+ - const struct Curl_ssl Curl_ssl_openssl = { - { CURLSSLBACKEND_OPENSSL, "openssl" }, /* info */ - -@@ -4533,10 +4599,12 @@ const struct Curl_ssl Curl_ssl_openssl = { - ossl_engines_list, /* engines_list */ - Curl_none_false_start, /* false_start */ - #if (OPENSSL_VERSION_NUMBER >= 0x0090800fL) && !defined(OPENSSL_NO_SHA256) -- ossl_sha256sum /* sha256sum */ -+ ossl_sha256sum, /* sha256sum */ - #else -- NULL /* sha256sum */ -+ NULL, /* sha256sum */ - #endif -+ ossl_associate_connection, /* associate_connection */ -+ ossl_disassociate_connection /* disassociate_connection */ - }; - - #endif /* USE_OPENSSL */ -diff --git a/lib/vtls/rustls.c b/lib/vtls/rustls.c -index 9dfbd2c3c4c2..161f3bf51d75 100644 ---- a/lib/vtls/rustls.c -+++ b/lib/vtls/rustls.c -@@ -604,7 +604,9 @@ const struct Curl_ssl Curl_ssl_rustls = { - Curl_none_set_engine_default, /* set_engine_default */ - Curl_none_engines_list, /* engines_list */ - Curl_none_false_start, /* false_start */ -- NULL /* sha256sum */ -+ NULL, /* sha256sum */ -+ NULL, /* associate_connection */ -+ NULL /* disassociate_connection */ - }; - - #endif /* USE_RUSTLS */ -diff --git a/lib/vtls/schannel.c b/lib/vtls/schannel.c -index dba7072273a9..2bcf11db2576 100644 ---- a/lib/vtls/schannel.c -+++ b/lib/vtls/schannel.c -@@ -329,7 +329,7 @@ get_alg_id_by_name(char *name) - - static CURLcode - set_ssl_ciphers(SCHANNEL_CRED *schannel_cred, char *ciphers, -- int *algIds) -+ ALG_ID *algIds) - { - char *startCur = ciphers; - int algCount = 0; -@@ -2433,7 +2433,9 @@ const struct Curl_ssl Curl_ssl_schannel = { - Curl_none_set_engine_default, /* set_engine_default */ - Curl_none_engines_list, /* engines_list */ - Curl_none_false_start, /* false_start */ -- schannel_sha256sum /* sha256sum */ -+ schannel_sha256sum, /* sha256sum */ -+ NULL, /* associate_connection */ -+ NULL /* disassociate_connection */ - }; - - #endif /* USE_SCHANNEL */ -diff --git a/lib/vtls/sectransp.c b/lib/vtls/sectransp.c -index 4276b89cfb3a..8b1e84ed7715 100644 ---- a/lib/vtls/sectransp.c -+++ b/lib/vtls/sectransp.c -@@ -3453,6 +3453,8 @@ const struct Curl_ssl Curl_ssl_sectransp = { - Curl_none_engines_list, /* engines_list */ - sectransp_false_start, /* false_start */ - sectransp_sha256sum /* sha256sum */ -+ NULL, /* associate_connection */ -+ NULL /* disassociate_connection */ - }; - - #ifdef __clang__ -diff --git a/lib/vtls/vtls.c b/lib/vtls/vtls.c -index d63fd5c76386..65f4f773dd63 100644 ---- a/lib/vtls/vtls.c -+++ b/lib/vtls/vtls.c -@@ -586,6 +586,25 @@ CURLcode Curl_ssl_addsessionid(struct Curl_easy *data, - return CURLE_OK; - } - -+void Curl_ssl_associate_conn(struct Curl_easy *data, -+ struct connectdata *conn) -+{ -+ if(Curl_ssl->associate_connection) { -+ Curl_ssl->associate_connection(data, conn, FIRSTSOCKET); -+ if(conn->sock[SECONDARYSOCKET] && conn->bits.sock_accepted) -+ Curl_ssl->associate_connection(data, conn, SECONDARYSOCKET); -+ } -+} -+ -+void Curl_ssl_detach_conn(struct Curl_easy *data, -+ struct connectdata *conn) -+{ -+ if(Curl_ssl->disassociate_connection) { -+ Curl_ssl->disassociate_connection(data, FIRSTSOCKET); -+ if(conn->sock[SECONDARYSOCKET] && conn->bits.sock_accepted) -+ Curl_ssl->disassociate_connection(data, SECONDARYSOCKET); -+ } -+} - - void Curl_ssl_close_all(struct Curl_easy *data) - { -@@ -1214,7 +1233,9 @@ static const struct Curl_ssl Curl_ssl_multi = { - Curl_none_set_engine_default, /* set_engine_default */ - Curl_none_engines_list, /* engines_list */ - Curl_none_false_start, /* false_start */ -- NULL /* sha256sum */ -+ NULL, /* sha256sum */ -+ NULL, /* associate_connection */ -+ NULL /* disassociate_connection */ - }; - - const struct Curl_ssl *Curl_ssl = -diff --git a/lib/vtls/vtls.h b/lib/vtls/vtls.h -index a22d526ca810..7f93e7aedb21 100644 ---- a/lib/vtls/vtls.h -+++ b/lib/vtls/vtls.h -@@ -84,6 +84,11 @@ struct Curl_ssl { - bool (*false_start)(void); - CURLcode (*sha256sum)(const unsigned char *input, size_t inputlen, - unsigned char *sha256sum, size_t sha256sumlen); -+ -+ void (*associate_connection)(struct Curl_easy *data, -+ struct connectdata *conn, -+ int sockindex); -+ void (*disassociate_connection)(struct Curl_easy *data, int sockindex); - }; - - #ifdef USE_SSL -@@ -283,6 +288,11 @@ bool Curl_ssl_cert_status_request(void); - - bool Curl_ssl_false_start(void); - -+void Curl_ssl_associate_conn(struct Curl_easy *data, -+ struct connectdata *conn); -+void Curl_ssl_detach_conn(struct Curl_easy *data, -+ struct connectdata *conn); -+ - #define SSL_SHUTDOWN_TIMEOUT 10000 /* ms */ - - #else /* if not USE_SSL */ -@@ -309,6 +319,8 @@ bool Curl_ssl_false_start(void); - #define Curl_ssl_cert_status_request() FALSE - #define Curl_ssl_false_start() FALSE - #define Curl_ssl_tls13_ciphersuites() FALSE -+#define Curl_ssl_associate_conn(a,b) Curl_nop_stmt -+#define Curl_ssl_detach_conn(a,b) Curl_nop_stmt - #endif - - #endif /* HEADER_CURL_VTLS_H */ -diff --git a/lib/vtls/wolfssl.c b/lib/vtls/wolfssl.c -index 02fcd236697e..60e27e366252 100644 ---- a/lib/vtls/wolfssl.c -+++ b/lib/vtls/wolfssl.c -@@ -1125,7 +1125,9 @@ const struct Curl_ssl Curl_ssl_wolfssl = { - Curl_none_set_engine_default, /* set_engine_default */ - Curl_none_engines_list, /* engines_list */ - Curl_none_false_start, /* false_start */ -- wolfssl_sha256sum /* sha256sum */ -+ wolfssl_sha256sum, /* sha256sum */ -+ NULL, /* associate_connection */ -+ NULL /* disassociate_connection */ - }; - - #endif diff --git a/nixpkgs/pkgs/tools/networking/curl/default.nix b/nixpkgs/pkgs/tools/networking/curl/default.nix index b3572e01c96d..a5abbc26a741 100644 --- a/nixpkgs/pkgs/tools/networking/curl/default.nix +++ b/nixpkgs/pkgs/tools/networking/curl/default.nix @@ -3,7 +3,7 @@ , idnSupport ? false, libidn ? null , ldapSupport ? false, openldap ? null , zlibSupport ? true, zlib ? null -, sslSupport ? zlibSupport, openssl ? null +, opensslSupport ? zlibSupport, openssl ? null , gnutlsSupport ? false, gnutls ? null , wolfsslSupport ? false, wolfssl ? null , scpSupport ? zlibSupport && !stdenv.isSunOS && !stdenv.isCygwin, libssh2 ? null @@ -30,10 +30,10 @@ assert http2Support -> nghttp2 != null; assert idnSupport -> libidn != null; assert ldapSupport -> openldap != null; assert zlibSupport -> zlib != null; -assert sslSupport -> openssl != null; -assert !(gnutlsSupport && sslSupport); +assert opensslSupport -> openssl != null; +assert !(gnutlsSupport && opensslSupport); assert !(gnutlsSupport && wolfsslSupport); -assert !(sslSupport && wolfsslSupport); +assert !(opensslSupport && wolfsslSupport); assert gnutlsSupport -> gnutls != null; assert wolfsslSupport -> wolfssl != null; assert scpSupport -> libssh2 != null; @@ -43,20 +43,18 @@ assert gssSupport -> libkrb5 != null; stdenv.mkDerivation rec { pname = "curl"; - version = "7.76.1"; + version = "7.80.0"; src = fetchurl { urls = [ "https://curl.haxx.se/download/${pname}-${version}.tar.bz2" "https://github.com/curl/curl/releases/download/${lib.replaceStrings ["."] ["_"] pname}-${version}/${pname}-${version}.tar.bz2" ]; - sha256 = "1scmfrp0c27pkd7yva9k50miprjpsyfbb33apx72qc9igm6ii3ks"; + sha256 = "170qb2w2p5fga0vqhhnzi417z4h4vy764sz16pzhm5fd9471a3fx"; }; patches = [ - ./CVE-2021-22897.patch - ./CVE-2021-22898.patch - ./CVE-2021-22901.patch + ./7.79.1-darwin-no-systemconfiguration.patch ]; outputs = [ "bin" "dev" "out" "man" "devdoc" ]; @@ -78,7 +76,7 @@ stdenv.mkDerivation rec { optional zlibSupport zlib ++ optional gssSupport libkrb5 ++ optional c-aresSupport c-ares ++ - optional sslSupport openssl ++ + optional opensslSupport openssl ++ optional gnutlsSupport gnutls ++ optional wolfsslSupport wolfssl ++ optional scpSupport libssh2 ++ @@ -98,17 +96,17 @@ stdenv.mkDerivation rec { # The build fails when using wolfssl with --with-ca-fallback (lib.withFeature (!wolfsslSupport) "ca-fallback") "--disable-manual" - (lib.withFeatureAs sslSupport "ssl" openssl.dev) - (lib.withFeatureAs gnutlsSupport "gnutls" gnutls.dev) - (lib.withFeatureAs scpSupport "libssh2" libssh2.dev) + (lib.withFeatureAs opensslSupport "openssl" (lib.getDev openssl)) + (lib.withFeatureAs gnutlsSupport "gnutls" (lib.getDev gnutls)) + (lib.withFeatureAs scpSupport "libssh2" (lib.getDev libssh2)) (lib.enableFeature ldapSupport "ldap") (lib.enableFeature ldapSupport "ldaps") - (lib.withFeatureAs idnSupport "libidn" libidn.dev) + (lib.withFeatureAs idnSupport "libidn" (lib.getDev libidn)) (lib.withFeature brotliSupport "brotli") ] - ++ lib.optional wolfsslSupport "--with-wolfssl=${wolfssl.dev}" + ++ lib.optional wolfsslSupport "--with-wolfssl=${lib.getDev wolfssl}" ++ lib.optional c-aresSupport "--enable-ares=${c-ares}" - ++ lib.optional gssSupport "--with-gssapi=${libkrb5.dev}" + ++ lib.optional gssSupport "--with-gssapi=${lib.getDev libkrb5}" # For the 'urandom', maybe it should be a cross-system option ++ lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) "--with-random=/dev/urandom" @@ -128,7 +126,7 @@ stdenv.mkDerivation rec { # Install completions make -C scripts install '' + lib.optionalString scpSupport '' - sed '/^dependency_libs/s|${libssh2.dev}|${libssh2.out}|' -i "$out"/lib/*.la + sed '/^dependency_libs/s|${lib.getDev libssh2}|${lib.getLib libssh2}|' -i "$out"/lib/*.la '' + lib.optionalString gnutlsSupport '' ln $out/lib/libcurl.so $out/lib/libcurl-gnutls.so ln $out/lib/libcurl.so $out/lib/libcurl-gnutls.so.4 @@ -136,12 +134,12 @@ stdenv.mkDerivation rec { ''; passthru = { - inherit sslSupport openssl; + inherit opensslSupport openssl; }; meta = with lib; { description = "A command line tool for transferring files with URL syntax"; - homepage = "https://curl.haxx.se/"; + homepage = "https://curl.se/"; license = licenses.curl; maintainers = with maintainers; [ lovek323 ]; platforms = platforms.all; diff --git a/nixpkgs/pkgs/tools/networking/curlie/default.nix b/nixpkgs/pkgs/tools/networking/curlie/default.nix index 9d3e4025a991..2e6683ef4ea3 100644 --- a/nixpkgs/pkgs/tools/networking/curlie/default.nix +++ b/nixpkgs/pkgs/tools/networking/curlie/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "curlie"; - version = "1.6.2"; + version = "1.6.7"; src= fetchFromGitHub { owner = "rs"; repo = pname; rev = "v${version}"; - sha256 = "sha256-2CZpqc1MnAY6M1UFakKLaqGjaifw+7bN4hxc0jWgSps="; + sha256 = "sha256-uWLJWhsqJaLji2JSuVX8Vu929AdozhtAPwsqXdpEt84="; }; vendorSha256 = "sha256-tYZtnD7RUurhl8yccXlTIvOxybBJITM+it1ollYJ1OI="; diff --git a/nixpkgs/pkgs/tools/networking/dd-agent/datadog-agent.nix b/nixpkgs/pkgs/tools/networking/dd-agent/datadog-agent.nix index 7f500b2c09fc..12ac37af7105 100644 --- a/nixpkgs/pkgs/tools/networking/dd-agent/datadog-agent.nix +++ b/nixpkgs/pkgs/tools/networking/dd-agent/datadog-agent.nix @@ -10,15 +10,15 @@ let in buildGoModule rec { pname = "datadog-agent"; - version = "7.30.2"; + version = "7.32.4"; src = fetchFromGitHub { inherit owner repo; rev = version; - sha256 = "17ahrxhb87sj7f04wg44xv4k9wrlvf04j92ac5936a6maygp01rd"; + sha256 = "sha256-/vHNxcJQb0QHwFq6lxsSh9zc+Bkhb2SUymI5jEzkjm4="; }; - vendorSha256 = "06ryy501vibc6n14qwg94394c76l060525y6qg261qb748mbi8qi"; + vendorSha256 = "sha256-LyXveLSa+p9GEzcKifTXweY8nJwPISwhboi8zBeBrMo="; subPackages = [ "cmd/agent" diff --git a/nixpkgs/pkgs/tools/networking/dhcp/default.nix b/nixpkgs/pkgs/tools/networking/dhcp/default.nix index 7df04ac0c895..10418d978105 100644 --- a/nixpkgs/pkgs/tools/networking/dhcp/default.nix +++ b/nixpkgs/pkgs/tools/networking/dhcp/default.nix @@ -24,6 +24,14 @@ stdenv.mkDerivation rec { url = "https://gitlab.isc.org/isc-projects/dhcp/-/commit/6c7e61578b1b449272dbb40dd8b98d03dad8a57a.patch"; sha256 = "1g37ix0yf9zza8ri8bg438ygcjviniblfyb20y4gzc8lysy28m8b"; }) + + # Fix parallel build failure, the patch is pending upstream inclusion: + # https://gitlab.isc.org/isc-projects/dhcp/-/merge_requests/76 + (fetchpatch { + name = "parallel-make.patch"; + url = "https://gitlab.isc.org/isc-projects/dhcp/-/commit/46d101b97c5a3b19a3f63f7b60e5f88994a64e22.patch"; + sha256 = "1y3nsmqjzcg4bhp1xmqp47v7rkl3bpcildkx6mlrg255yvxapmdp"; + }) ]; nativeBuildInputs = [ perl makeWrapper ]; @@ -43,7 +51,8 @@ stdenv.mkDerivation rec { "--sysconfdir=/etc" "--localstatedir=/var" ] ++ lib.optional stdenv.isLinux "--with-randomdev=/dev/random" - ++ lib.optionals (openldap != null) [ "--with-ldap" "--with-ldapcrypto" ]; + ++ lib.optionals (openldap != null) [ "--with-ldap" "--with-ldapcrypto" ] + ++ lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) "BUILD_CC=$(CC_FOR_BUILD)"; NIX_CFLAGS_COMPILE = builtins.toString [ "-Wno-error=pointer-compare" @@ -79,6 +88,8 @@ stdenv.mkDerivation rec { export AR='${stdenv.cc.bintools.bintools}/bin/${stdenv.cc.targetPrefix}ar' ''; + enableParallelBuilding = true; + meta = with lib; { description = "Dynamic Host Configuration Protocol (DHCP) tools"; diff --git a/nixpkgs/pkgs/tools/networking/dhcpcd/default.nix b/nixpkgs/pkgs/tools/networking/dhcpcd/default.nix index 0962335ad1a3..d60c87e51ff9 100644 --- a/nixpkgs/pkgs/tools/networking/dhcpcd/default.nix +++ b/nixpkgs/pkgs/tools/networking/dhcpcd/default.nix @@ -1,15 +1,21 @@ -{ lib, stdenv, fetchurl, fetchpatch, pkg-config, udev, runtimeShellPackage, -runtimeShell }: +{ lib +, stdenv +, fetchurl +, pkg-config +, udev +, runtimeShellPackage +, runtimeShell +, nixosTests +, enablePrivSep ? true +}: stdenv.mkDerivation rec { - # when updating this to >=7, check, see previous reverts: - # nix-build -A nixos.tests.networking.scripted.macvlan.x86_64-linux nixos/release-combined.nix pname = "dhcpcd"; - version = "8.1.4"; + version = "9.4.1"; src = fetchurl { url = "mirror://roy/${pname}/${pname}-${version}.tar.xz"; - sha256 = "0gf1qif25wy5lffzw39pi4sshmpxz1f4a1m9sglj7am1gaix3817"; + sha256 = "sha256-gZNXY07+0epc9E7AGyTT0/iFL+yLQkmSXcxWZ8VON2w="; }; nativeBuildInputs = [ pkg-config ]; @@ -22,19 +28,17 @@ stdenv.mkDerivation rec { substituteInPlace hooks/dhcpcd-run-hooks.in --replace /bin/sh ${runtimeShell} ''; - patches = [ - (fetchpatch { - name = "?id=114870290a8d3d696bc4049c32eef3eed03d6070"; - url = "https://roy.marples.name/git/dhcpcd/commitdiff_plain/114870290a8d3d696bc4049c32eef3eed03d6070"; - sha256 = "0kzpwjh2gzvl5lvlnw6lis610p67nassk3apns68ga2pyxlky8qb"; - }) - ]; - preConfigure = "patchShebangs ./configure"; configureFlags = [ "--sysconfdir=/etc" "--localstatedir=/var" + ] + ++ lib.optionals enablePrivSep [ + "--enable-privsep" + # dhcpcd disables privsep if it can't find the default user, + # so we explicitly specify a user. + "--privsepuser=dhcpcd" ]; makeFlags = [ "PREFIX=${placeholder "out"}" ]; @@ -46,6 +50,8 @@ stdenv.mkDerivation rec { # Check that the udev plugin got built. postInstall = lib.optionalString (udev != null) "[ -e ${placeholder "out"}/lib/dhcpcd/dev/udev.so ]"; + passthru.tests = { inherit (nixosTests.networking.scripted) macvlan dhcpSimple dhcpOneIf; }; + meta = with lib; { description = "A client for the Dynamic Host Configuration Protocol (DHCP)"; homepage = "https://roy.marples.name/projects/dhcpcd"; diff --git a/nixpkgs/pkgs/tools/networking/dhcpdump/default.nix b/nixpkgs/pkgs/tools/networking/dhcpdump/default.nix index b8bd1d88bf20..d940731c7c95 100644 --- a/nixpkgs/pkgs/tools/networking/dhcpdump/default.nix +++ b/nixpkgs/pkgs/tools/networking/dhcpdump/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { version = "1.8"; src = fetchurl { - url = "http://archive.ubuntu.com/ubuntu/pool/universe/d/dhcpdump/dhcpdump_${version}.orig.tar.gz"; + url = "mirror://ubuntu/pool/universe/d/dhcpdump/dhcpdump_${version}.orig.tar.gz"; sha256 = "143iyzkqvhj4dscwqs75jvfr4wvzrs11ck3fqn5p7yv2h50vjpkd"; }; diff --git a/nixpkgs/pkgs/tools/networking/djbdns/default.nix b/nixpkgs/pkgs/tools/networking/djbdns/default.nix index 1b93d64d08f5..52f7e9a0fb55 100644 --- a/nixpkgs/pkgs/tools/networking/djbdns/default.nix +++ b/nixpkgs/pkgs/tools/networking/djbdns/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, glibc, dns-root-data } : +{ lib, stdenv, fetchurl, glibc, dns-root-data, nixosTests } : let version = "1.05"; @@ -19,7 +19,14 @@ stdenv.mkDerivation { sha256 = "0j3baf92vkczr5fxww7rp1b7gmczxmmgrqc8w2dy7kgk09m85k9w"; }; - patches = [ ./hier.patch ./fix-nix-usernamespace-build.patch ]; + patches = [ + ./hier.patch + ./fix-nix-usernamespace-build.patch + + # To fix https://github.com/NixOS/nixpkgs/issues/119066. + # Note that the NixOS test <nixpkgs/nixos/tests/tinydns.nix> tests for this. + ./softlimit.patch + ]; postPatch = '' echo gcc -O2 -include ${glibc.dev}/include/errno.h > conf-cc @@ -41,6 +48,10 @@ stdenv.mkDerivation { rm -rv djbdns-man; ''; + passthru.tests = { + tinydns = nixosTests.tinydns; + }; + meta = with lib; { description = "A collection of Domain Name System tools"; longDescription = "Includes software for all the fundamental DNS operations: DNS cache: finding addresses of Internet hosts; DNS server: publishing addresses of Internet hosts; and DNS client: talking to a DNS cache."; diff --git a/nixpkgs/pkgs/tools/networking/djbdns/softlimit.patch b/nixpkgs/pkgs/tools/networking/djbdns/softlimit.patch new file mode 100644 index 000000000000..68598703ef43 --- /dev/null +++ b/nixpkgs/pkgs/tools/networking/djbdns/softlimit.patch @@ -0,0 +1,12 @@ +diff -Naur a/tinydns-conf.c b/tinydns-conf.c +--- a/tinydns-conf.c 2001-02-11 21:11:45.000000000 +0000 ++++ b/tinydns-conf.c 2021-11-08 17:23:06.181385437 +0000 +@@ -46,7 +46,7 @@ + + start("run"); + outs("#!/bin/sh\nexec 2>&1\nexec envuidgid "); outs(user); +- outs(" envdir ./env softlimit -d300000 "); ++ outs(" envdir ./env softlimit -d4500000 "); + outs(auto_home); outs("/bin/tinydns\n"); + finish(); + perm(0755); diff --git a/nixpkgs/pkgs/tools/networking/dnscrypt-proxy2/default.nix b/nixpkgs/pkgs/tools/networking/dnscrypt-proxy2/default.nix index ced5b4774653..af4f1db4cd1d 100644 --- a/nixpkgs/pkgs/tools/networking/dnscrypt-proxy2/default.nix +++ b/nixpkgs/pkgs/tools/networking/dnscrypt-proxy2/default.nix @@ -2,7 +2,7 @@ buildGoModule rec { pname = "dnscrypt-proxy2"; - version = "2.1.0"; + version = "2.1.1"; vendorSha256 = null; @@ -12,7 +12,7 @@ buildGoModule rec { owner = "DNSCrypt"; repo = "dnscrypt-proxy"; rev = version; - sha256 = "sha256-HU5iy1dJbCp/PHnJjLi6MM+axz5Nrlcad5GEkD2p874="; + sha256 = "sha256-BtH/h2HejXDWSoqWRTjZXMLYDRoMe8lSUDX6Gay1gA8="; }; meta = with lib; { diff --git a/nixpkgs/pkgs/tools/networking/dnsperf/default.nix b/nixpkgs/pkgs/tools/networking/dnsperf/default.nix index bb63e05c0e14..96fa955a6b66 100644 --- a/nixpkgs/pkgs/tools/networking/dnsperf/default.nix +++ b/nixpkgs/pkgs/tools/networking/dnsperf/default.nix @@ -1,51 +1,44 @@ -{ lib, stdenv, fetchurl, fetchFromGitHub, autoreconfHook, pkg-config -, openssl, ldns, libck +{ lib +, stdenv +, autoreconfHook +, fetchFromGitHub +, ldns +, libck +, nghttp2 +, openssl +, pkg-config }: stdenv.mkDerivation rec { pname = "dnsperf"; - version = "2.5.2"; + version = "2.9.0"; - # The same as the initial commit of the new GitHub repo (only readme changed). src = fetchFromGitHub { owner = "DNS-OARC"; repo = "dnsperf"; rev = "v${version}"; - sha256 = "0dzi28z7hnyxbibwdsalvd93czf4d5pgmvrbn6hlh52znsn40gbb"; + sha256 = "sha256-TWFi3oPTIKjBaw0Rq0AfZgxyVukvL2SWa2qvWw2WAQ4="; }; - outputs = [ "out" "man" "doc" ]; - - nativeBuildInputs = [ autoreconfHook pkg-config ]; + nativeBuildInputs = [ + autoreconfHook + pkg-config + ]; buildInputs = [ - openssl ldns # optional for DDNS (but cheap anyway) libck + nghttp2 + openssl ]; doCheck = true; - # For now, keep including the old PDFs as well. - # https://github.com/DNS-OARC/dnsperf/issues/27 - postInstall = let - src-doc = fetchurl { - url = "ftp://ftp.nominum.com/pub/nominum/dnsperf/2.1.0.0/" - + "dnsperf-src-2.1.0.0-1.tar.gz"; - sha256 = "03kfc65s5a9csa5i7xjsv0psq144k8d9yw7xlny61bg1h2kg1db4"; - }; - in '' - tar xf '${src-doc}' - cp ./dnsperf-src-*/doc/*.pdf "$doc/share/doc/dnsperf/" - ''; - meta = with lib; { - outputsToInstall = outputs; # The man pages and docs are likely useful to most. - description = "Tools for DNS benchmaring"; - homepage = "https://github.com/DNS-OARC/dnsperf"; + homepage = "https://www.dns-oarc.net/tools/dnsperf"; license = licenses.isc; platforms = platforms.unix; - maintainers = [ maintainers.vcunat ]; + maintainers = with maintainers; [ vcunat ]; }; } diff --git a/nixpkgs/pkgs/tools/networking/dnsproxy/default.nix b/nixpkgs/pkgs/tools/networking/dnsproxy/default.nix index b7b75037ebb0..8a98600f0dcf 100644 --- a/nixpkgs/pkgs/tools/networking/dnsproxy/default.nix +++ b/nixpkgs/pkgs/tools/networking/dnsproxy/default.nix @@ -1,24 +1,26 @@ -{ lib, fetchFromGitHub, buildGoModule }: +{ lib, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "dnsproxy"; - version = "0.39.7"; + version = "0.40.1"; src = fetchFromGitHub { owner = "AdguardTeam"; repo = pname; rev = "v${version}"; - sha256 = "sha256-jU5O+t8muaIM7JhuNhqfWh1pWezaFvdg+oRPYAQpIkk="; + sha256 = "sha256-tvYurE+/ZPJeV/ZKMIC0yrwzomxd/3y0KtChei/HO6c="; }; vendorSha256 = null; + ldflags = [ "-s" "-w" "-X" "main.VersionString=${version}" ]; + doCheck = false; meta = with lib; { description = "Simple DNS proxy with DoH, DoT, and DNSCrypt support"; homepage = "https://github.com/AdguardTeam/dnsproxy"; - license = licenses.gpl3; + license = licenses.asl20; maintainers = with maintainers; [ contrun ]; }; } diff --git a/nixpkgs/pkgs/tools/networking/dnstwist/default.nix b/nixpkgs/pkgs/tools/networking/dnstwist/default.nix index e19b4dabd78b..034b69d2ecd7 100644 --- a/nixpkgs/pkgs/tools/networking/dnstwist/default.nix +++ b/nixpkgs/pkgs/tools/networking/dnstwist/default.nix @@ -5,14 +5,13 @@ python3.pkgs.buildPythonApplication rec { pname = "dnstwist"; - version = "20201228"; - disabled = python3.pythonOlder "3.6"; + version = "20211204"; src = fetchFromGitHub { owner = "elceef"; repo = pname; rev = version; - sha256 = "0bxshi1p0va2f449v6vsm8bav5caa3r3pyknj3zf4n5rvk6say70"; + sha256 = "sha256-D7qesxkJMx/N0oyaw3ev007SLCm4RKhZSNW22CNgKPw="; }; propagatedBuildInputs = with python3.pkgs; [ @@ -26,7 +25,10 @@ python3.pkgs.buildPythonApplication rec { # Project has no tests doCheck = false; - pythonImportsCheck = [ "dnstwist" ]; + + pythonImportsCheck = [ + "dnstwist" + ]; meta = with lib; { description = "Domain name permutation engine for detecting homograph phishing attacks"; diff --git a/nixpkgs/pkgs/tools/networking/dogdns/default.nix b/nixpkgs/pkgs/tools/networking/dogdns/default.nix index 1374e4473c07..c101615855f6 100644 --- a/nixpkgs/pkgs/tools/networking/dogdns/default.nix +++ b/nixpkgs/pkgs/tools/networking/dogdns/default.nix @@ -1,10 +1,11 @@ -{ lib, stdenv -, fetchFromGitHub +{ lib , rustPlatform +, fetchFromGitHub +, installShellFiles +, stdenv , pkg-config , openssl , Security -, installShellFiles }: rustPlatform.buildRustPackage rec { @@ -34,5 +35,6 @@ rustPlatform.buildRustPackage rec { homepage = "https://dns.lookup.dog"; license = licenses.eupl12; maintainers = with maintainers; [ bbigras ]; + mainProgram = "dog"; }; } diff --git a/nixpkgs/pkgs/tools/networking/driftnet/default.nix b/nixpkgs/pkgs/tools/networking/driftnet/default.nix index 042f29d3ca31..1f489b7fbc71 100644 --- a/nixpkgs/pkgs/tools/networking/driftnet/default.nix +++ b/nixpkgs/pkgs/tools/networking/driftnet/default.nix @@ -35,6 +35,8 @@ stdenv.mkDerivation rec { url = "https://github.com/deiv/driftnet/pull/33/commits/bef5f3509ab5710161e9e21ea960a997eada534f.patch"; sha256 = "1b7p9fkgp7dxv965l7q7y632s80h3nnrkaqnak2h0hakwv0i4pvm"; }) + # https://github.com/deiv/driftnet/issues/37 + ./libwebsockets-4.3.0.patch ]; enableParallelBuilding = true; @@ -59,6 +61,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/deiv/driftnet"; maintainers = with maintainers; [ offline ]; platforms = platforms.linux ++ platforms.darwin; - license = licenses.gpl2; + license = licenses.gpl2Plus; }; } diff --git a/nixpkgs/pkgs/tools/networking/driftnet/fix-darwin-build.patch b/nixpkgs/pkgs/tools/networking/driftnet/fix-darwin-build.patch deleted file mode 100644 index d1bde0f2e605..000000000000 --- a/nixpkgs/pkgs/tools/networking/driftnet/fix-darwin-build.patch +++ /dev/null @@ -1,61 +0,0 @@ -diff --git a/src/compat/compat.h b/src/compat/compat.h -index 6add422..ea80406 100644 ---- a/src/compat/compat.h -+++ b/src/compat/compat.h -@@ -17,7 +17,7 @@ - #include <config.h> - #endif - --#ifdef __FreeBSD__ -+#if defined(__FreeBSD__) || defined(__APPLE__) - #include <sys/types.h> - #endif - -diff --git a/src/network/layer2.c b/src/network/layer2.c -index 763f0ac..2497b72 100644 ---- a/src/network/layer2.c -+++ b/src/network/layer2.c -@@ -14,7 +14,7 @@ - - #include <string.h> - --#ifdef __FreeBSD__ -+#if defined(__FreeBSD__) || defined(__APPLE__) - #include <netinet/in_systm.h> - #include <netinet/in.h> - #else -@@ -29,7 +29,7 @@ - /* - * Freebsd and Cygwin doesn't define 'ethhdr' - */ --#if defined(__FreeBSD__) || defined(__CYGWIN__) -+#if defined(__FreeBSD__) || defined(__CYGWIN__) || defined(__APPLE__) - - #define ETH_ALEN 6 /* Octets in one ethernet addr */ - #define ETH_P_IP 0x0800 /* Internet Protocol packet */ -diff --git a/src/network/layer3.c b/src/network/layer3.c -index 7864126..aae2041 100644 ---- a/src/network/layer3.c -+++ b/src/network/layer3.c -@@ -15,7 +15,7 @@ - #include <string.h> - #include <assert.h> - --#ifdef __FreeBSD__ -+#if defined(__FreeBSD__) || defined(__APPLE__) - #include <netinet/in_systm.h> - #include <netinet/in.h> - #include <sys/socket.h> -diff --git a/src/pid.c b/src/pid.c -index 621834e..94e7dcc 100644 ---- a/src/pid.c -+++ b/src/pid.c -@@ -14,7 +14,7 @@ - - #include "compat/compat.h" - --#ifdef __FreeBSD__ -+#if defined(__FreeBSD__) || defined(__APPLE__) - #include <sys/stat.h> - #endif - #include <fcntl.h> diff --git a/nixpkgs/pkgs/tools/networking/driftnet/libwebsockets-4.3.0.patch b/nixpkgs/pkgs/tools/networking/driftnet/libwebsockets-4.3.0.patch new file mode 100644 index 000000000000..5e5cfd50af3e --- /dev/null +++ b/nixpkgs/pkgs/tools/networking/driftnet/libwebsockets-4.3.0.patch @@ -0,0 +1,12 @@ +diff --git a/src/http_display/httpd.c b/src/http_display/httpd.c +index f4709ef..7921d23 100644 +--- a/src/http_display/httpd.c ++++ b/src/http_display/httpd.c +@@ -191,7 +191,6 @@ static void * http_server_dispatch(void *arg) + LWSMPRO_FILE, /* mount type is a directory in a filesystem */ + 1, /* strlen("/"), ie length of the mountpoint */ + NULL, +- { NULL, NULL } // sentinel + }; + + memset(&info, 0, sizeof info); diff --git a/nixpkgs/pkgs/tools/networking/drill/default.nix b/nixpkgs/pkgs/tools/networking/drill/default.nix index f29a7ee705f4..beb931f8d1b6 100644 --- a/nixpkgs/pkgs/tools/networking/drill/default.nix +++ b/nixpkgs/pkgs/tools/networking/drill/default.nix @@ -1,4 +1,5 @@ -{ lib, stdenv +{ lib +, stdenv , rustPlatform , fetchFromGitHub , pkg-config @@ -19,15 +20,20 @@ rustPlatform.buildRustPackage rec { cargoSha256 = "04gj9gaysjcm2d81ds2raak847hr8w84jgfdwqd51wi8xm32w5jf"; - nativeBuildInputs = lib.optionals stdenv.isLinux [ pkg-config ]; - buildInputs = [ ] - ++ lib.optionals stdenv.isLinux [ openssl ] - ++ lib.optionals stdenv.isDarwin [ Security ]; + nativeBuildInputs = lib.optionals stdenv.isLinux [ + pkg-config + ]; + + buildInputs = lib.optionals stdenv.isLinux [ + openssl + ] ++ lib.optionals stdenv.isDarwin [ + Security + ]; meta = with lib; { description = "HTTP load testing application inspired by Ansible syntax"; homepage = "https://github.com/fcsonline/drill"; - license = licenses.gpl3; + license = licenses.gpl3Only; maintainers = with maintainers; [ Br1ght0ne ]; }; } diff --git a/nixpkgs/pkgs/tools/networking/easyrsa/2.x.nix b/nixpkgs/pkgs/tools/networking/easyrsa/2.x.nix index 52cf2082d63f..b88aeda0fc5a 100644 --- a/nixpkgs/pkgs/tools/networking/easyrsa/2.x.nix +++ b/nixpkgs/pkgs/tools/networking/easyrsa/2.x.nix @@ -1,12 +1,21 @@ -{ lib, stdenv, fetchurl, autoreconfHook, makeWrapper -, gnugrep, openssl }: +{ lib +, stdenv +, fetchFromGitHub +, autoreconfHook +, makeWrapper +, gnugrep +, openssl +}: -stdenv.mkDerivation { - name = "easyrsa-2.2.0"; +stdenv.mkDerivation rec { + pname = "easyrsa"; + version = "2.2.0"; - src = fetchurl { - url = "https://github.com/OpenVPN/easy-rsa/archive/v2.2.0.tar.gz"; - sha256 = "1xq4by5frb6ikn53ss3y8v7ss639dccxfq8jfrbk07ynkmk668qk"; + src = fetchFromGitHub { + owner = "OpenVPN"; + repo = "easy-rsa"; + rev = "v${version}"; + sha256 = "sha256-zTdk8mv+gC/SHK813wZ6CWZf9Jm2XkKfAPU3feFpAkY="; }; preBuild = '' diff --git a/nixpkgs/pkgs/tools/networking/eggdrop/default.nix b/nixpkgs/pkgs/tools/networking/eggdrop/default.nix index 79ae5a9713be..a294267bef60 100644 --- a/nixpkgs/pkgs/tools/networking/eggdrop/default.nix +++ b/nixpkgs/pkgs/tools/networking/eggdrop/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { meta = with lib; { license = licenses.gpl2; platforms = platforms.unix; - homepage = "http://www.eggheads.org"; + homepage = "https://www.eggheads.org"; description = "An Internet Relay Chat (IRC) bot"; }; } diff --git a/nixpkgs/pkgs/tools/networking/eternal-terminal/default.nix b/nixpkgs/pkgs/tools/networking/eternal-terminal/default.nix index 21bd75a3ebae..7724d2d89fdc 100644 --- a/nixpkgs/pkgs/tools/networking/eternal-terminal/default.nix +++ b/nixpkgs/pkgs/tools/networking/eternal-terminal/default.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation rec { pname = "eternal-terminal"; - version = "6.1.8"; + version = "6.1.9"; src = fetchFromGitHub { owner = "MisterTea"; repo = "EternalTerminal"; rev = "et-v${version}"; - sha256 = "sha256-VSJ6AoVBvlCdKSirSDqsemixF+kAnvPgBQlyJxjoPcs="; + sha256 = "0kpabxpy779ppkaqaigq0x34ymz1jcwpsa78rm6nr55mdap2xxv6"; }; cmakeFlags= [ diff --git a/nixpkgs/pkgs/tools/networking/fakeroute/default.nix b/nixpkgs/pkgs/tools/networking/fakeroute/default.nix index 025eef72332f..6e5fbdb13d28 100644 --- a/nixpkgs/pkgs/tools/networking/fakeroute/default.nix +++ b/nixpkgs/pkgs/tools/networking/fakeroute/default.nix @@ -1,14 +1,18 @@ -{ lib, stdenv, fetchurl }: +{ lib, stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { pname = "fakeroute"; version = "0.3"; - src = fetchurl { - url = "https://moxie.org/software/fakeroute/${pname}-${version}.tar.gz"; - sha256 = "1sp342rxgm1gz4mvi5vvz1knz7kn9px9s39ii3jdjp4ks7lr5c8f"; + src = fetchFromGitHub { + owner = "museoa"; + repo = "fakeroute"; + rev = "f8cb9c0ae3abb4c0662d9e1fcac67eefeeac3963"; + sha256 = "12dhahwlpjzv79wpdpryjihamfbh4d8cfzfw4wi1jkl0dv2d41jg"; }; + sourceRoot = "source/fakeroute-0.3"; + meta = with lib; { description = '' Makes your machine appear to be anywhere on the internet diff --git a/nixpkgs/pkgs/tools/networking/fast-ssh/default.nix b/nixpkgs/pkgs/tools/networking/fast-ssh/default.nix new file mode 100644 index 000000000000..912cac758650 --- /dev/null +++ b/nixpkgs/pkgs/tools/networking/fast-ssh/default.nix @@ -0,0 +1,29 @@ +{ lib +, stdenv +, fetchFromGitHub +, rustPlatform +, Security +}: + +rustPlatform.buildRustPackage rec { + pname = "fast-ssh"; + version = "0.3.1"; + + src = fetchFromGitHub { + owner = "julien-r44"; + repo = "fast-ssh"; + rev = "v${version}"; + sha256 = "sha256-eHJdMe8RU6Meg/9+NCfIneD5BqNUc2yIiQ8Z5UqUBUI="; + }; + + cargoSha256 = "sha256-sIQNoH3UWX3SwCFCPZEREIFR7C28ml4oGsrq6wuOAT0="; + + buildInputs = lib.optional stdenv.isDarwin Security; + + meta = with lib; { + description = "TUI tool to use the SSH config for connections"; + homepage = "https://github.com/julien-r44/fast-ssh"; + license = licenses.mit; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/nixpkgs/pkgs/tools/networking/fastd/default.nix b/nixpkgs/pkgs/tools/networking/fastd/default.nix index 8d1594b8187d..47007e1646ee 100644 --- a/nixpkgs/pkgs/tools/networking/fastd/default.nix +++ b/nixpkgs/pkgs/tools/networking/fastd/default.nix @@ -42,7 +42,7 @@ stdenv.mkDerivation rec { ]; # some options are only available on x86 - mesonFlags = lib.optionals (!stdenv.isx86_64 && !stdenv.isi686) [ + mesonFlags = lib.optionals (!stdenv.hostPlatform.isx86) [ "-Dcipher_salsa20_xmm=disabled" "-Dcipher_salsa2012_xmm=disabled" "-Dmac_ghash_pclmulqdq=disabled" diff --git a/nixpkgs/pkgs/tools/networking/ferm/default.nix b/nixpkgs/pkgs/tools/networking/ferm/default.nix index 29f9481fe328..580ca848c62b 100644 --- a/nixpkgs/pkgs/tools/networking/ferm/default.nix +++ b/nixpkgs/pkgs/tools/networking/ferm/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, makeWrapper, perl, ebtables, ipset, iptables, nixosTests }: +{ lib, stdenv, fetchurl, makeWrapper, perl, iptables, nixosTests }: let inherit (lib.versions) majorMinor; @@ -23,7 +23,7 @@ in stdenv.mkDerivation rec { postInstall = '' rm -r $out/lib/systemd for i in "$out/sbin/"*; do - wrapProgram "$i" --prefix PATH : "${lib.makeBinPath [ iptables ipset ebtables ]}" + wrapProgram "$i" --prefix PATH : "${lib.makeBinPath [ iptables ]}" done ''; diff --git a/nixpkgs/pkgs/tools/networking/findomain/default.nix b/nixpkgs/pkgs/tools/networking/findomain/default.nix index 37499757e757..09524b80895f 100644 --- a/nixpkgs/pkgs/tools/networking/findomain/default.nix +++ b/nixpkgs/pkgs/tools/networking/findomain/default.nix @@ -10,16 +10,16 @@ rustPlatform.buildRustPackage rec { pname = "findomain"; - version = "5.0.0"; + version = "5.1.1"; src = fetchFromGitHub { owner = "Edu4rdSHL"; repo = pname; rev = version; - sha256 = "sha256-xuabmlpejQVN8pYCNa97aL2IJUAgV7zLXpkEIp9SZRI="; + sha256 = "sha256-nfpVW+Y6+YtMhDepj2DbnzItH11zABlnEs9c0FzfouA="; }; - cargoSha256 = "sha256-hrgTWB5D0eKmfuR+lrMN4mx6yGomHe/jUJxw2uyrjHg="; + cargoSha256 = "sha256-s7xikSZx29zv8TD/YOTckCUh/8MBBIdZOUUwfkVZfx8="; nativeBuildInputs = [ installShellFiles perl ]; buildInputs = lib.optionals stdenv.isDarwin [ libiconv Security ]; diff --git a/nixpkgs/pkgs/tools/networking/flannel/default.nix b/nixpkgs/pkgs/tools/networking/flannel/default.nix index 86010f4adb91..3bb1ab38e6b3 100644 --- a/nixpkgs/pkgs/tools/networking/flannel/default.nix +++ b/nixpkgs/pkgs/tools/networking/flannel/default.nix @@ -1,26 +1,33 @@ -{ lib, buildGoPackage, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub, nixosTests }: with lib; -buildGoPackage rec { +buildGoModule rec { pname = "flannel"; - version = "0.13.0"; + version = "0.15.1"; rev = "v${version}"; - goPackagePath = "github.com/coreos/flannel"; + vendorSha256 = null; src = fetchFromGitHub { inherit rev; - owner = "coreos"; + owner = "flannel-io"; repo = "flannel"; - sha256 = "0mmswnaybwpf18h832haapcs5b63wn5w2hax0smm3inldiggsbw8"; + sha256 = "1p4rz4kdiif8i78zgxhw6dd0c1bq159f6l1idvig5apph7zi2bwm"; }; + ldflags = [ "-X github.com/flannel-io/flannel/version.Version=${rev}" ]; + + # TestRouteCache/TestV6RouteCache fail with "Failed to create newns: operation not permitted" + doCheck = false; + + passthru.tests = { inherit (nixosTests) flannel; }; + meta = { description = "Network fabric for containers, designed for Kubernetes"; license = licenses.asl20; - homepage = "https://github.com/coreos/flannel"; - maintainers = with maintainers; [johanot offline]; + homepage = "https://github.com/flannel-io/flannel"; + maintainers = with maintainers; [ johanot offline ]; platforms = with platforms; linux; }; } diff --git a/nixpkgs/pkgs/tools/networking/flannel/plugin.nix b/nixpkgs/pkgs/tools/networking/flannel/plugin.nix index 51e29a31ddc5..db55a3dfd04c 100644 --- a/nixpkgs/pkgs/tools/networking/flannel/plugin.nix +++ b/nixpkgs/pkgs/tools/networking/flannel/plugin.nix @@ -2,22 +2,29 @@ buildGoModule rec { pname = "cni-plugin-flannel"; - version = "1.1"; + version = "1.0.0"; src = fetchFromGitHub { owner = "flannel-io"; repo = "cni-plugin"; rev = "v${version}"; - sha256 = "sha256-DZC6uJR6TIHdmu8kZcbM+RC7pdejqLCOep0v3PM8/QY="; + sha256 = "sha256-zWxw4LZIlkT88yGTnxdupq7cUSacNRxPzzp01O9USDw="; }; - vendorSha256 = "sha256-TLAwE3pTnJYOi1AsOQfsG6t3xLKOah/7DvYjsqyltKs="; + vendorSha256 = "sha256-zteMlrvRTVxOFlBy+z/qfiSii8+c8PMapwIsdbN+Aig="; postInstall = '' mv $out/bin/cni-plugin $out/bin/flannel ''; doCheck = false; + doInstallCheck = true; + + installCheckPhase = '' + runHook preInstallCheck + $out/bin/flannel 2>&1 | fgrep -q v$version + runHook postInstallCheck + ''; meta = with lib; { description = "flannel CNI plugin"; diff --git a/nixpkgs/pkgs/tools/networking/frp/default.nix b/nixpkgs/pkgs/tools/networking/frp/default.nix index 1fc91277ef3b..80108f77fe53 100644 --- a/nixpkgs/pkgs/tools/networking/frp/default.nix +++ b/nixpkgs/pkgs/tools/networking/frp/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "frp"; - version = "0.37.1"; + version = "0.38.0"; src = fetchFromGitHub { owner = "fatedier"; repo = pname; rev = "v${version}"; - sha256 = "sha256-TEVSxTzMgoIPcIUmhtRnFSp3xClJmOsIUjpKEr5sId8="; + sha256 = "sha256-wdK8o+Id7+YiSk7nZv04kTYa/9YOypstlecu6TPFI6w="; }; - vendorSha256 = "sha256-4vvIobj1I7FbPVJJG4NZogwv4BMo7GRa5Fo5gO2Daws="; + vendorSha256 = "sha256-R//kD9A6U9m/7Q7FPToA5kn0kzR7W/A82HezA/+dCFY="; doCheck = false; diff --git a/nixpkgs/pkgs/tools/networking/gemget/default.nix b/nixpkgs/pkgs/tools/networking/gemget/default.nix new file mode 100644 index 000000000000..e501172f75e5 --- /dev/null +++ b/nixpkgs/pkgs/tools/networking/gemget/default.nix @@ -0,0 +1,22 @@ +{ lib, buildGoModule, fetchFromGitHub }: + +buildGoModule rec { + pname = "gemget"; + version = "1.8.0"; + + src = fetchFromGitHub { + owner = "makeworld-the-better-one"; + repo = pname; + rev = "v${version}"; + sha256 = "PmtIgxnzfLduNGTx8SNDky6juv+NTJ8Cr++SOCk/QNU="; + }; + + vendorSha256 = "sha256-Ep6HAJgurxFbA4L77z8V2ar06BBVWlAJS9VoSSUg27U="; + + meta = with lib; { + description = "Command line downloader for the Gemini protocol"; + homepage = "https://github.com/makeworld-the-better-one/gemget"; + license = licenses.mit; + maintainers = with maintainers; [ amfl ]; + }; +} diff --git a/nixpkgs/pkgs/tools/networking/getmail6/default.nix b/nixpkgs/pkgs/tools/networking/getmail6/default.nix index 045ead7569db..15fa401ec062 100644 --- a/nixpkgs/pkgs/tools/networking/getmail6/default.nix +++ b/nixpkgs/pkgs/tools/networking/getmail6/default.nix @@ -5,13 +5,13 @@ python3.pkgs.buildPythonApplication rec { pname = "getmail6"; - version = "6.18.4"; + version = "6.18.5"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "1pxrwqpg8vnrrljigzzaq8g2g6nx55x7a8q032bp4wqyhc6jhpxq"; + sha256 = "1bckrnvjkkbrybs9ccknd4vakzvd7vpp541p2cpv4isaizyxp2ji"; }; # needs a Docker setup diff --git a/nixpkgs/pkgs/tools/networking/globalprotect-openconnect/default.nix b/nixpkgs/pkgs/tools/networking/globalprotect-openconnect/default.nix index d61668f7b65e..f4b0607d49fb 100644 --- a/nixpkgs/pkgs/tools/networking/globalprotect-openconnect/default.nix +++ b/nixpkgs/pkgs/tools/networking/globalprotect-openconnect/default.nix @@ -1,34 +1,24 @@ { stdenv, lib, fetchFromGitHub -, qmake, qtwebsockets, qtwebengine, wrapQtAppsHook, openconnect +, cmake, qtwebsockets, qtwebengine, wrapQtAppsHook, openconnect }: stdenv.mkDerivation rec { pname = "globalprotect-openconnect"; - version = "1.2.6"; + version = "1.3.4"; src = fetchFromGitHub { owner = "yuezk"; repo = "GlobalProtect-openconnect"; - rev = "c14a6ad1d2b62f8d297bc4cfbcb1dcea4d99112f"; fetchSubmodules = true; - sha256 = "1zkc3vk1j31n2zs5ammzv23dah7x163gfrzz222ynbkvsccrhzrk"; + rev = "v${version}"; + sha256 = "sha256-w2y6DOFgQ8Xpi1abibvRNpEUbBsdvwDMGqlJxQSCpVg="; }; - nativeBuildInputs = [ qmake wrapQtAppsHook ]; + nativeBuildInputs = [ cmake wrapQtAppsHook ]; buildInputs = [ openconnect qtwebsockets qtwebengine ]; patchPhase = '' - for f in GPClient/GPClient.pro \ - GPClient/com.yuezk.qt.gpclient.desktop \ - GPService/GPService.pro \ - GPService/dbus/com.yuezk.qt.GPService.service \ - GPService/systemd/gpservice.service; do - substituteInPlace $f \ - --replace /usr $out \ - --replace /etc $out/lib; - done; - substituteInPlace GPService/gpservice.h \ --replace /usr/local/bin/openconnect ${openconnect}/bin/openconnect; ''; diff --git a/nixpkgs/pkgs/tools/networking/gobgp/default.nix b/nixpkgs/pkgs/tools/networking/gobgp/default.nix index 9c39b6783b3c..df159d292327 100644 --- a/nixpkgs/pkgs/tools/networking/gobgp/default.nix +++ b/nixpkgs/pkgs/tools/networking/gobgp/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "gobgp"; - version = "2.31.0"; + version = "2.34.0"; src = fetchFromGitHub { owner = "osrg"; repo = "gobgp"; rev = "v${version}"; - sha256 = "sha256-Q55BA5iMZP5D8lLfJn82fsxQ0SP5e4OdXtGly4j3dXU="; + sha256 = "sha256-xyakq5DXwzONEP6EvDpAuzCrTDWcs+7asDlq9Vf4c1k="; }; vendorSha256 = "sha256-+dX/XByFW5/zvfXvyWePAv9X71dJEKaQf6xNXAXoMxw="; diff --git a/nixpkgs/pkgs/tools/networking/godns/default.nix b/nixpkgs/pkgs/tools/networking/godns/default.nix index fb46a144ee7b..fffcbbb528b7 100644 --- a/nixpkgs/pkgs/tools/networking/godns/default.nix +++ b/nixpkgs/pkgs/tools/networking/godns/default.nix @@ -2,21 +2,21 @@ buildGoModule rec { pname = "godns"; - version = "2.5"; + version = "2.5.3"; src = fetchFromGitHub { owner = "TimothyYe"; repo = "godns"; rev = "v${version}"; - sha256 = "sha256-ia0FmV2KlFPh9gmKOqVxiStgmBbX9vUIc7KllpUt44Q="; + sha256 = "sha256-C2Auk0BJLhW8r4cnmoZiUddb8rcZqND5fER9L+3ooH4="; }; - vendorSha256 = "sha256-FZLDaMrPEyoTGFmGBlpqPWsMuobqwkBaot5qjcRJe9w="; + vendorSha256 = "sha256-/egdqQCkbmrxuQ3vPfHOtHxAgW143Y2eZEzKAsBVmaI="; # Some tests require internet access, broken in sandbox doCheck = false; - ldflags = [ "-X main.Version=${version}" ]; + ldflags = [ "-s" "-w" "-X main.Version=${version}" ]; meta = with lib; { description = "A dynamic DNS client tool supports AliDNS, Cloudflare, Google Domains, DNSPod, HE.net & DuckDNS & DreamHost, etc"; diff --git a/nixpkgs/pkgs/tools/networking/godspeed/default.nix b/nixpkgs/pkgs/tools/networking/godspeed/default.nix new file mode 100644 index 000000000000..011d09848d8e --- /dev/null +++ b/nixpkgs/pkgs/tools/networking/godspeed/default.nix @@ -0,0 +1,34 @@ +{ lib +, buildGoModule +, fetchFromGitHub +, libpcap +}: + +buildGoModule rec { + pname = "godspeed"; + version = "unstable-2021-08-27"; + + src = fetchFromGitHub { + owner = "redcode-labs"; + repo = "GodSpeed"; + rev = "c02b184ab0fd304d1bd8cbe1566a3d3de727975e"; + sha256 = "sha256-y/mCfNWe5ShdxEz8IUQ8zUzgVkUy/+5lX6rcJ3r6KoI="; + }; + + vendorSha256 = "sha256-MCr1ShhkxM9CeSmqqtgAW0qv0QaIPRSOzASj8gt2ZAg="; + + buildInputs = [ + libpcap + ]; + + postFixup = '' + mv $out/bin/GodSpeed $out/bin/${pname} + ''; + + meta = with lib; { + description = "Manager for reverse shells"; + homepage = "https://github.com/redcode-labs/GodSpeed"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ fab ] ++ teams.redcodelabs.members; + }; +} diff --git a/nixpkgs/pkgs/tools/networking/goimapnotify/default.nix b/nixpkgs/pkgs/tools/networking/goimapnotify/default.nix index 968d5774b5b5..c2581fe3485b 100644 --- a/nixpkgs/pkgs/tools/networking/goimapnotify/default.nix +++ b/nixpkgs/pkgs/tools/networking/goimapnotify/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "goimapnotify"; - version = "2.3.2"; + version = "2.3.7"; src = fetchFromGitLab { owner = "shackra"; repo = "goimapnotify"; rev = version; - sha256 = "sha256-pkpdIkabxz9bu0LnyU1/wu1qqPc/pQqCn8tePc2fIfg="; + sha256 = "sha256-Wot+E+rDgXQ4FVgdfqe6a3O9oYUK3X1xImC33eDuUBo="; }; - vendorSha256 = "sha256-4+2p/7BAEk+1V0TII9Q2O2YNX0rvBiw2Ss7k1dsvUbk="; + vendorSha256 = "sha256-DphGe9jbKo1aIfpF5kRYNSn/uIYHaRMrygda5t46svw="; postPatch = '' for f in command.go command_test.go; do diff --git a/nixpkgs/pkgs/tools/networking/goimapnotify/deps.nix b/nixpkgs/pkgs/tools/networking/goimapnotify/deps.nix deleted file mode 100644 index fc377c50be4c..000000000000 --- a/nixpkgs/pkgs/tools/networking/goimapnotify/deps.nix +++ /dev/null @@ -1,66 +0,0 @@ -# file generated from Gopkg.lock using dep2nix (https://github.com/nixcloud/dep2nix) -[ - { - goPackagePath = "github.com/emersion/go-imap"; - fetch = { - type = "git"; - url = "https://github.com/emersion/go-imap"; - rev = "b7db4a2bc5cc04fb568fb036a438da43ee9a9f78"; - sha256 = "1v5hp02k9rfdq7gqiydz575dw6a991pspynhxypv0fvgh1vgqs0s"; - }; - } - { - goPackagePath = "github.com/emersion/go-imap-idle"; - fetch = { - type = "git"; - url = "https://github.com/emersion/go-imap-idle"; - rev = "2af93776db6b042cc1116b0d0af00d7f58eea696"; - sha256 = "19dh8sryjr3a8f0bgwywiz2fqccxhf4j66sm0w1jkjzh131f3pr7"; - }; - } - { - goPackagePath = "github.com/emersion/go-sasl"; - fetch = { - type = "git"; - url = "https://github.com/emersion/go-sasl"; - rev = "7e096a0a6197b89989e8cc31016daa67c8c62051"; - sha256 = "0mr9nzi4wc3ck730zqfqwmy8wk7d90h80yvvivqnxyfyadqy48kd"; - }; - } - { - goPackagePath = "github.com/konsorten/go-windows-terminal-sequences"; - fetch = { - type = "git"; - url = "https://github.com/konsorten/go-windows-terminal-sequences"; - rev = "f55edac94c9bbba5d6182a4be46d86a2c9b5b50e"; - sha256 = "09mn209ika7ciy87xf2x31dq5fnqw39jidgaljvmqxwk7ff1hnx7"; - }; - } - { - goPackagePath = "github.com/sirupsen/logrus"; - fetch = { - type = "git"; - url = "https://github.com/sirupsen/logrus"; - rev = "8bdbc7bcc01dcbb8ec23dc8a28e332258d25251f"; - sha256 = "1m7ny9jkb98cxqhsp13xa5hnqh1s9f25x04q6arsala4zswsw33c"; - }; - } - { - goPackagePath = "golang.org/x/sys"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/sys"; - rev = "a129542de9ae0895210abff9c95d67a1f33cb93d"; - sha256 = "13p5q7s25rsvfkk8fcwf432j8djf7bjg7chs296rzlig4vqcdxi4"; - }; - } - { - goPackagePath = "golang.org/x/text"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/text"; - rev = "342b2e1fbaa52c93f31447ad2c6abc048c63e475"; - sha256 = "0flv9idw0jm5nm8lx25xqanbkqgfiym6619w575p7nrdh0riqwqh"; - }; - } -] diff --git a/nixpkgs/pkgs/tools/networking/gping/default.nix b/nixpkgs/pkgs/tools/networking/gping/default.nix index a6ace183df67..24dc47176e89 100644 --- a/nixpkgs/pkgs/tools/networking/gping/default.nix +++ b/nixpkgs/pkgs/tools/networking/gping/default.nix @@ -2,21 +2,29 @@ , stdenv , rustPlatform , fetchFromGitHub +, fetchpatch , libiconv }: rustPlatform.buildRustPackage rec { pname = "gping"; - version = "1.2.1"; + version = "1.2.6"; src = fetchFromGitHub { owner = "orf"; repo = "gping"; - rev = "v${version}"; - sha256 = "sha256-lApm1JLXNjDKLj6zj25OaZDVp7lLW3qyrDsvJrudl8I="; + rev = "gping-v${version}"; + sha256 = "sha256-Sxmwuf+iTBTlpfMFCEUp6JyEaoHgmLIKB/gws2KY/xc="; }; - cargoSha256 = "sha256-d1NjPwT3YDp1U9JWeUejpWDbJonFlt5lYbUf7p3jVT0="; + cargoSha256 = "sha256-xEASs6r5zxYJXS+at6aX5n0whGp5qwuNwq6Jh0GM+/4="; + + patches = [ + (fetchpatch { + url = "https://github.com/orf/gping/commit/b843beb9617e4b7b98d4f6d3942067cad59c9d60.patch"; + sha256 = "sha256-9DIeeweCuGqymvUj4EBct82XVevkFSbHWaV76ExjGbs="; + }) + ]; buildInputs = lib.optional stdenv.isDarwin libiconv; diff --git a/nixpkgs/pkgs/tools/networking/grpcui/default.nix b/nixpkgs/pkgs/tools/networking/grpcui/default.nix index 1fa47ba917fc..14d790fedecd 100644 --- a/nixpkgs/pkgs/tools/networking/grpcui/default.nix +++ b/nixpkgs/pkgs/tools/networking/grpcui/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "grpcui"; - version = "1.1.0"; + version = "1.2.0"; src = fetchFromGitHub { owner = "fullstorydev"; repo = pname; rev = "v${version}"; - sha256 = "1l8ldx7nx2pa2ac5znss0j0dhapn3syj02xqys4jz22hr5gvfj6m"; + sha256 = "sha256-gHzafx3nIrdLyiGlz5v6pJ8XVT+7tDN59rsdfp1V/Q0="; }; - vendorSha256 = "15qgpbsl41swifw8w1lx0pbniwv3rf35127ald7h1r157vfa0r8b"; + vendorSha256 = "sha256-6K644KSmFEA60yMnw7GmCmycsb5x2stvc0unyV4pF9g="; doCheck = false; diff --git a/nixpkgs/pkgs/tools/networking/grpcurl/default.nix b/nixpkgs/pkgs/tools/networking/grpcurl/default.nix index e6cd09dc2fd7..d075482638f4 100644 --- a/nixpkgs/pkgs/tools/networking/grpcurl/default.nix +++ b/nixpkgs/pkgs/tools/networking/grpcurl/default.nix @@ -2,18 +2,18 @@ buildGoModule rec { pname = "grpcurl"; - version = "1.8.2"; + version = "1.8.5"; src = fetchFromGitHub { owner = "fullstorydev"; repo = "grpcurl"; rev = "v${version}"; - sha256 = "sha256-/no8bRGoKibtcjaITUuzwAbX+gPHNJROSf79iuuRwe4="; + sha256 = "sha256-73gp3UQk7D3aWK2jtMpiY4tiVhvHkTqZipoynosd3ec="; }; subPackages = [ "cmd/grpcurl" ]; - vendorSha256 = "sha256-nl8vKVhUMSO20qCDyhNkU5cghNy8vIFqSBvLk59nbWg="; + vendorSha256 = "sha256-dHh8zHtU/r6AscInfNfVFd5psys2b6D1FS02lSoiGto="; ldflags = [ "-s" "-w" "-X main.version=${version}" ]; diff --git a/nixpkgs/pkgs/tools/networking/gupnp-tools/default.nix b/nixpkgs/pkgs/tools/networking/gupnp-tools/default.nix index c1861e33c081..c29d2c501df8 100644 --- a/nixpkgs/pkgs/tools/networking/gupnp-tools/default.nix +++ b/nixpkgs/pkgs/tools/networking/gupnp-tools/default.nix @@ -1,4 +1,5 @@ -{ lib, stdenv +{ stdenv +, lib , fetchurl , meson , ninja @@ -16,11 +17,11 @@ stdenv.mkDerivation rec { pname = "gupnp-tools"; - version = "0.10.0"; + version = "0.10.2"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "13d1qr1avz9r76989nvgxhhclmqzr025xjk4rfnja94fpbspznj1"; + sha256 = "beSe9LN1uKFk90t2YWixGE4NKBlrawek9TQfCN/YXWw="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/tools/networking/gvproxy/default.nix b/nixpkgs/pkgs/tools/networking/gvproxy/default.nix index 535e8d6bdfbf..f7a6ee5b3cb0 100644 --- a/nixpkgs/pkgs/tools/networking/gvproxy/default.nix +++ b/nixpkgs/pkgs/tools/networking/gvproxy/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "gvproxy"; - version = "0.2.0"; + version = "0.3.0"; src = fetchFromGitHub { owner = "containers"; repo = "gvisor-tap-vsock"; rev = "v${version}"; - sha256 = "sha256-iRFjELJCgxPvqkhBvJqCFapQrHLL3uRpKsJ/DaXSKnw="; + sha256 = "sha256-xoPqgt/d0RyDqkRY+ZhP02nKr3uEu8be0Go2H7JRg3k="; }; vendorSha256 = null; diff --git a/nixpkgs/pkgs/tools/networking/horst/default.nix b/nixpkgs/pkgs/tools/networking/horst/default.nix index 194365130bf3..331738be5329 100644 --- a/nixpkgs/pkgs/tools/networking/horst/default.nix +++ b/nixpkgs/pkgs/tools/networking/horst/default.nix @@ -1,4 +1,4 @@ -{lib, stdenv, fetchFromGitHub, pkg-config, ncurses, libnl }: +{lib, stdenv, fetchFromGitHub, fetchpatch, pkg-config, ncurses, libnl }: stdenv.mkDerivation rec { pname = "horst"; @@ -11,6 +11,22 @@ stdenv.mkDerivation rec { sha256 = "140pyv6rlsh4c745w4b59pz3hrarr39qq3mz9z1lsd3avc12nx1a"; }; + patches = [ + # Fix pending upstream inclusion for ncurses-6.3: + # https://github.com/br101/horst/pull/110 + (fetchpatch { + name = "ncurses-6.3.patch"; + url = "https://github.com/br101/horst/commit/c9e9b6cc1f97edb9c53f3a67b43f3588f3ac6ea7.patch"; + sha256 = "15pahbnql44d5zzxmkd5ky8bl3c3hh3lh5190wynd90jrrhf1a26"; + # collides for context change, well apply this part in postPatch + excludes = [ "display-main.c" ]; + }) + ]; + postPatch = '' + # Apply second part of ncurses-6.3.patch: + substituteInPlace display-main.c --replace 'wprintw(dump_win, str);' 'wprintw(dump_win, "%s", str);' + ''; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ ncurses libnl ]; diff --git a/nixpkgs/pkgs/tools/networking/httping/default.nix b/nixpkgs/pkgs/tools/networking/httping/default.nix index 7389c78ef8db..77f2b52890e0 100644 --- a/nixpkgs/pkgs/tools/networking/httping/default.nix +++ b/nixpkgs/pkgs/tools/networking/httping/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, gettext, libintl, ncurses, openssl +{ lib, stdenv, fetchurl, fetchpatch, gettext, libintl, ncurses, openssl , fftw ? null }: stdenv.mkDerivation rec { @@ -10,6 +10,15 @@ stdenv.mkDerivation rec { sha256 = "1y7sbgkhgadmd93x1zafqc4yp26ssiv16ni5bbi9vmvvdl55m29y"; }; + patches = [ + # Upstream fix for ncurses-6.3. + (fetchpatch { + name = "ncurses-6.3.patch"; + url = "https://github.com/folkertvanheusden/HTTPing/commit/4ea9d5b78540c972e3fe1bf44db9f7b3f87c0ad0.patch"; + sha256 = "0w3kdkq6c6hz1d9jjnw0ldvd6dy39yamj8haf0hvcyb1sb67qjmp"; + }) + ]; + buildInputs = [ fftw libintl ncurses openssl ]; nativeBuildInputs = [ gettext ]; diff --git a/nixpkgs/pkgs/tools/networking/httplz/default.nix b/nixpkgs/pkgs/tools/networking/httplz/default.nix index 52654a49d65f..1d482f2bebf1 100644 --- a/nixpkgs/pkgs/tools/networking/httplz/default.nix +++ b/nixpkgs/pkgs/tools/networking/httplz/default.nix @@ -13,15 +13,15 @@ rustPlatform.buildRustPackage rec { pname = "httplz"; - version = "1.12.1"; + version = "1.12.2"; src = fetchCrate { inherit version; pname = "https"; - sha256 = "sha256-vMhQHWzsZlqMVkEQHCZTB8T4ETTaf8iAS9QhgYdfcx0="; + sha256 = "sha256-FhxNYss6n0AJEszpJ7+6CAJE2sdsflWQkvSLakTnFdY="; }; - cargoSha256 = "sha256-9gnKVZ3HQs3kNj4i1cgC+Jl3dhjx7QRaHSih1HOB3nI="; + cargoSha256 = "sha256-wyksA3RYpGkD6nhllNv8WkUwEdml4TiPM2a4GzfBD1o="; nativeBuildInputs = [ installShellFiles diff --git a/nixpkgs/pkgs/tools/networking/hurl/default.nix b/nixpkgs/pkgs/tools/networking/hurl/default.nix index 0843ba3a756a..1264bc107ea6 100644 --- a/nixpkgs/pkgs/tools/networking/hurl/default.nix +++ b/nixpkgs/pkgs/tools/networking/hurl/default.nix @@ -12,13 +12,13 @@ rustPlatform.buildRustPackage rec { pname = "hurl"; - version = "1.3.1"; + version = "1.5.0"; src = fetchFromGitHub { owner = "Orange-OpenSource"; repo = pname; rev = version; - sha256 = "sha256-BmBqFJ64Nolq+eGZ5D3LQU3Ek2Gs+HpH/bptCQScbIg="; + sha256 = "sha256-avgi3Y5PRI/RZLYw10ifYV6eKKEBi349NYtYs07GS2k="; }; nativeBuildInputs = [ @@ -37,7 +37,7 @@ rustPlatform.buildRustPackage rec { # Tests require network access to a test server doCheck = false; - cargoSha256 = "sha256-tAg3xwmh7SjJsm9r5TnhXHIDLpUQpz3YDS6gWxFgps4="; + cargoSha256 = "sha256-GB+MnvWkXcdlJvaxtSItm3nGRyr8zWhxSq58smPk/aY="; postInstall = '' python ci/gen_manpage.py docs/hurl.md > hurl.1 diff --git a/nixpkgs/pkgs/tools/networking/i2pd/default.nix b/nixpkgs/pkgs/tools/networking/i2pd/default.nix index a4534d1fc8bb..7c034a03e2e9 100644 --- a/nixpkgs/pkgs/tools/networking/i2pd/default.nix +++ b/nixpkgs/pkgs/tools/networking/i2pd/default.nix @@ -9,13 +9,13 @@ assert upnpSupport -> miniupnpc != null; stdenv.mkDerivation rec { pname = "i2pd"; - version = "2.39.0"; + version = "2.40.0"; src = fetchFromGitHub { owner = "PurpleI2P"; repo = pname; rev = version; - sha256 = "sha256-j8kHuX5Ca90ODjmF94HpGvjSpocDSuSxfVmvbIYRAKo="; + sha256 = "sha256-Cld5TP2YoLzm73q7uP/pwqEeUsT5uMPAUx9HABOVeZA="; }; buildInputs = with lib; [ boost zlib openssl ] diff --git a/nixpkgs/pkgs/tools/networking/inadyn/default.nix b/nixpkgs/pkgs/tools/networking/inadyn/default.nix index 7a3ee1e01211..359c13435942 100644 --- a/nixpkgs/pkgs/tools/networking/inadyn/default.nix +++ b/nixpkgs/pkgs/tools/networking/inadyn/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "inadyn"; - version = "2.8.1"; + version = "2.9.0"; src = fetchFromGitHub { owner = "troglobit"; repo = "inadyn"; rev = "v${version}"; - sha256 = "sha256-kr9xh7HMikargi0hhj3epH2c6R5lN4qD9nDaChNI4Kg="; + sha256 = "sha256-WYl602gDcPKxjQAlBedPHEOCNtaGgcaVZ/KbxcP2El4="; }; nativeBuildInputs = [ autoreconfHook pkg-config ]; diff --git a/nixpkgs/pkgs/tools/networking/innernet/default.nix b/nixpkgs/pkgs/tools/networking/innernet/default.nix index cf63342fbb65..5baaf2e12205 100644 --- a/nixpkgs/pkgs/tools/networking/innernet/default.nix +++ b/nixpkgs/pkgs/tools/networking/innernet/default.nix @@ -1,16 +1,27 @@ -{ lib, stdenv, rustPlatform, fetchFromGitHub, llvmPackages, sqlite, installShellFiles, Security, libiconv }: +{ lib +, stdenv +, rustPlatform +, fetchFromGitHub +, llvmPackages +, sqlite +, installShellFiles +, Security +, libiconv +, innernet +, testVersion +}: rustPlatform.buildRustPackage rec { pname = "innernet"; - version = "1.5.0"; + version = "1.5.2"; src = fetchFromGitHub { owner = "tonarino"; - repo = pname; + repo = "innernet"; rev = "v${version}"; - sha256 = "sha256-9oL91jacfUADaPvdTTvvXhpwzr9OnNnVLwy1okORss4="; + sha256 = "141zjfl125m5lrimam1dbpk40dqfq4vnaz42sbiq1v1avyg684fq"; }; - cargoSha256 = "sha256-jHWt7Jqv4B7u6Mvo3q69Omcn8kdnXGJSyzod1lDzvKE="; + cargoSha256 = "0559d0ayysvqs4k46fhgd4r8wa89abgx6rvhlh0gnlnga8vacpw5"; nativeBuildInputs = with llvmPackages; [ llvm @@ -28,21 +39,10 @@ rustPlatform.buildRustPackage rec { installShellCompletion doc/innernet-server.completions.{bash,fish,zsh} ''; - doInstallCheck = true; - installCheckPhase = '' - if [[ "$("$out/bin/${pname}"-server --version)" == "${pname}-server ${version}" ]]; then - echo '${pname}-server smoke check passed' - else - echo '${pname}-server smoke check failed' - return 1 - fi - if [[ "$("$out/bin/${pname}" --version)" == "${pname} ${version}" ]]; then - echo '${pname} smoke check passed' - else - echo '${pname} smoke check failed' - return 1 - fi - ''; + passthru.tests = { + serverVersion = testVersion { package = innernet; command = "innernet-server --version"; }; + version = testVersion { package = innernet; command = "innernet --version"; }; + }; meta = with lib; { description = "A private network system that uses WireGuard under the hood"; diff --git a/nixpkgs/pkgs/tools/networking/ipinfo/default.nix b/nixpkgs/pkgs/tools/networking/ipinfo/default.nix index 9a48588d3d86..c67a8747aa89 100644 --- a/nixpkgs/pkgs/tools/networking/ipinfo/default.nix +++ b/nixpkgs/pkgs/tools/networking/ipinfo/default.nix @@ -5,13 +5,13 @@ buildGoModule rec { pname = "ipinfo"; - version = "2.1.1"; + version = "2.7.0"; src = fetchFromGitHub { owner = pname; repo = "cli"; rev = "${pname}-${version}"; - sha256 = "15pwx94n4qi02r3ppqkpnkikpnbqmr8rrn9gmkbjy2vbdi147qwl"; + sha256 = "sha256-5kXFSxdZrlaBX+7R9hlM+40+3KlJ7g8xu4BN2PyxXEc="; }; vendorSha256 = null; diff --git a/nixpkgs/pkgs/tools/networking/isync/default.nix b/nixpkgs/pkgs/tools/networking/isync/default.nix index a6181e6f2ded..e26526dc68d5 100644 --- a/nixpkgs/pkgs/tools/networking/isync/default.nix +++ b/nixpkgs/pkgs/tools/networking/isync/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { pname = "isync"; - version = "1.4.3"; + version = "1.4.4"; src = fetchurl { url = "mirror://sourceforge/isync/${pname}-${version}.tar.gz"; - sha256 = "024p3glj4p7fhrssw5sr55arls9zna1igxxrspxlfd6sbds21ixl"; + sha256 = "1zq0wwvmqsl9y71546dr0aygzn9gjjfiw19hlcq87s929y4p6ckw"; }; nativeBuildInputs = [ pkg-config perl ]; diff --git a/nixpkgs/pkgs/tools/networking/jnettop/default.nix b/nixpkgs/pkgs/tools/networking/jnettop/default.nix index 91f92236ecf8..2c002843eca1 100644 --- a/nixpkgs/pkgs/tools/networking/jnettop/default.nix +++ b/nixpkgs/pkgs/tools/networking/jnettop/default.nix @@ -18,6 +18,14 @@ stdenv.mkDerivation rec { url = "https://sources.debian.net/data/main/j/jnettop/0.13.0-1/debian/patches/0001-Use-64-bit-integers-for-byte-totals-support-bigger-u.patch"; sha256 = "1b0alc12sj8pzcb66f8xslbqlbsvq28kz34v6jfhbb1q25hyr7jg"; }) + + # Fix pending upstream inclusion for ncurses-6.3: + # https://sourceforge.net/p/jnettop/patches/5/ + (fetchpatch { + name = "ncurses-6.3.patch"; + url = "https://sourceforge.net/p/jnettop/patches/5/attachment/jnettop-0.13.0-ncurses-6.3.patch"; + sha256 = "1a0g3bal6f2fh1sq9q5kfwljrnskfvrhdzhjadcds34gzsr26v7x"; + }) ]; preConfigure = "autoconf "; @@ -31,7 +39,7 @@ stdenv.mkDerivation rec { by bandwidth they use. ''; - homepage = "http://jnettop.kubs.info/"; + homepage = "https://sourceforge.net/projects/jnettop/"; license = lib.licenses.gpl2Plus; platforms = lib.platforms.unix; }; diff --git a/nixpkgs/pkgs/tools/networking/kail/default.nix b/nixpkgs/pkgs/tools/networking/kail/default.nix index ae431b329eaf..7777c129dbf5 100644 --- a/nixpkgs/pkgs/tools/networking/kail/default.nix +++ b/nixpkgs/pkgs/tools/networking/kail/default.nix @@ -1,27 +1,23 @@ -{ lib, buildGoPackage, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub }: -buildGoPackage rec { +buildGoModule rec { pname = "kail"; - version = "0.8.0"; + version = "0.15.0"; - goPackagePath = "github.com/boz/kail"; + ldflags = [ + "-s" + "-w" + "-X main.version=${version}" + ]; src = fetchFromGitHub { owner = "boz"; repo = "kail"; rev = "v${version}"; - sha256 = "0ibk7j40pj6f2086qcnwp998wld61d2gvrv7yiy6hlkalhww2pq7"; + sha256 = "0b4abzk8lc5qa04ywkl8b5hb9jmxhyi2dpgbl27gmw81525wjnj7"; }; - # regenerate deps.nix using following steps: - # - # go get -u github.com/boz/kail - # cd $GOPATH/src/github.com/boz/kail - # git checkout <version> - # dep init - # dep2nix - deleteVendor = true; - goDeps = ./deps.nix; + vendorSha256 = "09s7sq23hglcb2rsi9igzql39zs4238f3jfmvxz9a8v41da225np"; meta = with lib; { description = "Kubernetes log viewer"; diff --git a/nixpkgs/pkgs/tools/networking/kail/deps.nix b/nixpkgs/pkgs/tools/networking/kail/deps.nix deleted file mode 100644 index b6d9c3e9cf34..000000000000 --- a/nixpkgs/pkgs/tools/networking/kail/deps.nix +++ /dev/null @@ -1,408 +0,0 @@ -# file generated from Gopkg.lock using dep2nix (https://github.com/nixcloud/dep2nix) -[ - { - goPackagePath = "cloud.google.com/go"; - fetch = { - type = "git"; - url = "https://code.googlesource.com/gocloud"; - rev = "06f11fffc537c4aef126d9fd3a92e2d7968f118f"; - sha256 = "1zhr1pyzk44zb95r2bcs4kkngvmzdr5bac55315nnzl3adx4y4dn"; - }; - } - { - goPackagePath = "github.com/Azure/go-autorest"; - fetch = { - type = "git"; - url = "https://github.com/Azure/go-autorest"; - rev = "1ff28809256a84bb6966640ff3d0371af82ccba4"; - sha256 = "0sxvj2j1833bqwxvhq3wq3jgq73rnb81pnzvl0x3y1m0hzpaf2zv"; - }; - } - { - goPackagePath = "github.com/alecthomas/template"; - fetch = { - type = "git"; - url = "https://github.com/alecthomas/template"; - rev = "a0175ee3bccc567396460bf5acd36800cb10c49c"; - sha256 = "0qjgvvh26vk1cyfq9fadyhfgdj36f1iapbmr5xp6zqipldz8ffxj"; - }; - } - { - goPackagePath = "github.com/alecthomas/units"; - fetch = { - type = "git"; - url = "https://github.com/alecthomas/units"; - rev = "2efee857e7cfd4f3d0138cc3cbb1b4966962b93a"; - sha256 = "1j65b91qb9sbrml9cpabfrcf07wmgzzghrl7809hjjhrmbzri5bl"; - }; - } - { - goPackagePath = "github.com/boz/go-lifecycle"; - fetch = { - type = "git"; - url = "https://github.com/boz/go-lifecycle"; - rev = "c39961a5a0ce6b046f15d62bcbed79701666a9e0"; - sha256 = "12xzjzgi0pspb28xrcmp4v33jij2bbg609z1kpq1pql9mxs6h31k"; - }; - } - { - goPackagePath = "github.com/boz/go-logutil"; - fetch = { - type = "git"; - url = "https://github.com/boz/go-logutil"; - rev = "9d21a9e4757dbc497f947fe5253f9570c34562fa"; - sha256 = "0rhhyvvz1lvjalv3hx4yvyh90jqfia27nzx9m54m0i7d0znrwpbj"; - }; - } - { - goPackagePath = "github.com/boz/kcache"; - fetch = { - type = "git"; - url = "https://github.com/boz/kcache"; - rev = "a012826955254d3f31548911e75a9dbd817f9470"; - sha256 = "0xqw4mgz0scjrcfsyfwfdhggq1q80dv4mdqgdaryy5ir18srg15l"; - }; - } - { - goPackagePath = "github.com/davecgh/go-spew"; - fetch = { - type = "git"; - url = "https://github.com/davecgh/go-spew"; - rev = "adab96458c51a58dc1783b3335dcce5461522e75"; - sha256 = "1y743w875aqqwggrh4lwlmqyx7ls5m1bnw5y4vr3zps4ib3gb4n5"; - }; - } - { - goPackagePath = "github.com/dgrijalva/jwt-go"; - fetch = { - type = "git"; - url = "https://github.com/dgrijalva/jwt-go"; - rev = "06ea1031745cb8b3dab3f6a236daf2b0aa468b7e"; - sha256 = "08m27vlms74pfy5z79w67f9lk9zkx6a9jd68k3c4msxy75ry36mp"; - }; - } - { - goPackagePath = "github.com/fatih/color"; - fetch = { - type = "git"; - url = "https://github.com/fatih/color"; - rev = "67c513e5729f918f5e69786686770c27141a4490"; - sha256 = "045i2y2h1a6ml7fm1b3if4692320kjgg3cpxn7chlmpq7z1bmrrn"; - }; - } - { - goPackagePath = "github.com/ghodss/yaml"; - fetch = { - type = "git"; - url = "https://github.com/ghodss/yaml"; - rev = "0ca9ea5df5451ffdf184b4428c902747c2c11cd7"; - sha256 = "0skwmimpy7hlh7pva2slpcplnm912rp3igs98xnqmn859kwa5v8g"; - }; - } - { - goPackagePath = "github.com/gogo/protobuf"; - fetch = { - type = "git"; - url = "https://github.com/gogo/protobuf"; - rev = "1c2b16bc280d6635de6c52fc1471ab962dc36ec9"; - sha256 = "0h9vkfy3ydz0d6x72853yg49r9k54cgjnlv6a7v12gzqw47p941i"; - }; - } - { - goPackagePath = "github.com/golang/glog"; - fetch = { - type = "git"; - url = "https://github.com/golang/glog"; - rev = "23def4e6c14b4da8ac2ed8007337bc5eb5007998"; - sha256 = "0jb2834rw5sykfr937fxi8hxi2zy80sj2bdn9b3jb4b26ksqng30"; - }; - } - { - goPackagePath = "github.com/golang/protobuf"; - fetch = { - type = "git"; - url = "https://github.com/golang/protobuf"; - rev = "1909bc2f63dc92bb931deace8b8312c4db72d12f"; - sha256 = "0d4pknkgp5qlbfpw8xp81dqgrfm0na1pfi2ll559nwvjz5vc90g5"; - }; - } - { - goPackagePath = "github.com/google/btree"; - fetch = { - type = "git"; - url = "https://github.com/google/btree"; - rev = "316fb6d3f031ae8f4d457c6c5186b9e3ded70435"; - sha256 = "1fyj10cy2d37mpfk73hjfjwpsgpnmdzf2mrkkvzyx0d41sf46xfd"; - }; - } - { - goPackagePath = "github.com/google/gofuzz"; - fetch = { - type = "git"; - url = "https://github.com/google/gofuzz"; - rev = "24818f796faf91cd76ec7bddd72458fbced7a6c1"; - sha256 = "0cq90m2lgalrdfrwwyycrrmn785rgnxa3l3vp9yxkvnv88bymmlm"; - }; - } - { - goPackagePath = "github.com/googleapis/gnostic"; - fetch = { - type = "git"; - url = "https://github.com/googleapis/gnostic"; - rev = "57b0290873708074edf87ad921eccec8bef5f8ec"; - sha256 = "14raxxsx2bww4f0am0yygv64h950avkswm7bdvq6k4d4lry6dgg8"; - }; - } - { - goPackagePath = "github.com/gophercloud/gophercloud"; - fetch = { - type = "git"; - url = "https://github.com/gophercloud/gophercloud"; - rev = "b4c2377fa77951a0e08163f52dc9b3e206355194"; - sha256 = "00j9ny59zlf3ajwydf2k41n3l92kl2hf0ljx9x73jcfkdkn2xv5k"; - }; - } - { - goPackagePath = "github.com/gregjones/httpcache"; - fetch = { - type = "git"; - url = "https://github.com/gregjones/httpcache"; - rev = "c1f8028e62adb3d518b823a2f8e6a95c38bdd3aa"; - sha256 = "1v7fb4ix2xg0plx5p1f7xd1srvimyss7v7ppn3j7py9ycl560qhr"; - }; - } - { - goPackagePath = "github.com/imdario/mergo"; - fetch = { - type = "git"; - url = "https://github.com/imdario/mergo"; - rev = "e3000cb3d28c72b837601cac94debd91032d19fe"; - sha256 = "1bsz1aj0h266x7g08jj7f3nd3d5islbad0cygb5vh37hjgzirg4d"; - }; - } - { - goPackagePath = "github.com/json-iterator/go"; - fetch = { - type = "git"; - url = "https://github.com/json-iterator/go"; - rev = "ab8a2e0c74be9d3be70b3184d9acc634935ded82"; - sha256 = "1x3wz44p1238gpyzkiiilvvrq9q8dwjdm9kdidq65yjq0zcn0sq4"; - }; - } - { - goPackagePath = "github.com/mattn/go-colorable"; - fetch = { - type = "git"; - url = "https://github.com/mattn/go-colorable"; - rev = "6df6d4d004b64986bbb0d1b25945f42b44787e90"; - sha256 = "0ha2biq708is9i3hqc30vihcpajak3qawn0rnacb9k1gyxsxwb60"; - }; - } - { - goPackagePath = "github.com/mattn/go-isatty"; - fetch = { - type = "git"; - url = "https://github.com/mattn/go-isatty"; - rev = "fc9e8d8ef48496124e79ae0df75490096eccf6fe"; - sha256 = "1r5f9gkavkb1w6sr0qs5kj16706xirl3qnlq3hqpszkw9w27x65a"; - }; - } - { - goPackagePath = "github.com/modern-go/concurrent"; - fetch = { - type = "git"; - url = "https://github.com/modern-go/concurrent"; - rev = "bacd9c7ef1dd9b15be4a9909b8ac7a4e313eec94"; - sha256 = "0s0fxccsyb8icjmiym5k7prcqx36hvgdwl588y0491gi18k5i4zs"; - }; - } - { - goPackagePath = "github.com/modern-go/reflect2"; - fetch = { - type = "git"; - url = "https://github.com/modern-go/reflect2"; - rev = "94122c33edd36123c84d5368cfb2b69df93a0ec8"; - sha256 = "06a3sablw53n1dqqbr2f53jyksbxdmmk8axaas4yvnhyfi55k4lf"; - }; - } - { - goPackagePath = "github.com/petar/GoLLRB"; - fetch = { - type = "git"; - url = "https://github.com/petar/GoLLRB"; - rev = "53be0d36a84c2a886ca057d34b6aa4468df9ccb4"; - sha256 = "01xp3lcamqkvl91jg6ly202gdsgf64j39rkrcqxi6v4pbrcv7hz0"; - }; - } - { - goPackagePath = "github.com/peterbourgon/diskv"; - fetch = { - type = "git"; - url = "https://github.com/peterbourgon/diskv"; - rev = "5f041e8faa004a95c88a202771f4cc3e991971e6"; - sha256 = "1mxpa5aad08x30qcbffzk80g9540wvbca4blc1r2qyzl65b8929b"; - }; - } - { - goPackagePath = "github.com/pkg/errors"; - fetch = { - type = "git"; - url = "https://github.com/pkg/errors"; - rev = "2b3a18b5f0fb6b4f9190549597d3f962c02bc5eb"; - sha256 = "07fd392kqyaj7fnl4sgzy7fcs0sw4jx3mx2khhgk64n9j9i37l59"; - }; - } - { - goPackagePath = "github.com/pmezard/go-difflib"; - fetch = { - type = "git"; - url = "https://github.com/pmezard/go-difflib"; - rev = "792786c7400a136282c1664665ae0a8db921c6c2"; - sha256 = "0c1cn55m4rypmscgf0rrb88pn58j3ysvc2d0432dp3c6fqg6cnzw"; - }; - } - { - goPackagePath = "github.com/sirupsen/logrus"; - fetch = { - type = "git"; - url = "https://github.com/sirupsen/logrus"; - rev = "181d419aa9e2223811b824e8f0b4af96f9ba9302"; - sha256 = "08ff47w4clnkym3l0v4hhhfq21zvvwzpljvs0qvki5k0azv7siyc"; - }; - } - { - goPackagePath = "github.com/spf13/pflag"; - fetch = { - type = "git"; - url = "https://github.com/spf13/pflag"; - rev = "e57e3eeb33f795204c1ca35f56c44f83227c6e66"; - sha256 = "13mhx4i913jil32j295m3a36jzvq1y64xig0naadiz7q9ja011r2"; - }; - } - { - goPackagePath = "github.com/stretchr/testify"; - fetch = { - type = "git"; - url = "https://github.com/stretchr/testify"; - rev = "2aa2c176b9dab406a6970f6a55f513e8a8c8b18f"; - sha256 = "1j92x4291flz3i4pk6bi3y59nnsi6lj34zmyfp7axf68fd8vm5ml"; - }; - } - { - goPackagePath = "golang.org/x/crypto"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/crypto"; - rev = "b176d7def5d71bdd214203491f89843ed217f420"; - sha256 = "1ayi4iagsxhf193rx93j6y2rb48730hgm2qbahiq9lawm5g3vc14"; - }; - } - { - goPackagePath = "golang.org/x/net"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/net"; - rev = "1c05540f6879653db88113bc4a2b70aec4bd491f"; - sha256 = "0h8yqb0vcqgllgydrf9d3rzp83w8wlr8f0nm6r1rwf2qg30pq1pd"; - }; - } - { - goPackagePath = "golang.org/x/oauth2"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/oauth2"; - rev = "9a379c6b3e95a790ffc43293c2a78dee0d7b6e20"; - sha256 = "156wff8s9g3sxni2z80wky4v688pvdgfzxbpfp5rmqjvgqnifxkf"; - }; - } - { - goPackagePath = "golang.org/x/sys"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/sys"; - rev = "2d3e384235de683634e9080b58f757466840aa48"; - sha256 = "1w8zrcjv4sfi3skchdbvbixgwzp5n1g0vny8r20dlapnqbazah0x"; - }; - } - { - goPackagePath = "golang.org/x/text"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/text"; - rev = "b19bf474d317b857955b12035d2c5acb57ce8b01"; - sha256 = "0wc8csaafp0ps9jb2hdk8d6xpyw1axhk1np73h0z17x09zk3ylcr"; - }; - } - { - goPackagePath = "golang.org/x/time"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/time"; - rev = "fbb02b2291d28baffd63558aa44b4b56f178d650"; - sha256 = "0jjqcv6rzihlgg4i797q80g1f6ch5diz2kxqh6488gwkb6nds4h4"; - }; - } - { - goPackagePath = "google.golang.org/appengine"; - fetch = { - type = "git"; - url = "https://github.com/golang/appengine"; - rev = "d9a072cfa7b9736e44311ef77b3e09d804bfa599"; - sha256 = "07x7s65q9pydpaniga6zf259kw7qs40q6554wb22inq423wcs0nb"; - }; - } - { - goPackagePath = "gopkg.in/alecthomas/kingpin.v2"; - fetch = { - type = "git"; - url = "https://github.com/alecthomas/kingpin"; - rev = "1087e65c9441605df944fb12c33f0fe7072d18ca"; - sha256 = "18llqzkdqf62qbqcv2fd3j0igl6cwwn4dissf5skkvxrcxjcmmj0"; - }; - } - { - goPackagePath = "gopkg.in/inf.v0"; - fetch = { - type = "git"; - url = "https://github.com/go-inf/inf"; - rev = "3887ee99ecf07df5b447e9b00d9c0b2adaa9f3e4"; - sha256 = "0rf3vwyb8aqnac9x9d6ax7z5526c45a16yjm2pvkijr6qgqz8b82"; - }; - } - { - goPackagePath = "gopkg.in/yaml.v2"; - fetch = { - type = "git"; - url = "https://github.com/go-yaml/yaml"; - rev = "eb3733d160e74a9c7e442f435eb3bea458e1d19f"; - sha256 = "1srhvcaa9db3a6xj29mkjr5kg33y71pclrlx4vcwz5m1lgb5c7q6"; - }; - } - { - goPackagePath = "k8s.io/api"; - fetch = { - type = "git"; - url = "https://github.com/kubernetes/api"; - rev = "2d6f90ab1293a1fb871cf149423ebb72aa7423aa"; - sha256 = "1cwrwdm104xd3608b1a5mw6a19w45532p647xdwnyn62rw2f08jx"; - }; - } - { - goPackagePath = "k8s.io/apimachinery"; - fetch = { - type = "git"; - url = "https://github.com/kubernetes/apimachinery"; - rev = "103fd098999dc9c0c88536f5c9ad2e5da39373ae"; - sha256 = "04navnpm59d75dhlz07rmay7m2izrf4m0i9xklxzqg7mlk9g20jc"; - }; - } - { - goPackagePath = "k8s.io/client-go"; - fetch = { - type = "git"; - url = "https://github.com/kubernetes/client-go"; - rev = "1f13a808da65775f22cbf47862c4e5898d8f4ca1"; - sha256 = "1vkcjg80l49hxiadqmkkd031kj6kc10m8mwcnla3k1ml8fv4qna9"; - }; - } -] diff --git a/nixpkgs/pkgs/tools/networking/kapp/default.nix b/nixpkgs/pkgs/tools/networking/kapp/default.nix index cb568d4182ab..1c3f2de7212b 100644 --- a/nixpkgs/pkgs/tools/networking/kapp/default.nix +++ b/nixpkgs/pkgs/tools/networking/kapp/default.nix @@ -1,19 +1,23 @@ { lib, buildGoModule, fetchFromGitHub, installShellFiles }: buildGoModule rec { pname = "kapp"; - version = "0.40.0"; + version = "0.43.0"; src = fetchFromGitHub { owner = "vmware-tanzu"; repo = "carvel-kapp"; rev = "v${version}"; - sha256 = "sha256-9nvYxLE35IwmVB1Dzw7t3DZw4/kSiMPIqzl2PUKODtU="; + sha256 = "sha256-9e5vgOIB8PHbM5nsDaasyEfWP5dr7j3vU3+WzFua6bI="; }; vendorSha256 = null; subPackages = [ "cmd/kapp" ]; + ldflags = [ + "-X github.com/k14s/kapp/pkg/kapp/version.Version=${version}" + ]; + nativeBuildInputs = [ installShellFiles ]; postInstall = '' diff --git a/nixpkgs/pkgs/tools/networking/kea/default.nix b/nixpkgs/pkgs/tools/networking/kea/default.nix index 9bc3c1e8da3c..3458e5c6e54b 100644 --- a/nixpkgs/pkgs/tools/networking/kea/default.nix +++ b/nixpkgs/pkgs/tools/networking/kea/default.nix @@ -14,11 +14,11 @@ stdenv.mkDerivation rec { pname = "kea"; - version = "2.0.0"; # only even minor versions are stable + version = "2.0.1"; # only even minor versions are stable src = fetchurl { url = "https://ftp.isc.org/isc/${pname}/${version}/${pname}-${version}.tar.gz"; - sha256 = "sha256-BYVODDhxtFLtrOGOzMarYYlA4CSfvnwjKjbQauWb9B0="; + sha256 = "sha256-9Qu5qVTjFDFrQDOhddyAdJa7nBdUEQvZKiHBZanoTFc="; }; patches = [ ./dont-create-var.patch ]; diff --git a/nixpkgs/pkgs/tools/networking/linkchecker/default.nix b/nixpkgs/pkgs/tools/networking/linkchecker/default.nix index 480321ad15fc..3cb5ecb01530 100644 --- a/nixpkgs/pkgs/tools/networking/linkchecker/default.nix +++ b/nixpkgs/pkgs/tools/networking/linkchecker/default.nix @@ -4,13 +4,13 @@ with python3Packages; buildPythonApplication rec { pname = "linkchecker"; - version = "10.0.0"; + version = "10.0.1"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v" + version; - sha256 = "sha256-gcaamRxGn124LZ8rU+WzjRookU3akDO0ZyzI7/S6kFA="; + sha256 = "sha256-OOssHbX9nTCURpMKIy+95ZTvahuUAabLUhPnRp3xpN4="; }; nativeBuildInputs = [ gettext ]; diff --git a/nixpkgs/pkgs/tools/networking/lldpd/default.nix b/nixpkgs/pkgs/tools/networking/lldpd/default.nix index a4e5d565756b..29ca9961546a 100644 --- a/nixpkgs/pkgs/tools/networking/lldpd/default.nix +++ b/nixpkgs/pkgs/tools/networking/lldpd/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { pname = "lldpd"; - version = "1.0.11"; + version = "1.0.13"; src = fetchurl { url = "https://media.luffy.cx/files/lldpd/${pname}-${version}.tar.gz"; - sha256 = "sha256-tR0VcA+678t/uFw1BrSdMxc6DxXXAPkz7wRAZ7QtRuQ="; + sha256 = "sha256-1jmCf9iidyDRv9lLxS7KJK9j3cw8nS2mB4h3iInYRwE="; }; configureFlags = [ @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "802.1ab implementation (LLDP) to help you locate neighbors of all your equipments"; - homepage = "https://vincentbernat.github.io/lldpd/"; + homepage = "https://lldpd.github.io/"; license = licenses.isc; maintainers = with maintainers; [ fpletz ]; platforms = platforms.linux; diff --git a/nixpkgs/pkgs/tools/networking/lychee/default.nix b/nixpkgs/pkgs/tools/networking/lychee/default.nix index 72f5b6f57fd2..657fd108b9a0 100644 --- a/nixpkgs/pkgs/tools/networking/lychee/default.nix +++ b/nixpkgs/pkgs/tools/networking/lychee/default.nix @@ -7,16 +7,16 @@ rustPlatform.buildRustPackage rec { pname = "lychee"; - version = "0.7.0"; + version = "0.8.1"; src = fetchFromGitHub { owner = "lycheeverse"; repo = pname; - rev = version; - sha256 = "0kpwpbv0dqb0p4bxjlcjas6x1n91rdsvy2psrc1nyr1sh6gb1q5j"; + rev = "v${version}"; + sha256 = "sha256-TjjSysG4UCXVi5ytWaJVL31TFLHC3Ro5OEB56pzbn7s="; }; - cargoSha256 = "1b915zkg41n3azk4hhg6fgc83n7iq8p7drvdyil2m2a4qdjvp9r3"; + cargoSha256 = "sha256-apRXxd7RBnNjhZb0xAUr5hSTafyMbg0k1wgHT93Z66g="; nativeBuildInputs = [ pkg-config ]; diff --git a/nixpkgs/pkgs/tools/networking/mailsend/default.nix b/nixpkgs/pkgs/tools/networking/mailsend/default.nix index 9856634116eb..13a6dc005dd8 100644 --- a/nixpkgs/pkgs/tools/networking/mailsend/default.nix +++ b/nixpkgs/pkgs/tools/networking/mailsend/default.nix @@ -1,24 +1,17 @@ -{lib, stdenv, fetchurl, openssl}: -let - s = # Generated upstream information - rec { - baseName="mailsend"; - version="1.19"; - name="${baseName}-${version}"; - hash="1xwk6jvl5li8ddlik1lj88qswnyminp9wlf5cm8gg3n54szgcpjn"; - url="https://github.com/muquit/mailsend/archive/1.19.tar.gz"; - sha256="1xwk6jvl5li8ddlik1lj88qswnyminp9wlf5cm8gg3n54szgcpjn"; +{ lib, stdenv, fetchurl, openssl }: + +stdenv.mkDerivation rec { + pname = "mailsend"; + version = "1.19"; + + src = fetchurl { + url = "https://github.com/muquit/mailsend/archive/${version}.tar.gz"; + sha256 = "sha256-Vl72vibFjvdQZcVRnq6N1VuuMUKShhlpayjSQrc0k/c="; }; + buildInputs = [ openssl ]; -in -stdenv.mkDerivation { - inherit (s) name version; - inherit buildInputs; - src = fetchurl { - inherit (s) url sha256; - }; configureFlags = [ "--with-openssl=${openssl.dev}" ]; @@ -29,12 +22,11 @@ stdenv.mkDerivation { sha256 = "0vz373zcfl19inflybfjwshcq06rvhx0i5g0f4b021cxfhyb1sm0"; }) ]; - meta = { - inherit (s) version; + meta = with lib; { description = "CLI email sending tool"; - license = lib.licenses.bsd3 ; - maintainers = [lib.maintainers.raskin]; - platforms = lib.platforms.linux; + license = licenses.bsd3; + maintainers = with maintainers; [ raskin ]; + platforms = platforms.linux; homepage = "https://github.com/muquit/mailsend"; downloadPage = "https://github.com/muquit/mailsend/releases"; }; diff --git a/nixpkgs/pkgs/tools/networking/mailsend/default.upstream b/nixpkgs/pkgs/tools/networking/mailsend/default.upstream deleted file mode 100644 index 3d9862a3de21..000000000000 --- a/nixpkgs/pkgs/tools/networking/mailsend/default.upstream +++ /dev/null @@ -1,3 +0,0 @@ -url "https://github.com/muquit/mailsend/releases" -ensure_choice -version '.*/([0-9][0-9.a-z]*)[.]tar[.].*' '\1' diff --git a/nixpkgs/pkgs/tools/networking/mcrcon/default.nix b/nixpkgs/pkgs/tools/networking/mcrcon/default.nix index ed2596bc88ba..713a3dbfd91b 100644 --- a/nixpkgs/pkgs/tools/networking/mcrcon/default.nix +++ b/nixpkgs/pkgs/tools/networking/mcrcon/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "mcrcon"; - version = "0.7.1"; + version = "0.7.2"; src = fetchFromGitHub { owner = "Tiiffi"; repo = "mcrcon"; rev = "v${version}"; - sha256 = "004h1glagyw1mic1k461bky0w2fxdfhrhcqjzr9wp6gvyy9s8bix"; + sha256 = "sha256-cedeKsZgEyu0jqN4kBSgMJzFNUfCVXCEwH3M54miSG4="; }; buildPhase = '' diff --git a/nixpkgs/pkgs/tools/networking/minio-client/default.nix b/nixpkgs/pkgs/tools/networking/minio-client/default.nix index e36390f85271..535deea0a01a 100644 --- a/nixpkgs/pkgs/tools/networking/minio-client/default.nix +++ b/nixpkgs/pkgs/tools/networking/minio-client/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "minio-client"; - version = "2021-09-02T09-21-27Z"; + version = "2021-12-20T23-43-34Z"; src = fetchFromGitHub { owner = "minio"; repo = "mc"; rev = "RELEASE.${version}"; - sha256 = "sha256-6G0MyeDYc8Y6eib2T+2VB5mDjyO13FdBsufy57osIEk="; + sha256 = "sha256-9/8h7KlvGRyxFiGLd5YAOjvzGsrkDUJDei6WQtrgY2s="; }; - vendorSha256 = "sha256-J1khnNTiHkTPRjNlU2yQu8b+bwKP/KBF1KxTIvGLs+U="; + vendorSha256 = "sha256-hC/HMS585eICdxXKpSPQaL0/+3/GMmhA3bXwKo1dN2s="; subPackages = [ "." ]; @@ -29,7 +29,7 @@ buildGoModule rec { meta = with lib; { homepage = "https://github.com/minio/mc"; description = "A replacement for ls, cp, mkdir, diff and rsync commands for filesystems and object storage"; - maintainers = with maintainers; [ bachp eelco superherointj ]; + maintainers = with maintainers; [ bachp eelco ]; platforms = platforms.unix; license = licenses.asl20; }; diff --git a/nixpkgs/pkgs/tools/networking/miniupnpc/default.nix b/nixpkgs/pkgs/tools/networking/miniupnpc/default.nix index 0182440a8eb7..65adb3c5eb89 100644 --- a/nixpkgs/pkgs/tools/networking/miniupnpc/default.nix +++ b/nixpkgs/pkgs/tools/networking/miniupnpc/default.nix @@ -19,7 +19,9 @@ let makeFlags = [ "PREFIX=$(out)" "INSTALLPREFIX=$(out)" ]; - postInstall = ''chmod +x "$out"/lib/libminiupnpc.so''; + postInstall = '' + chmod +x "$out"/lib/libminiupnpc${stdenv.hostPlatform.extensions.sharedLibrary} + ''; meta = with lib; { homepage = "http://miniupnp.free.fr/"; diff --git a/nixpkgs/pkgs/tools/networking/modemmanager/default.nix b/nixpkgs/pkgs/tools/networking/modemmanager/default.nix index e352e67d3fe5..299342197897 100644 --- a/nixpkgs/pkgs/tools/networking/modemmanager/default.nix +++ b/nixpkgs/pkgs/tools/networking/modemmanager/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { pname = "modemmanager"; - version = "1.16.10"; + version = "1.18.2"; src = fetchurl { url = "https://www.freedesktop.org/software/ModemManager/ModemManager-${version}.tar.xz"; - sha256 = "sha256-LM8fcWwtEh6OZwm8+K8p7oaXGpCtrMoujWKIswJ4hi4="; + sha256 = "sha256-N0vhWK4cH7OKKe7xzDzfif81NrSP8TINIIqyBOpsX4o="; }; nativeBuildInputs = [ vala gobject-introspection gettext pkg-config ]; diff --git a/nixpkgs/pkgs/tools/networking/mosh/default.nix b/nixpkgs/pkgs/tools/networking/mosh/default.nix index 00746a7afbd2..e87b550aa6fe 100644 --- a/nixpkgs/pkgs/tools/networking/mosh/default.nix +++ b/nixpkgs/pkgs/tools/networking/mosh/default.nix @@ -30,6 +30,7 @@ stdenv.mkDerivation rec { # Fix build with bash-completion 2.10 ./bash_completion_datadir.patch ]; + postPatch = '' # Fix build with Xcode 12.5 toolchain/case-insensitive filesystems # Backport of https://github.com/mobile-shell/mosh/commit/12199114fe4234f791ef4c306163901643b40538; @@ -40,12 +41,12 @@ stdenv.mkDerivation rec { }} substituteInPlace scripts/mosh.pl \ - --subst-var-by ssh "${openssh}/bin/ssh" - substituteInPlace scripts/mosh.pl \ - --subst-var-by mosh-client "$out/bin/mosh-client" + --subst-var-by ssh "${openssh}/bin/ssh" \ + --subst-var-by mosh-client "$out/bin/mosh-client" ''; - configureFlags = [ "--enable-completion" ] ++ lib.optional withUtempter "--with-utempter"; + configureFlags = [ "--enable-completion" ] + ++ lib.optional withUtempter "--with-utempter"; postInstall = '' wrapProgram $out/bin/mosh --prefix PERL5LIB : $PERL5LIB @@ -65,7 +66,7 @@ stdenv.mkDerivation rec { especially over Wi-Fi, cellular, and long-distance links. ''; license = licenses.gpl3Plus; - maintainers = with maintainers; [ viric ]; + maintainers = with maintainers; [ viric SuperSandro2000 ]; platforms = platforms.unix; }; } diff --git a/nixpkgs/pkgs/tools/networking/mqttui/default.nix b/nixpkgs/pkgs/tools/networking/mqttui/default.nix new file mode 100644 index 000000000000..7945cd168d42 --- /dev/null +++ b/nixpkgs/pkgs/tools/networking/mqttui/default.nix @@ -0,0 +1,29 @@ +{ lib +, stdenv +, fetchFromGitHub +, rustPlatform +, Security +}: + +rustPlatform.buildRustPackage rec { + pname = "mqttui"; + version = "0.13.0"; + + src = fetchFromGitHub { + owner = "EdJoPaTo"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-taGpVLO9K5VmthWadstQcujcLHTb3fhEWDxKGd3Pj+E="; + }; + + cargoSha256 = "sha256-aAMDl8GZ+XqA4uBiDm2eHQsNFiqCrMBO66X0ruEjpJg="; + + buildInputs = lib.optional stdenv.isDarwin Security; + + meta = with lib; { + description = "Terminal client for MQTT"; + homepage = "https://github.com/EdJoPaTo/mqttui"; + license = licenses.gpl3Only; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/nixpkgs/pkgs/tools/networking/mtr/default.nix b/nixpkgs/pkgs/tools/networking/mtr/default.nix index 1257c167e768..177fdee99b37 100644 --- a/nixpkgs/pkgs/tools/networking/mtr/default.nix +++ b/nixpkgs/pkgs/tools/networking/mtr/default.nix @@ -1,5 +1,5 @@ -{ stdenv, lib, fetchFromGitHub, autoreconfHook, pkg-config -, libcap, ncurses +{ stdenv, lib, fetchFromGitHub, fetchpatch, autoreconfHook, pkg-config +, libcap, ncurses, jansson , withGtk ? false, gtk3 }: stdenv.mkDerivation rec { @@ -13,6 +13,16 @@ stdenv.mkDerivation rec { sha256 = "0wnz87cr2lcl74bj8qxq9xgai40az3pk9k0z893scyc8svd61xz6"; }; + patches = [ + # pull patch to fix build failure against ncurses-6.3: + # https://github.com/traviscross/mtr/pull/411 + (fetchpatch { + name = "ncurses-6.3.patch"; + url = "https://github.com/traviscross/mtr/commit/aeb493e08eabcb4e6178bda0bb84e9cd01c9f213.patch"; + sha256 = "1qk8lf4sha18g36mr84vbdvll2s8khgbzyyq0as3ifx44lv0qlf2"; + }) + ]; + # we need this before autoreconfHook does its thing postPatch = '' echo ${version} > .tarball-version @@ -28,7 +38,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook pkg-config ]; - buildInputs = [ ncurses ] + buildInputs = [ ncurses jansson ] ++ lib.optional withGtk gtk3 ++ lib.optional stdenv.isLinux libcap; diff --git a/nixpkgs/pkgs/tools/networking/mu/default.nix b/nixpkgs/pkgs/tools/networking/mu/default.nix index 4b9efdc24a60..47d0dffda007 100644 --- a/nixpkgs/pkgs/tools/networking/mu/default.nix +++ b/nixpkgs/pkgs/tools/networking/mu/default.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation rec { pname = "mu"; - version = "1.6.6"; + version = "1.6.10"; src = fetchFromGitHub { owner = "djcb"; repo = "mu"; rev = version; - sha256 = "64TfXPz1NCGKnozI9j+yog+hln1rA/qpzCLvPNSvH+c="; + sha256 = "1uJB8QdR0JgWlogb1cdUicz+LLtYQpAvYJjwcRjXt+E="; }; postPatch = lib.optionalString (batchSize != null) '' diff --git a/nixpkgs/pkgs/tools/networking/mubeng/default.nix b/nixpkgs/pkgs/tools/networking/mubeng/default.nix index 2c560cffb07b..750461b708e8 100644 --- a/nixpkgs/pkgs/tools/networking/mubeng/default.nix +++ b/nixpkgs/pkgs/tools/networking/mubeng/default.nix @@ -5,16 +5,18 @@ buildGoModule rec { pname = "mubeng"; - version = "0.5.2"; + version = "0.8.0"; src = fetchFromGitHub { owner = "kitabisa"; repo = pname; rev = "v${version}"; - sha256 = "sha256-jwBDa/TfXrD+f0q4nyQkpi52Jwl1XWZrMd3fPowNzgA="; + sha256 = "sha256-ckTIHtS7lUUP1Ozt+6O0CAyl3JrcXFqiBC6c+Uc7lwA="; }; - vendorSha256 = "sha256-/K1kBuxGEDUCBC7PiSpQRv1NEvTKwN+vNg2rz7pg838="; + vendorSha256 = "sha256-sAcDyGNOSm+BnsYyrR2x1vkGo6ZEykhkF7L9lzPrD+o="; + + ldflags = [ "-s" "-w" "-X ktbs.dev/mubeng/common.Version=${version}" ]; meta = with lib; { description = "Proxy checker and IP rotator"; diff --git a/nixpkgs/pkgs/tools/networking/ndn-tools/default.nix b/nixpkgs/pkgs/tools/networking/ndn-tools/default.nix new file mode 100644 index 000000000000..1b693f21f62e --- /dev/null +++ b/nixpkgs/pkgs/tools/networking/ndn-tools/default.nix @@ -0,0 +1,47 @@ +{ lib +, stdenv +, boost175 +, fetchFromGitHub +, libpcap +, ndn-cxx +, openssl +, pkg-config +, sphinx +, wafHook +}: + +stdenv.mkDerivation rec { + pname = "ndn-tools"; + version = "0.7.1"; + + src = fetchFromGitHub { + owner = "named-data"; + repo = pname; + rev = "ndn-tools-${version}"; + sha256 = "sha256-3hE/esOcS/ln94wZIRVCLjWgouEYnJJf3EvirNEGTeA="; + }; + + nativeBuildInputs = [ pkg-config sphinx wafHook ]; + buildInputs = [ libpcap ndn-cxx openssl ]; + + wafConfigureFlags = [ + "--boost-includes=${boost175.dev}/include" + "--boost-libs=${boost175.out}/lib" + # "--with-tests" + ]; + + doCheck = false; + checkPhase = '' + runHook preCheck + build/unit-tests + runHook postCheck + ''; + + meta = with lib; { + homepage = "https://named-data.net/"; + description = "Named Data Neworking (NDN) Essential Tools"; + license = licenses.gpl3Plus; + platforms = platforms.unix; + maintainers = with maintainers; [ bertof ]; + }; +} diff --git a/nixpkgs/pkgs/tools/networking/nebula/default.nix b/nixpkgs/pkgs/tools/networking/nebula/default.nix index 2aec2fb50c76..a30c9f3bbdcd 100644 --- a/nixpkgs/pkgs/tools/networking/nebula/default.nix +++ b/nixpkgs/pkgs/tools/networking/nebula/default.nix @@ -1,17 +1,17 @@ -{ lib, buildGoModule, fetchFromGitHub }: +{ lib, buildGo117Module, fetchFromGitHub }: -buildGoModule rec { +buildGo117Module rec { pname = "nebula"; - version = "1.4.0"; + version = "1.5.2"; src = fetchFromGitHub { owner = "slackhq"; repo = pname; rev = "v${version}"; - sha256 = "lu2/rSB9cFD7VUiK+niuqCX9CI2x+k4Pi+U5yksETSU="; + sha256 = "kxBu+r99sC3XWDX+xTmhdUJx0HMVWA0Xgy7wgfrjZ5E="; }; - vendorSha256 = "p1inJ9+NAb2d81cn+y+ofhxFz9ObUiLgj+9cACa6Jqg="; + vendorSha256 = "5Yv2t5vdUNCcCo2KAm1xCkRVrt6gIasKHLqH7VVPDuU="; doCheck = false; @@ -38,7 +38,7 @@ buildGoModule rec { ''; homepage = "https://github.com/slackhq/nebula"; license = licenses.mit; - maintainers = with maintainers; [ Br1ght0ne ]; + maintainers = with maintainers; [ Br1ght0ne numinit ]; }; } diff --git a/nixpkgs/pkgs/tools/networking/netboot/default.nix b/nixpkgs/pkgs/tools/networking/netboot/default.nix index fdd1857ef10e..cfd768e40ab6 100644 --- a/nixpkgs/pkgs/tools/networking/netboot/default.nix +++ b/nixpkgs/pkgs/tools/networking/netboot/default.nix @@ -1,7 +1,7 @@ { lib, stdenv, fetchurl, bison, lzo, db4 }: stdenv.mkDerivation rec { - name = "netboot"; + pname = "netboot"; version = "0.10.2"; src = fetchurl { diff --git a/nixpkgs/pkgs/tools/networking/netdiscover/default.nix b/nixpkgs/pkgs/tools/networking/netdiscover/default.nix new file mode 100644 index 000000000000..1a7b93eef8ab --- /dev/null +++ b/nixpkgs/pkgs/tools/networking/netdiscover/default.nix @@ -0,0 +1,26 @@ +{ lib, stdenv, fetchFromGitHub, libpcap, libnet, autoreconfHook }: + +stdenv.mkDerivation rec { + pname = "netdiscover"; + version = "0.8.1"; + + src = fetchFromGitHub { + owner = "netdiscover-scanner"; + repo = pname; + rev = version; + sha256 = "13fp9rfr9vh756m5wck76zbcr0296ir52dahzlqdr52ha9vrswbb"; + }; + + nativeBuildInputs = [ autoreconfHook ]; + buildInputs = [ libpcap libnet ]; + + # Running update-oui-database.sh would probably make the build irreproducible + + meta = with lib; { + description = "A network address discovering tool, developed mainly for those wireless networks without dhcp server, it also works on hub/switched networks"; + homepage = "https://github.com/netdiscover-scanner/netdiscover"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ vdot0x23 ]; + platforms = platforms.unix; + }; +} diff --git a/nixpkgs/pkgs/tools/networking/nethogs/default.nix b/nixpkgs/pkgs/tools/networking/nethogs/default.nix index c6a8f3b7f4e9..c26cb527f55e 100644 --- a/nixpkgs/pkgs/tools/networking/nethogs/default.nix +++ b/nixpkgs/pkgs/tools/networking/nethogs/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, ncurses, libpcap }: +{ lib, stdenv, fetchFromGitHub, fetchpatch, ncurses, libpcap }: stdenv.mkDerivation rec { pname = "nethogs"; @@ -11,9 +11,19 @@ stdenv.mkDerivation rec { sha256 = "0sn1sdp86akwlm4r1vmkxjjl50c0xaisk91bbz57z7kcsaphxna9"; }; + patches = [ + # Pull upstream patch for ncurses-6.3 support: + # https://github.com/raboof/nethogs/pull/210 + (fetchpatch { + name = "ncurses-6.3.patch"; + url = "https://github.com/raboof/nethogs/commit/455daf357da7f394763e5b93b11b3defe1f82ed1.patch"; + sha256 = "0wkp0yr6qg1asgvmsn7blf7rq48sh5k4n3w0nxf5869hxvkhnnzs"; + }) + ]; + buildInputs = [ ncurses libpcap ]; - makeFlags = [ "VERSION=${version}" ]; + makeFlags = [ "VERSION=${version}" "nethogs" ]; installFlags = [ "PREFIX=$(out)" "sbin=$(out)/bin" ]; diff --git a/nixpkgs/pkgs/tools/networking/networkmanager/applet/default.nix b/nixpkgs/pkgs/tools/networking/networkmanager/applet/default.nix index e6cf8d0e09cc..fbb56f4c5c90 100644 --- a/nixpkgs/pkgs/tools/networking/networkmanager/applet/default.nix +++ b/nixpkgs/pkgs/tools/networking/networkmanager/applet/default.nix @@ -83,7 +83,7 @@ stdenv.mkDerivation rec { homepage = "https://gitlab.gnome.org/GNOME/network-manager-applet/"; description = "NetworkManager control applet for GNOME"; license = licenses.gpl2Plus; - maintainers = with maintainers; [ phreedom ]; + maintainers = with maintainers; [ ]; platforms = platforms.linux; }; } diff --git a/nixpkgs/pkgs/tools/networking/networkmanager/default.nix b/nixpkgs/pkgs/tools/networking/networkmanager/default.nix index 8a1a6dd8fa1b..ac261f83d570 100644 --- a/nixpkgs/pkgs/tools/networking/networkmanager/default.nix +++ b/nixpkgs/pkgs/tools/networking/networkmanager/default.nix @@ -54,11 +54,11 @@ let in stdenv.mkDerivation rec { pname = "networkmanager"; - version = "1.32.10"; + version = "1.32.12"; src = fetchurl { url = "mirror://gnome/sources/NetworkManager/${lib.versions.majorMinor version}/NetworkManager-${version}.tar.xz"; - sha256 = "sha256-PlzMZoBWWePxGnGOOlmflya3mgHW/xSBS+ati8Xai7g="; + sha256 = "sha256-qKs2oKUC/nPNjjustlhfl/u5Tr73nids268Rwz/49Us="; }; outputs = [ "out" "dev" "devdoc" "man" "doc" ]; @@ -191,7 +191,7 @@ stdenv.mkDerivation rec { description = "Network configuration and management tool"; license = licenses.gpl2Plus; changelog = "https://gitlab.freedesktop.org/NetworkManager/NetworkManager/-/raw/${version}/NEWS"; - maintainers = teams.freedesktop.members ++ (with maintainers; [ phreedom domenkozar obadz maxeaubrey ]); + maintainers = teams.freedesktop.members ++ (with maintainers; [ domenkozar obadz maxeaubrey ]); platforms = platforms.linux; }; } diff --git a/nixpkgs/pkgs/tools/networking/nfstrace/default.nix b/nixpkgs/pkgs/tools/networking/nfstrace/default.nix index ca75e50fa527..7e2b938e4c8b 100644 --- a/nixpkgs/pkgs/tools/networking/nfstrace/default.nix +++ b/nixpkgs/pkgs/tools/networking/nfstrace/default.nix @@ -22,11 +22,21 @@ stdenv.mkDerivation rec { url = "https://github.com/epam/nfstrace/commit/4562a895ed3ac0e811bdd489068ad3ebe4d7b501.patch"; sha256 = "1fbicbllyykjknik7asa81x0ixxmbwqwkiz74cnznagv10jlkj3p"; }) + + # Fix pending upstream inclusion for ncurses-6.3 support: + # https://github.com/epam/nfstrace/pull/50 + (fetchpatch { + name = "ncurses-6.3.patch"; + url = "https://github.com/epam/nfstrace/commit/29c7c415f5412df1aae9b1e6ed3a2760d2c227a0.patch"; + sha256 = "134709w6bld010jx3xdy9imcjzal904a84n9f8vv0wnas5clxdmx"; + }) ]; postPatch = '' + # -Wall -Wextra -Werror fails on clang and newer gcc substituteInPlace CMakeLists.txt \ - --replace "-Wno-braced-scalar-init" "" + --replace "-Wno-braced-scalar-init" "" \ + --replace "-Werror" "" ''; buildInputs = [ json_c libpcap ncurses libtirpc ]; diff --git a/nixpkgs/pkgs/tools/networking/ngrep/default.nix b/nixpkgs/pkgs/tools/networking/ngrep/default.nix index 1e57ac75843e..bee8678d1c93 100644 --- a/nixpkgs/pkgs/tools/networking/ngrep/default.nix +++ b/nixpkgs/pkgs/tools/networking/ngrep/default.nix @@ -48,7 +48,7 @@ stdenv.mkDerivation rec { # 'BSD-like' license but that the 'regex' library (in the ngrep tarball) is # GPLv2. license = "ngrep"; # Some custom BSD-style, see LICENSE.txt - platforms = platforms.linux; + platforms = with platforms; linux ++ darwin; maintainers = [ maintainers.bjornfor ]; }; } diff --git a/nixpkgs/pkgs/tools/networking/ngrok-2/default.nix b/nixpkgs/pkgs/tools/networking/ngrok-2/default.nix index 2840b9d8400a..6093cea40f07 100644 --- a/nixpkgs/pkgs/tools/networking/ngrok-2/default.nix +++ b/nixpkgs/pkgs/tools/networking/ngrok-2/default.nix @@ -2,7 +2,7 @@ with lib; -let versions = builtins.fromJSON (builtins.readFile ./versions.json); +let versions = lib.importJSON ./versions.json; arch = if stdenv.isi686 then "386" else if stdenv.isx86_64 then "amd64" else if stdenv.isAarch32 then "arm" @@ -16,8 +16,8 @@ let versions = builtins.fromJSON (builtins.readFile ./versions.json); in stdenv.mkDerivation { - name = "ngrok-${version}"; - version = version; + pname = "ngrok"; + inherit version; # run ./update src = fetchurl { inherit sha256 url; }; @@ -34,6 +34,9 @@ stdenv.mkDerivation { passthru.updateScript = ./update.sh; + # Stripping causes SEGFAULT on x86_64-darwin + dontStrip = true; + meta = { description = "Allows you to expose a web server running on your local machine to the internet"; homepage = "https://ngrok.com/"; diff --git a/nixpkgs/pkgs/tools/networking/nss-mdns/default.nix b/nixpkgs/pkgs/tools/networking/nss-mdns/default.nix index 6faf1f06dbb8..6ba996401a84 100644 --- a/nixpkgs/pkgs/tools/networking/nss-mdns/default.nix +++ b/nixpkgs/pkgs/tools/networking/nss-mdns/default.nix @@ -21,14 +21,13 @@ stdenv.mkDerivation rec { "--localstatedir=/var" ]; - patches = lib.optional stdenv.hostPlatform.isMusl - ( - fetchpatch - { - url = "https://raw.githubusercontent.com/openembedded/openembedded-core/94f780e889f194b67a48587ac68b3200288bee10/meta/recipes-connectivity/libnss-mdns/libnss-mdns/0001-check-for-nss.h.patch"; - sha256 = "1l1kjbdw8z31br4vib3l5b85jy7kxin760a2f24lww8v6lqdpgds"; - } - ); + patches = [ + # Provide compat definition for libc lacking <nss.h> (e.g. musl) + (fetchpatch { + url = "https://raw.githubusercontent.com/openembedded/openembedded-core/94f780e889f194b67a48587ac68b3200288bee10/meta/recipes-connectivity/libnss-mdns/libnss-mdns/0001-check-for-nss.h.patch"; + sha256 = "1l1kjbdw8z31br4vib3l5b85jy7kxin760a2f24lww8v6lqdpgds"; + }) + ]; meta = { diff --git a/nixpkgs/pkgs/tools/networking/ntp/default.nix b/nixpkgs/pkgs/tools/networking/ntp/default.nix index c8af08a3a30d..92a6005e2a66 100644 --- a/nixpkgs/pkgs/tools/networking/ntp/default.nix +++ b/nixpkgs/pkgs/tools/networking/ntp/default.nix @@ -1,11 +1,4 @@ -{ stdenv, lib, fetchurl, openssl, perl, libcap ? null, libseccomp ? null, pps-tools }: - -assert stdenv.isLinux -> libcap != null; -assert stdenv.isLinux -> libseccomp != null; - -let - withSeccomp = stdenv.isLinux && (stdenv.isi686 || stdenv.isx86_64); -in +{ stdenv, lib, fetchurl, openssl, perl, pps-tools, libcap }: stdenv.mkDerivation rec { pname = "ntp"; @@ -16,10 +9,6 @@ stdenv.mkDerivation rec { sha256 = "06cwhimm71safmwvp6nhxp6hvxsg62whnbgbgiflsqb8mgg40n7n"; }; - # The hardcoded list of allowed system calls for seccomp is - # insufficient for NixOS, add more to make it work (issue #21136). - patches = [ ./seccomp.patch ]; - configureFlags = [ "--sysconfdir=/etc" "--localstatedir=/var" @@ -27,12 +16,10 @@ stdenv.mkDerivation rec { "--with-openssl-incdir=${openssl.dev}/include" "--enable-ignore-dns-errors" "--with-yielding-select=yes" - ] ++ lib.optional stdenv.isLinux "--enable-linuxcaps" - ++ lib.optional withSeccomp "--enable-libseccomp"; + ] ++ lib.optional stdenv.isLinux "--enable-linuxcaps"; - buildInputs = [ libcap openssl perl ] - ++ lib.optional withSeccomp libseccomp - ++ lib.optional stdenv.isLinux pps-tools; + buildInputs = [ openssl perl ] + ++ lib.optionals stdenv.isLinux [ pps-tools libcap ]; hardeningEnable = [ "pie" ]; diff --git a/nixpkgs/pkgs/tools/networking/ntp/seccomp.patch b/nixpkgs/pkgs/tools/networking/ntp/seccomp.patch deleted file mode 100644 index c75536dac7fb..000000000000 --- a/nixpkgs/pkgs/tools/networking/ntp/seccomp.patch +++ /dev/null @@ -1,57 +0,0 @@ -From 881e427f3236046466bdb8235edf86e6dfa34391 Mon Sep 17 00:00:00 2001 -From: Michael Bishop <cleverca22@gmail.com> -Date: Mon, 11 Jun 2018 08:30:48 -0300 -Subject: [PATCH] fix the seccomp filter to include a few previously missed - syscalls - ---- - ntpd/ntpd.c | 8 ++++++++ - 1 file changed, 8 insertions(+) - -diff --git a/ntpd/ntpd.c b/ntpd/ntpd.c -index 2c7f02ec5..4c59dc2ba 100644 ---- a/ntpd/ntpd.c -+++ b/ntpd/ntpd.c -@@ -1140,10 +1140,12 @@ int scmp_sc[] = { - SCMP_SYS(close), - SCMP_SYS(connect), - SCMP_SYS(exit_group), -+ SCMP_SYS(fcntl), - SCMP_SYS(fstat), - SCMP_SYS(fsync), - SCMP_SYS(futex), - SCMP_SYS(getitimer), -+ SCMP_SYS(getpid), - SCMP_SYS(getsockname), - SCMP_SYS(ioctl), - SCMP_SYS(lseek), -@@ -1162,6 +1164,8 @@ int scmp_sc[] = { - SCMP_SYS(sendto), - SCMP_SYS(setitimer), - SCMP_SYS(setsid), -+ SCMP_SYS(setsockopt), -+ SCMP_SYS(openat), - SCMP_SYS(socket), - SCMP_SYS(stat), - SCMP_SYS(time), -@@ -1178,9 +1182,11 @@ int scmp_sc[] = { - SCMP_SYS(clock_settime), - SCMP_SYS(close), - SCMP_SYS(exit_group), -+ SCMP_SYS(fcntl), - SCMP_SYS(fsync), - SCMP_SYS(futex), - SCMP_SYS(getitimer), -+ SCMP_SYS(getpid), - SCMP_SYS(madvise), - SCMP_SYS(mmap), - SCMP_SYS(mmap2), -@@ -1194,6 +1200,8 @@ int scmp_sc[] = { - SCMP_SYS(select), - SCMP_SYS(setitimer), - SCMP_SYS(setsid), -+ SCMP_SYS(setsockopt), -+ SCMP_SYS(openat), - SCMP_SYS(sigprocmask), - SCMP_SYS(sigreturn), - SCMP_SYS(socketcall), diff --git a/nixpkgs/pkgs/tools/networking/oapi-codegen/default.nix b/nixpkgs/pkgs/tools/networking/oapi-codegen/default.nix index 41e80a3e12cb..163341d06466 100644 --- a/nixpkgs/pkgs/tools/networking/oapi-codegen/default.nix +++ b/nixpkgs/pkgs/tools/networking/oapi-codegen/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "oapi-codegen"; - version = "1.8.2"; + version = "1.9.0"; src = fetchFromGitHub { owner = "deepmap"; repo = pname; rev = "v${version}"; - sha256 = "sha256-8hyRuGKspWqv+uBeSz4i12Grl83EQVPWB1weEVf9yhA="; + sha256 = "sha256-pGkTCOQ2OR/9c5+L9UgESJjSMmz9FjfJw9NB8Nr6gRQ="; }; - vendorSha256 = "sha256-YCZzIsu1mMAAjLGHISrDkfY4Lx0az2SZV8bnZOMalx8="; + vendorSha256 = "sha256-hvY64cmfvEeHniscD1WDyaeFpWeBJwsDNwr76e9F6ow="; # Tests use network doCheck = false; diff --git a/nixpkgs/pkgs/tools/networking/obfs4/default.nix b/nixpkgs/pkgs/tools/networking/obfs4/default.nix index 0a74deea17d5..ab13d3f4ef98 100644 --- a/nixpkgs/pkgs/tools/networking/obfs4/default.nix +++ b/nixpkgs/pkgs/tools/networking/obfs4/default.nix @@ -2,15 +2,15 @@ buildGoModule rec { pname = "obfs4"; - version = "0.0.10"; + version = "0.0.11"; src = fetchgit { url = meta.repositories.git; rev = "refs/tags/${pname}proxy-${version}"; - sha256 = "05aqmw8x8s0yqyqmdj5zcsq06gsbcmrlcd52gaqm20m1pg9503ad"; + sha256 = "sha256-VjJ/Pc1YjNB2iLnN/5CxuaxolcaR1IMWgoESMzOXU/g="; }; - vendorSha256 = "0h3gjxv26pc6cysvy1hny2f4abw6i847dk8fx0m113ixx9qghk87"; + vendorSha256 = "sha256-xGCK8biTYcrmKbsl6ZyCjpRrVP9x5xGrC3VcMsR7ETo="; doCheck = false; @@ -18,6 +18,6 @@ buildGoModule rec { description = "A pluggable transport proxy"; homepage = "https://www.torproject.org/projects/obfsproxy"; repositories.git = "https://git.torproject.org/pluggable-transports/obfs4.git"; - maintainers = with maintainers; [ phreedom thoughtpolice ]; + maintainers = with maintainers; [ thoughtpolice ]; }; } diff --git a/nixpkgs/pkgs/tools/networking/ocserv/default.nix b/nixpkgs/pkgs/tools/networking/ocserv/default.nix index 2f5dd14757bc..5391ec03ae7c 100644 --- a/nixpkgs/pkgs/tools/networking/ocserv/default.nix +++ b/nixpkgs/pkgs/tools/networking/ocserv/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { pname = "ocserv"; - version = "0.12.6"; + version = "1.1.2"; src = fetchFromGitLab { owner = "openconnect"; repo = "ocserv"; - rev = "ocserv_${lib.replaceStrings [ "." ] [ "_" ] version}"; - sha256 = "0k7sx9sg8akxwfdl51cvdqkdrx9qganqddgri2yhcgznc3f3pz5b"; + rev = version; + sha256 = "gXolG4zTnJpgI32SuudhvlP9snI0k4Oa1mqE7eGbdE0="; }; nativeBuildInputs = [ autoreconfHook pkg-config ]; @@ -21,6 +21,6 @@ stdenv.mkDerivation rec { homepage = "https://gitlab.com/openconnect/ocserv"; license = licenses.gpl2; description = "This program is openconnect VPN server (ocserv), a server for the openconnect VPN client"; - maintainers = with maintainers; [ ]; + maintainers = with maintainers; [ neverbehave ]; }; } diff --git a/nixpkgs/pkgs/tools/networking/offlineimap/default.nix b/nixpkgs/pkgs/tools/networking/offlineimap/default.nix index 5dc789e0dc58..98aabadf6da3 100644 --- a/nixpkgs/pkgs/tools/networking/offlineimap/default.nix +++ b/nixpkgs/pkgs/tools/networking/offlineimap/default.nix @@ -1,6 +1,6 @@ { lib , fetchFromGitHub -, python2Packages +, python3 , asciidoc , cacert , docbook_xsl @@ -9,15 +9,15 @@ , libxslt }: -python2Packages.buildPythonApplication rec { - version = "7.3.4"; +python3.pkgs.buildPythonApplication rec { pname = "offlineimap"; + version = "8.0.0"; src = fetchFromGitHub { owner = "OfflineIMAP"; - repo = "offlineimap"; + repo = "offlineimap3"; rev = "v${version}"; - sha256 = "sha256-sra2H0+5+LAIU3+uJnii+AYA05nuDyKVMW97rbaFOfI="; + sha256 = "0y3giaz9i8vvczlxkbwymfkn3vi9fv599dy4pc2pn2afxsl4mg2w"; }; nativeBuildInputs = [ @@ -28,11 +28,14 @@ python2Packages.buildPythonApplication rec { libxslt ]; - propagatedBuildInputs = with python2Packages; [ - six + propagatedBuildInputs = with python3.pkgs; [ + certifi + distro + imaplib2 kerberos - rfc6555 pysocks + rfc6555 + urllib3 ]; postPatch = '' @@ -40,7 +43,7 @@ python2Packages.buildPythonApplication rec { sed -i docs/Makefile -e "s|a2x -v -d |a2x -L -v -d |" # Provide CA certificates (Used when "sslcacertfile = OS-DEFAULT" is configured") - sed -i offlineimap/utils/distro.py -e '/def get_os_sslcertfile():/a\ \ \ \ return "${cacert}/etc/ssl/certs/ca-bundle.crt"' + sed -i offlineimap/utils/distro_utils.py -e '/def get_os_sslcertfile():/a\ \ \ \ return "${cacert}/etc/ssl/certs/ca-bundle.crt"' ''; postInstall = '' @@ -52,6 +55,10 @@ python2Packages.buildPythonApplication rec { # Test requires credentials doCheck = false; + pythonImportsCheck = [ + "offlineimap" + ]; + meta = with lib; { description = "Synchronize emails between two repositories, so that you can read the same mailbox from multiple computers"; homepage = "http://offlineimap.org"; diff --git a/nixpkgs/pkgs/tools/networking/ofono/default.nix b/nixpkgs/pkgs/tools/networking/ofono/default.nix index 647cfd4a44ff..de8b3d699603 100644 --- a/nixpkgs/pkgs/tools/networking/ofono/default.nix +++ b/nixpkgs/pkgs/tools/networking/ofono/default.nix @@ -12,14 +12,14 @@ stdenv.mkDerivation rec { pname = "ofono"; - version = "1.32"; + version = "1.33"; outputs = [ "out" "dev" ]; src = fetchgit { url = "git://git.kernel.org/pub/scm/network/ofono/ofono.git"; rev = version; - sha256 = "sha256-bJ7Qgau5soPiptrhcMZ8rWxfprRCTeR7OjQ5HZQ9hbc="; + sha256 = "sha256-UTFP69yv1epVrqBoRKCRcR2WiKBG01sLTzrsh/Nude4="; }; patches = [ diff --git a/nixpkgs/pkgs/tools/networking/ookla-speedtest/default.nix b/nixpkgs/pkgs/tools/networking/ookla-speedtest/default.nix index 200b488cf714..5fc03c19c902 100644 --- a/nixpkgs/pkgs/tools/networking/ookla-speedtest/default.nix +++ b/nixpkgs/pkgs/tools/networking/ookla-speedtest/default.nix @@ -2,16 +2,16 @@ let pname = "ookla-speedtest"; - version = "1.0.0"; + version = "1.1.1"; srcs = { x86_64-linux = fetchurl { - url = "https://install.speedtest.net/app/cli/${pname}-${version}-x86_64-linux.tgz"; - sha256 = "sha256-X+ICjw1EJ+T0Ix2fnPcOZpG7iQpwY211Iy/k2XBjMWg="; + url = "https://install.speedtest.net/app/cli/${pname}-${version}-linux-x86_64.tgz"; + sha256 = "sha256-lwR3/f7k10HnXwiPr2SPm1HHvgQxP7iP+13gfrGjBAw="; }; aarch64-linux = fetchurl { - url = "https://install.speedtest.net/app/cli/${pname}-${version}-aarch64-linux.tgz"; - sha256 = "sha256-BzaE3DSQUIygGwTFhV4Ez9eX/tM/bqam7cJt+8b2qp4="; + url = "https://install.speedtest.net/app/cli/${pname}-${version}-linux-aarch64.tgz"; + sha256 = "sha256-J2pAhz/hw8okohWAwvxkqpLtNY/8bbYHGhPQOo1DH9k="; }; }; in @@ -19,7 +19,7 @@ in stdenv.mkDerivation rec { inherit pname version; - src = srcs.${stdenv.hostPlatform.system}; + src = srcs.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); setSourceRoot = '' sourceRoot=$PWD diff --git a/nixpkgs/pkgs/tools/networking/oonf-olsrd2/default.nix b/nixpkgs/pkgs/tools/networking/oonf-olsrd2/default.nix new file mode 100644 index 000000000000..c2ab89834afa --- /dev/null +++ b/nixpkgs/pkgs/tools/networking/oonf-olsrd2/default.nix @@ -0,0 +1,33 @@ +{ lib +, stdenv +, fetchFromGitHub +, cmake +}: + +stdenv.mkDerivation rec { + pname = "oonf-olsrd2"; + version = "0.15.1"; + + src = fetchFromGitHub { + owner = "OLSR"; + repo = "OONF"; + rev = "v${version}"; + hash = "sha256-7EH2K7gaBGD95WFlG6RRhKEWJm91Xv2GOHYQjZWuzl0="; + }; + + cmakeFlags = [ + "-DOONF_NO_WERROR=yes" + ]; + + nativeBuildInputs = [ + cmake + ]; + + meta = with lib; { + description = "An adhoc wireless mesh routing daemon"; + license = licenses.bsd3; + homepage = "http://olsr.org/"; + maintainers = with maintainers; [ mkg20001 ]; + platforms = platforms.linux; + }; +} diff --git a/nixpkgs/pkgs/tools/networking/openfortivpn/default.nix b/nixpkgs/pkgs/tools/networking/openfortivpn/default.nix index e02782cccbfd..30495b918462 100644 --- a/nixpkgs/pkgs/tools/networking/openfortivpn/default.nix +++ b/nixpkgs/pkgs/tools/networking/openfortivpn/default.nix @@ -8,13 +8,13 @@ let in stdenv.mkDerivation rec { pname = "openfortivpn"; - version = "1.16.0"; + version = "1.17.1"; src = fetchFromGitHub { owner = "adrienverge"; repo = pname; rev = "v${version}"; - sha256 = "sha256-wijP9VGKXlxCAU3xN6+cv9+NGwBS55ql8WsZZ592b/k="; + sha256 = "sha256-wSbE3vq9/o1r80zRT1rO9zAG6ws1nG18ALXYd9BAbLA="; }; # we cannot write the config file to /etc and as we don't need the file, so drop it diff --git a/nixpkgs/pkgs/tools/networking/opensnitch/daemon.nix b/nixpkgs/pkgs/tools/networking/opensnitch/daemon.nix index 31057a8f5271..27d3a6ce5181 100644 --- a/nixpkgs/pkgs/tools/networking/opensnitch/daemon.nix +++ b/nixpkgs/pkgs/tools/networking/opensnitch/daemon.nix @@ -1,23 +1,26 @@ { buildGoModule , fetchFromGitHub , fetchpatch +, protobuf +, go-protobuf , pkg-config , libnetfilter_queue , libnfnetlink , lib , coreutils , iptables +, makeWrapper }: buildGoModule rec { pname = "opensnitch"; - version = "1.3.6"; + version = "1.4.3"; src = fetchFromGitHub { owner = "evilsocket"; repo = "opensnitch"; rev = "v${version}"; - sha256 = "sha256-Cgo+bVQQeUZuYYhA1WSqlLyQQGAeXbbNno9LS7oNvhI="; + sha256 = "1c2v2x8hfqk524sa42vry74lda4lg6ii40ljk2qx9j2f69446sva"; }; patches = [ @@ -28,10 +31,22 @@ buildGoModule rec { url = "https://github.com/evilsocket/opensnitch/commit/8a3f63f36aa92658217bbbf46d39e6d20b2c0791.patch"; sha256 = "sha256-WkwjKTQZppR0nqvRO4xiQoKZ307NvuUwoRx+boIpuTg="; }) + # Upstream has inconsistent vendoring + ./go-mod.patch ]; modRoot = "daemon"; + buildInputs = [ libnetfilter_queue libnfnetlink ]; + + nativeBuildInputs = [ pkg-config protobuf go-protobuf makeWrapper ]; + + vendorSha256 = "sha256-sTfRfsvyiFk1bcga009W6jD6RllrySRAU6B/8mF6+ow="; + + preBuild = '' + make -C ../proto ../daemon/ui/protocol/ui.pb.go + ''; + postBuild = '' mv $GOPATH/bin/daemon $GOPATH/bin/opensnitchd mkdir -p $out/lib/systemd/system @@ -39,14 +54,12 @@ buildGoModule rec { --replace "/usr/local/bin/opensnitchd" "$out/bin/opensnitchd" \ --replace "/etc/opensnitchd/rules" "/var/lib/opensnitch/rules" \ --replace "/bin/mkdir" "${coreutils}/bin/mkdir" - sed -i '/\[Service\]/a Environment=PATH=${iptables}/bin' $out/lib/systemd/system/opensnitchd.service ''; - vendorSha256 = "sha256-LMwQBFkHg1sWIUITLOX2FZi5QUfOivvrkcl9ELO3Trk="; - - nativeBuildInputs = [ pkg-config ]; - - buildInputs = [ libnetfilter_queue libnfnetlink ]; + postInstall = '' + wrapProgram $out/bin/opensnitchd \ + --prefix PATH : ${lib.makeBinPath [ iptables ]} + ''; meta = with lib; { description = "An application firewall"; diff --git a/nixpkgs/pkgs/tools/networking/opensnitch/go-mod.patch b/nixpkgs/pkgs/tools/networking/opensnitch/go-mod.patch new file mode 100644 index 000000000000..290e92ca755f --- /dev/null +++ b/nixpkgs/pkgs/tools/networking/opensnitch/go-mod.patch @@ -0,0 +1,24 @@ +diff --git a/daemon/go.mod b/daemon/go.mod +index ec21c04..a859bfb 100644 +--- a/daemon/go.mod ++++ b/daemon/go.mod +@@ -5,17 +5,12 @@ go 1.14 + require ( + github.com/evilsocket/ftrace v1.2.0 + github.com/fsnotify/fsnotify v1.4.7 +- github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b // indirect +- github.com/golang/protobuf v1.5.0 + github.com/google/gopacket v1.1.14 + github.com/google/nftables v0.0.0-20210514154851-a285acebcad3 + github.com/iovisor/gobpf v0.2.0 + github.com/vishvananda/netlink v1.1.0 +- github.com/vishvananda/netns v0.0.0-20191106174202-0a2b9b5464df // indirect +- golang.org/x/net v0.0.0-20190311183353-d8887717615a +- golang.org/x/sync v0.0.0-20200625203802-6e8e738ad208 // indirect +- golang.org/x/sys v0.0.0-20190606203320-7fc4e5ec1444 // indirect +- golang.org/x/text v0.3.0 // indirect ++ golang.org/x/net v0.0.0-20191028085509-fe3aa8a45271 ++ golang.org/x/sys v0.0.0-20191029155521-f43be2a4598c + google.golang.org/grpc v1.27.0 + google.golang.org/protobuf v1.26.0 + ) diff --git a/nixpkgs/pkgs/tools/networking/opensnitch/ui.nix b/nixpkgs/pkgs/tools/networking/opensnitch/ui.nix index 69b26492282d..d211a10d2c5a 100644 --- a/nixpkgs/pkgs/tools/networking/opensnitch/ui.nix +++ b/nixpkgs/pkgs/tools/networking/opensnitch/ui.nix @@ -6,16 +6,19 @@ python3Packages.buildPythonApplication rec { pname = "opensnitch-ui"; - version = "1.3.6"; + version = "1.4.3"; src = fetchFromGitHub { owner = "evilsocket"; repo = "opensnitch"; rev = "v${version}"; - sha256 = "sha256-Cgo+bVQQeUZuYYhA1WSqlLyQQGAeXbbNno9LS7oNvhI="; + sha256 = "sha256-amtDSDJOyNSxmJICEqN5lKhGyfF5C6I0EWViB1EXW7A="; }; - nativeBuildInputs = [ wrapQtAppsHook ]; + nativeBuildInputs = [ + python3Packages.pyqt5 + wrapQtAppsHook + ]; propagatedBuildInputs = with python3Packages; [ grpcio-tools @@ -25,6 +28,11 @@ python3Packages.buildPythonApplication rec { pyinotify ]; + preBuild = '' + make -C ../proto ../ui/opensnitch/ui_pb2.py + pyrcc5 -o opensnitch/resources_rc.py opensnitch/res/resources.qrc + ''; + preConfigure = '' cd ui ''; @@ -33,6 +41,10 @@ python3Packages.buildPythonApplication rec { export PYTHONPATH=opensnitch:$PYTHONPATH ''; + postInstall = '' + mv $out/lib/python3.9/site-packages/usr/* $out/ + ''; + dontWrapQtApps = true; makeWrapperArgs = [ "\${qtWrapperArgs[@]}" ]; diff --git a/nixpkgs/pkgs/tools/networking/openssh/common.nix b/nixpkgs/pkgs/tools/networking/openssh/common.nix index eaa42039dbaa..ee8d2a92697f 100644 --- a/nixpkgs/pkgs/tools/networking/openssh/common.nix +++ b/nixpkgs/pkgs/tools/networking/openssh/common.nix @@ -18,10 +18,12 @@ , libedit , pkg-config , pam +, libredirect , etcDir ? null , withKerberos ? !(stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) , libkrb5 , libfido2 +, hostname , nixosTests , withFIDO ? stdenv.hostPlatform.isUnix && !stdenv.hostPlatform.isMusl , linkOpenssl ? true @@ -100,6 +102,60 @@ stdenv.mkDerivation rec { hardeningEnable = [ "pie" ]; + doCheck = true; + enableParallelChecking = false; + checkInputs = optional (!stdenv.isDarwin) hostname; + preCheck = '' + # construct a dummy HOME + export HOME=$(realpath ../dummy-home) + mkdir -p ~/.ssh + + # construct a dummy /etc/passwd file for the sshd under test + # to use to look up the connecting user + DUMMY_PASSWD=$(realpath ../dummy-passwd) + cat > $DUMMY_PASSWD <<EOF + $(whoami)::$(id -u):$(id -g)::$HOME:$SHELL + EOF + + # we need to NIX_REDIRECTS /etc/passwd both for processes + # invoked directly and those invoked by the "remote" session + cat > ~/.ssh/environment.base <<EOF + NIX_REDIRECTS=/etc/passwd=$DUMMY_PASSWD + LD_PRELOAD=${libredirect}/lib/libredirect.so + EOF + + # use an ssh environment file to ensure environment is set + # up appropriately for build environment even when no shell + # is invoked by the ssh session. otherwise the PATH will + # only contain default unix paths like /bin which we don't + # have in our build environment + cat - regress/test-exec.sh > regress/test-exec.sh.new <<EOF + cp $HOME/.ssh/environment.base $HOME/.ssh/environment + echo "PATH=\$PATH" >> $HOME/.ssh/environment + EOF + mv regress/test-exec.sh.new regress/test-exec.sh + + # explicitly enable the PermitUserEnvironment feature + substituteInPlace regress/test-exec.sh \ + --replace \ + 'cat << EOF > $OBJ/sshd_config' \ + $'cat << EOF > $OBJ/sshd_config\n\tPermitUserEnvironment yes' + + # some tests want to use files under /bin as example files + for f in regress/sftp-cmds.sh regress/forwarding.sh; do + substituteInPlace $f --replace '/bin' "$(dirname $(type -p ls))" + done + + # set up NIX_REDIRECTS for direct invocations + set -a; source ~/.ssh/environment.base; set +a + ''; + # integration tests hard to get working on darwin with its shaky + # sandbox + # t-exec tests fail on musl + checkTarget = optional (!stdenv.isDarwin && !stdenv.hostPlatform.isMusl) "t-exec" + # other tests are less demanding of the environment + ++ [ "unit" "file-tests" "interop-tests" ]; + postInstall = '' # Install ssh-copy-id, it's very useful. cp contrib/ssh-copy-id $out/bin/ @@ -122,7 +178,7 @@ stdenv.mkDerivation rec { changelog = "https://www.openssh.com/releasenotes.html"; license = licenses.bsd2; platforms = platforms.unix ++ platforms.windows; - maintainers = with maintainers; [ eelco aneeshusa ]; + maintainers = (extraMeta.maintainers or []) ++ (with maintainers; [ eelco aneeshusa ]); mainProgram = "ssh"; } // extraMeta; } diff --git a/nixpkgs/pkgs/tools/networking/openssh/default.nix b/nixpkgs/pkgs/tools/networking/openssh/default.nix index c8bc1f8a1dda..4bc181717168 100644 --- a/nixpkgs/pkgs/tools/networking/openssh/default.nix +++ b/nixpkgs/pkgs/tools/networking/openssh/default.nix @@ -1,4 +1,4 @@ -{ callPackage, fetchurl, fetchpatch, fetchFromGitHub, autoreconfHook }: +{ callPackage, lib, fetchurl, fetchpatch, fetchFromGitHub, autoreconfHook }: let common = opts: callPackage (import ./common.nix opts) { }; in @@ -6,14 +6,15 @@ in openssh = common rec { pname = "openssh"; - version = "8.7p1"; + version = "8.8p1"; src = fetchurl { url = "mirror://openbsd/OpenSSH/portable/openssh-${version}.tar.gz"; - sha256 = "090yxpi03pxxzb4ppx8g8hdpw7c4nf8p0avr6c7ybsaana5lp8vw"; + sha256 = "1s8z6f7mi1pwsl79cqai8cr350m5lf2ifcxff57wx6mvm478k425"; }; extraPatches = [ ./ssh-keysign-8.5.patch ]; + extraMeta.maintainers = with lib.maintainers; [ das_j ]; }; openssh_hpn = common rec { diff --git a/nixpkgs/pkgs/tools/networking/openvpn/openvpn_learnaddress.nix b/nixpkgs/pkgs/tools/networking/openvpn/openvpn_learnaddress.nix index 2120679fef3e..514491c2be21 100644 --- a/nixpkgs/pkgs/tools/networking/openvpn/openvpn_learnaddress.nix +++ b/nixpkgs/pkgs/tools/networking/openvpn/openvpn_learnaddress.nix @@ -1,7 +1,8 @@ -{ lib, stdenv, fetchgit, makeWrapper, coreutils, gawk, util-linux }: +{ lib, stdenv, fetchgit, makeWrapper, coreutils, gawk, util-linux }: stdenv.mkDerivation { - name = "openvpn-learnaddress-19b03c3"; + pname = "openvpn-learnaddress"; + version = "unstable-2013-10-21"; src = fetchgit { url = "https://gist.github.com/4058733.git"; diff --git a/nixpkgs/pkgs/tools/networking/openvpn/update-resolv-conf.nix b/nixpkgs/pkgs/tools/networking/openvpn/update-resolv-conf.nix index d71ab72901bc..e8533a214af1 100644 --- a/nixpkgs/pkgs/tools/networking/openvpn/update-resolv-conf.nix +++ b/nixpkgs/pkgs/tools/networking/openvpn/update-resolv-conf.nix @@ -3,8 +3,10 @@ let binPath = lib.makeBinPath [ coreutils openresolv systemd ]; -in stdenv.mkDerivation { - name = "update-resolv-conf-2017-06-21"; +in +stdenv.mkDerivation { + pname = "update-resolv-conf"; + version = "unstable-2017-06-21"; src = fetchFromGitHub { owner = "masterkorp"; diff --git a/nixpkgs/pkgs/tools/networking/p2p/amule/default.nix b/nixpkgs/pkgs/tools/networking/p2p/amule/default.nix index 96bf7656e8ae..c2e5f4568242 100644 --- a/nixpkgs/pkgs/tools/networking/p2p/amule/default.nix +++ b/nixpkgs/pkgs/tools/networking/p2p/amule/default.nix @@ -7,10 +7,11 @@ , lib , cmake , zlib -, wxGTK +, wxGTK30-gtk3 # WxGTK 3.0 must be used because aMule does not yet work well with 3.1 , perl , cryptopp , libupnp +, boost # Not using boost leads to crashes with gtk3 , gettext , libpng , autoreconfHook @@ -33,7 +34,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake gettext makeWrapper pkg-config ]; buildInputs = [ - zlib wxGTK perl cryptopp.dev libupnp + zlib wxGTK30-gtk3 perl cryptopp.dev libupnp boost ] ++ lib.optional httpServer libpng ++ lib.optional client libX11; @@ -66,7 +67,7 @@ stdenv.mkDerivation rec { homepage = "https://github.com/amule-project/amule"; license = licenses.gpl2Plus; - maintainers = with maintainers; [ phreedom ]; + maintainers = with maintainers; [ ]; platforms = platforms.unix; # cmake fails: Cannot specify link libraries for target "wxWidgets::ADV" which is not built by this project. broken = enableDaemon; diff --git a/nixpkgs/pkgs/tools/networking/p2p/jesec-rtorrent/default.nix b/nixpkgs/pkgs/tools/networking/p2p/jesec-rtorrent/default.nix new file mode 100644 index 000000000000..56fec5333fc7 --- /dev/null +++ b/nixpkgs/pkgs/tools/networking/p2p/jesec-rtorrent/default.nix @@ -0,0 +1,9 @@ +{ lib +, pkgs +, callPackage +}: + +rec { + libtorrent = callPackage ./libtorrent.nix { }; + rtorrent = callPackage ./rtorrent.nix { }; +} diff --git a/nixpkgs/pkgs/tools/networking/p2p/jesec-rtorrent/libtorrent.nix b/nixpkgs/pkgs/tools/networking/p2p/jesec-rtorrent/libtorrent.nix new file mode 100644 index 000000000000..d46e4a159399 --- /dev/null +++ b/nixpkgs/pkgs/tools/networking/p2p/jesec-rtorrent/libtorrent.nix @@ -0,0 +1,44 @@ +{ lib +, stdenv +, fetchFromGitHub +, cmake +, gtest +, openssl +, zlib +}: + +stdenv.mkDerivation rec { + pname = "jesec-libtorrent"; + version = "0.13.8-r3"; + + src = fetchFromGitHub { + owner = "jesec"; + repo = "libtorrent"; + rev = "v${version}"; + hash = "sha256-S3DOKzXkvU+ZJxfrxwLXCVBnepzmiZ+3iiQqz084BEk="; + }; + + nativeBuildInputs = [ + cmake + ]; + buildInputs = [ + openssl + zlib + ]; + + doCheck = true; + preCheck = '' + export LD_LIBRARY_PATH=$LD_LIBRARY_PATH''${LD_LIBRARY_PATH:+:}$PWD + ''; + checkInputs = [ + gtest + ]; + + meta = with lib; { + homepage = "https://github.com/jesec/libtorrent"; + description = "A BitTorrent library written in C++ for *nix, with focus on high performance and good code (jesec's fork)"; + license = licenses.gpl2Plus; + maintainers = with maintainers; [ winter AndersonTorres ]; + platforms = platforms.linux; + }; +} diff --git a/nixpkgs/pkgs/tools/networking/p2p/rtorrent-jesec/default.nix b/nixpkgs/pkgs/tools/networking/p2p/jesec-rtorrent/rtorrent.nix index eeff6e91399d..7fe444228d37 100644 --- a/nixpkgs/pkgs/tools/networking/p2p/rtorrent-jesec/default.nix +++ b/nixpkgs/pkgs/tools/networking/p2p/jesec-rtorrent/rtorrent.nix @@ -2,40 +2,48 @@ , stdenv , fetchFromGitHub , cmake -, gtest -, libtorrent-jesec , curl +, gtest +, libtorrent , ncurses -, xmlrpc_c -, nlohmann_json -, xmlRpcSupport ? true -, jsonRpcSupport ? true +, jsonRpcSupport ? true, nlohmann_json +, xmlRpcSupport ? true, xmlrpc_c }: -let - inherit (lib) optional; -in + stdenv.mkDerivation rec { - pname = "rtorrent-jesec"; - version = "0.9.8-r14"; + pname = "jesec-rtorrent"; + version = "0.9.8-r15"; src = fetchFromGitHub { owner = "jesec"; repo = "rtorrent"; rev = "v${version}"; - sha256 = "sha256-AbjzNIha3MkCZi6MuyUfPx9r3zeXeTUzkbD7uHB85lo="; + hash = "sha256-yYOw8wsiQd478JijLgPtEWsw2/ewd46re+t9D705rmk="; }; - nativeBuildInputs = [ cmake ]; - buildInputs = [ libtorrent-jesec curl ncurses ] - ++ optional xmlRpcSupport xmlrpc_c - ++ optional jsonRpcSupport nlohmann_json; + nativeBuildInputs = [ + cmake + ]; + + buildInputs = [ + curl + libtorrent + ncurses + ] + ++ lib.optional jsonRpcSupport nlohmann_json + ++ lib.optional xmlRpcSupport xmlrpc_c; + + cmakeFlags = [ + "-DUSE_RUNTIME_CA_DETECTION=NO" + ] + ++ lib.optional (!jsonRpcSupport) "-DUSE_JSONRPC=NO" + ++ lib.optional (!xmlRpcSupport) "-DUSE_XMLRPC=NO"; - cmakeFlags = [ "-DUSE_RUNTIME_CA_DETECTION=NO" ] - ++ optional (!xmlRpcSupport) "-DUSE_XMLRPC=NO" - ++ optional (!jsonRpcSupport) "-DUSE_JSONRPC=NO"; doCheck = true; - checkInputs = [ gtest ]; + checkInputs = [ + gtest + ]; prePatch = '' substituteInPlace src/main.cc \ @@ -51,7 +59,7 @@ stdenv.mkDerivation rec { description = "An ncurses client for libtorrent, ideal for use with screen, tmux, or dtach (jesec's fork)"; homepage = "https://github.com/jesec/rtorrent"; license = licenses.gpl2Plus; - maintainers = with maintainers; [ winterqt ]; + maintainers = with maintainers; [ winter AndersonTorres ]; platforms = platforms.linux; }; } diff --git a/nixpkgs/pkgs/tools/networking/p2p/libtorrent-jesec/default.nix b/nixpkgs/pkgs/tools/networking/p2p/libtorrent-jesec/default.nix deleted file mode 100644 index 0fd16f4799d6..000000000000 --- a/nixpkgs/pkgs/tools/networking/p2p/libtorrent-jesec/default.nix +++ /dev/null @@ -1,38 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, fetchpatch, cmake, gtest, openssl, zlib }: - -stdenv.mkDerivation rec { - pname = "libtorrent-jesec"; - version = "0.13.8-r2"; - - src = fetchFromGitHub { - owner = "jesec"; - repo = "libtorrent"; - rev = "v${version}"; - sha256 = "sha256-eIXVTbVOCRHcxSsLPvIm9F60t2upk5ORpDSOOYqTCJ4="; - }; - - patches = [ - (fetchpatch { - name = "test-fallback"; - url = "https://github.com/jesec/libtorrent/commit/a38205ce06aadc9908478ec3a9c8aefd9be06344.patch"; - sha256 = "sha256-2TyQ9zYWZw6bzAfVZzTOQSkfIZnDU8ykgpRAFXscEH0="; - }) - ]; - - nativeBuildInputs = [ cmake ]; - buildInputs = [ openssl zlib ]; - - doCheck = true; - preCheck = '' - export LD_LIBRARY_PATH=$LD_LIBRARY_PATH''${LD_LIBRARY_PATH:+:}$PWD - ''; - checkInputs = [ gtest ]; - - meta = with lib; { - description = "A BitTorrent library written in C++ for *nix, with focus on high performance and good code (jesec's fork)"; - homepage = "https://github.com/jesec/libtorrent"; - license = licenses.gpl2Plus; - maintainers = with maintainers; [ winterqt ]; - platforms = platforms.linux; - }; -} diff --git a/nixpkgs/pkgs/tools/networking/p2p/libtorrent/default.nix b/nixpkgs/pkgs/tools/networking/p2p/libtorrent/default.nix deleted file mode 100644 index 4d3ccf5fc150..000000000000 --- a/nixpkgs/pkgs/tools/networking/p2p/libtorrent/default.nix +++ /dev/null @@ -1,28 +0,0 @@ -# NOTE: this is rakshava's version of libtorrent, used mainly by rtorrent -# This is NOT libtorrent-rasterbar, used by Deluge, qbitttorent, and others -{ lib, stdenv, fetchFromGitHub, pkg-config, autoreconfHook -, cppunit, openssl, libsigcxx, zlib -}: - -stdenv.mkDerivation rec { - pname = "libtorrent"; - version = "0.13.8"; - - src = fetchFromGitHub { - owner = "rakshasa"; - repo = pname; - rev = "v${version}"; - sha256 = "1h5y6ab3gs20yyprdfwcw8fh1c6czs4yrdj0kf54d2vp9qwz685r"; - }; - - nativeBuildInputs = [ pkg-config autoreconfHook ]; - buildInputs = [ cppunit openssl libsigcxx zlib ]; - - meta = with lib; { - homepage = "https://github.com/rakshasa/libtorrent"; - description = "A BitTorrent library written in C++ for *nix, with focus on high performance and good code"; - - platforms = platforms.unix; - maintainers = with maintainers; [ ebzzry codyopel ]; - }; -} diff --git a/nixpkgs/pkgs/tools/networking/p2p/rakshasa-rtorrent/default.nix b/nixpkgs/pkgs/tools/networking/p2p/rakshasa-rtorrent/default.nix new file mode 100644 index 000000000000..56fec5333fc7 --- /dev/null +++ b/nixpkgs/pkgs/tools/networking/p2p/rakshasa-rtorrent/default.nix @@ -0,0 +1,9 @@ +{ lib +, pkgs +, callPackage +}: + +rec { + libtorrent = callPackage ./libtorrent.nix { }; + rtorrent = callPackage ./rtorrent.nix { }; +} diff --git a/nixpkgs/pkgs/tools/networking/p2p/rakshasa-rtorrent/libtorrent.nix b/nixpkgs/pkgs/tools/networking/p2p/rakshasa-rtorrent/libtorrent.nix new file mode 100644 index 000000000000..fff4cbb36cf6 --- /dev/null +++ b/nixpkgs/pkgs/tools/networking/p2p/rakshasa-rtorrent/libtorrent.nix @@ -0,0 +1,48 @@ +# Note: this is rakshasa's version of libtorrent, used mainly by rtorrent. +# *Do not* mistake it by libtorrent-rasterbar, used by Deluge, qbitttorent etc. +{ lib +, stdenv +, fetchFromGitHub +, autoconf-archive +, autoreconfHook +, cppunit +, libsigcxx +, openssl +, pkg-config +, zlib +}: + +stdenv.mkDerivation rec { + pname = "rakshasa-libtorrent"; + version = "0.13.8+date=2021-08-07"; + + src = fetchFromGitHub { + owner = "rakshasa"; + repo = "libtorrent"; + rev = "53596afc5fae275b3fb5753a4bb2a1a7f7cf6a51"; + hash = "sha256-gyl/jfbptHz/gHkkVGWShhv1Z7o9fa9nJIz27U2A6wg="; + }; + + nativeBuildInputs = [ + autoconf-archive + autoreconfHook + pkg-config + ]; + + buildInputs = [ + cppunit + libsigcxx + openssl + zlib + ]; + + enableParallelBuilding = true; + + meta = with lib; { + homepage = "https://github.com/rakshasa/libtorrent"; + description = "A BitTorrent library written in C++ for *nix, with focus on high performance and good code"; + license = licenses.gpl2Plus; + maintainers = with maintainers; [ ebzzry codyopel ]; + platforms = platforms.unix; + }; +} diff --git a/nixpkgs/pkgs/tools/networking/p2p/rakshasa-rtorrent/rtorrent.nix b/nixpkgs/pkgs/tools/networking/p2p/rakshasa-rtorrent/rtorrent.nix new file mode 100644 index 000000000000..f166f6d0e29f --- /dev/null +++ b/nixpkgs/pkgs/tools/networking/p2p/rakshasa-rtorrent/rtorrent.nix @@ -0,0 +1,68 @@ +{ lib +, stdenv +, fetchurl +, fetchFromGitHub +, autoreconfHook +, autoconf-archive +, cppunit +, curl +, libsigcxx +, libtool +, libtorrent +, ncurses +, openssl +, pkg-config +, xmlrpc_c +, zlib +}: + +stdenv.mkDerivation rec { + pname = "rakshasa-rtorrent"; + version = "0.9.8+date=2021-08-07"; + + src = fetchFromGitHub { + owner = "rakshasa"; + repo = "rtorrent"; + rev = "a6bc99bb821d86b3b0633552db3fbd0a22497657"; + hash = "sha256-HTwAs8dfZVXfLRNiT6QpjKGnuahHfoMfYWqdKkedUL0="; + }; + + nativeBuildInputs = [ + autoconf-archive + autoreconfHook + pkg-config + ]; + + buildInputs = [ + cppunit + curl + libsigcxx + libtool + libtorrent + ncurses + openssl + xmlrpc_c + zlib + ]; + + configureFlags = [ + "--with-xmlrpc-c" + "--with-posix-fallocate" + ]; + + enableParallelBuilding = true; + + postInstall = '' + mkdir -p $out/share/man/man1 $out/share/doc/rtorrent + mv doc/old/rtorrent.1 $out/share/man/man1/rtorrent.1 + mv doc/rtorrent.rc $out/share/doc/rtorrent/rtorrent.rc + ''; + + meta = with lib; { + homepage = "https://rakshasa.github.io/rtorrent/"; + description = "An ncurses client for libtorrent, ideal for use with screen, tmux, or dtach"; + license = licenses.gpl2Plus; + maintainers = with maintainers; [ ebzzry codyopel ]; + platforms = platforms.unix; + }; +} diff --git a/nixpkgs/pkgs/tools/networking/p2p/rtorrent/default.nix b/nixpkgs/pkgs/tools/networking/p2p/rtorrent/default.nix deleted file mode 100644 index 20f9cec6f5fe..000000000000 --- a/nixpkgs/pkgs/tools/networking/p2p/rtorrent/default.nix +++ /dev/null @@ -1,52 +0,0 @@ -{ lib, stdenv, fetchurl, fetchFromGitHub, pkg-config -, libtool, autoconf, automake, cppunit -, libtorrent, ncurses, libsigcxx, curl -, zlib, openssl, xmlrpc_c - -# This no longer works -, colorSupport ? false -}: - -stdenv.mkDerivation rec { - pname = "rtorrent"; - version = "0.9.8"; - - src = fetchFromGitHub { - owner = "rakshasa"; - repo = pname; - rev = "v${version}"; - sha256 = "0hcaf1brk402caa7hhlb2r1c93mjzxkm8gb19xfl33gkp3jpf372"; - }; - - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ - libtool autoconf automake cppunit - libtorrent ncurses libsigcxx curl zlib openssl xmlrpc_c - ]; - - # Optional patch adds support for custom configurable colors - # https://github.com/Chlorm/chlorm_overlay/blob/master/net-p2p/rtorrent/README.md - patches = lib.optional colorSupport (fetchurl { - url = "https://gist.githubusercontent.com/codyopel/a816c2993f8013b5f4d6/raw/b952b32da1dcf14c61820dfcf7df00bc8918fec4/rtorrent-color.patch"; - sha256 = "00gcl7yq6261rrfzpz2k8bd7mffwya0ifji1xqcvhfw50syk8965"; - }); - - preConfigure = "./autogen.sh"; - - configureFlags = [ "--with-xmlrpc-c" "--with-posix-fallocate" ]; - - postInstall = '' - mkdir -p $out/share/man/man1 $out/share/doc/rtorrent - mv doc/old/rtorrent.1 $out/share/man/man1/rtorrent.1 - mv doc/rtorrent.rc $out/share/doc/rtorrent/rtorrent.rc - ''; - - meta = with lib; { - homepage = "https://rakshasa.github.io/rtorrent/"; - description = "An ncurses client for libtorrent, ideal for use with screen, tmux, or dtach"; - - platforms = platforms.unix; - maintainers = with maintainers; [ ebzzry codyopel ]; - license = licenses.gpl2Plus; - }; -} diff --git a/nixpkgs/pkgs/tools/networking/pcapfix/default.nix b/nixpkgs/pkgs/tools/networking/pcapfix/default.nix index bdce32f0813e..5a8f24355c26 100644 --- a/nixpkgs/pkgs/tools/networking/pcapfix/default.nix +++ b/nixpkgs/pkgs/tools/networking/pcapfix/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "pcapfix"; - version = "1.1.4"; + version = "1.1.7"; src = fetchurl { url = "https://f00l.de/pcapfix/pcapfix-${version}.tar.gz"; - sha256 = "0m6308ka33wqs568b7cwa1f5q0bv61j2nwfizdyzrazw673lnh6d"; + sha256 = "sha256-bL6/b5npdrGrdok5JK65DNh8MWUILRUmTBkz8POz4Ow="; }; postPatch = ''sed -i "s|/usr|$out|" Makefile''; diff --git a/nixpkgs/pkgs/tools/networking/pirate-get/default.nix b/nixpkgs/pkgs/tools/networking/pirate-get/default.nix index dc9133229af7..112b78dcae8b 100644 --- a/nixpkgs/pkgs/tools/networking/pirate-get/default.nix +++ b/nixpkgs/pkgs/tools/networking/pirate-get/default.nix @@ -4,11 +4,11 @@ with python3Packages; buildPythonApplication rec { pname = "pirate-get"; - version = "0.4.0"; + version = "0.4.1"; src = fetchPypi { inherit pname version; - sha256 = "07s5ss9dxccx1mip7pyga1fagywkqchxmzz55ng47ac9053ffxkq"; + sha256 = "0pr703fwinr2f4rba86zp57mpf5j2jgvp5n50rc5vy5g7yfwsddm"; }; propagatedBuildInputs = [ colorama veryprettytable pyperclip ]; diff --git a/nixpkgs/pkgs/tools/networking/polysh/default.nix b/nixpkgs/pkgs/tools/networking/polysh/default.nix deleted file mode 100644 index 69e5d0427e58..000000000000 --- a/nixpkgs/pkgs/tools/networking/polysh/default.nix +++ /dev/null @@ -1,25 +0,0 @@ -{ lib, fetchurl, python2Packages }: - -let - inherit (python2Packages) buildPythonApplication; -in -buildPythonApplication rec { - pname = "polysh"; - version = "0.4"; - src = fetchurl { - url = "http://guichaz.free.fr/polysh/files/${pname}-${version}.tar.bz2"; - sha256 = "0kxhp38c8a8hc8l86y53l2z5zpzxc4b8lx5zyzmq1badcrfc4mh4"; - }; - - meta = with lib; { - description = "A tool to aggregate several remote shells into one"; - longDescription = '' - Polysh is a tool to aggregate several remote shells into one. It - is used to launch an interactive remote shell on many machines - at once. - ''; - maintainers = [ maintainers.astsmtl ]; - homepage = "http://guichaz.free.fr/polysh/"; - license = licenses.gpl2; - }; -} diff --git a/nixpkgs/pkgs/tools/networking/ppp/default.nix b/nixpkgs/pkgs/tools/networking/ppp/default.nix index 708932ac1c9d..5608b032ac50 100644 --- a/nixpkgs/pkgs/tools/networking/ppp/default.nix +++ b/nixpkgs/pkgs/tools/networking/ppp/default.nix @@ -4,6 +4,7 @@ , substituteAll , libpcap , openssl +, bash }: stdenv.mkDerivation rec { @@ -31,18 +32,22 @@ stdenv.mkDerivation rec { buildInputs = [ libpcap openssl + bash ]; postPatch = '' - # strip is not found when cross compiling with seemingly no way to point - # make to the right place, fixup phase will correctly strip - # everything anyway so we remove it from the Makefiles for file in $(find -name Makefile.linux); do - substituteInPlace "$file" --replace '$(INSTALL) -s' '$(INSTALL)' substituteInPlace "$file" --replace '-m 4550' '-m 550' done + + patchShebangs --host \ + scripts/{pon,poff,plog} ''; + makeFlags = [ + "CC=${stdenv.cc.targetPrefix}cc" + ]; + installPhase = '' runHook preInstall mkdir -p $out/bin @@ -52,9 +57,7 @@ stdenv.mkDerivation rec { ''; postFixup = '' - for tgt in pon poff plog; do - substituteInPlace "$out/bin/$tgt" --replace "/usr/sbin" "$out/bin" - done + substituteInPlace "$out/bin/pon" --replace "/usr/sbin" "$out/bin" ''; meta = with lib; { diff --git a/nixpkgs/pkgs/tools/networking/prettyping/default.nix b/nixpkgs/pkgs/tools/networking/prettyping/default.nix index 43f32ddb9fb4..16311f5b9961 100644 --- a/nixpkgs/pkgs/tools/networking/prettyping/default.nix +++ b/nixpkgs/pkgs/tools/networking/prettyping/default.nix @@ -1,12 +1,11 @@ { stdenv, lib, fetchFromGitHub }: stdenv.mkDerivation rec { - name = "${program}-${version}"; - program = "prettyping"; + pname = "prettyping"; version = "1.0.1"; src = fetchFromGitHub { owner = "denilsonsa"; - repo = program; + repo = pname; rev = "v${version}"; sha256 = "05vfaq9y52z40245j47yjk1xaiwrazv15sgjq64w91dfyahjffxf"; }; diff --git a/nixpkgs/pkgs/tools/networking/privoxy/default.nix b/nixpkgs/pkgs/tools/networking/privoxy/default.nix index 9fc159d810c1..33c7584dbdc9 100644 --- a/nixpkgs/pkgs/tools/networking/privoxy/default.nix +++ b/nixpkgs/pkgs/tools/networking/privoxy/default.nix @@ -8,11 +8,11 @@ stdenv.mkDerivation rec { pname = "privoxy"; - version = "3.0.32"; + version = "3.0.33"; src = fetchurl { url = "mirror://sourceforge/ijbswa/Sources/${version}%20%28stable%29/${pname}-${version}-stable-src.tar.gz"; - sha256 = "sha256-xh3kAIxiRF7Bjx8nBAfL8jcuq6k76szcnjI4uy3v7tc="; + sha256 = "sha256-BLEE5w2sYVYbndEQaEslD6/IwT2+Q3pg+uGN3ZqIH64="; }; hardeningEnable = [ "pie" ]; @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { # GPLv2 (or later). See https://www.privoxy.org/user-manual/copyright.html license = licenses.gpl2Plus; platforms = platforms.all; - maintainers = [ maintainers.phreedom ]; + maintainers = [ ]; }; } diff --git a/nixpkgs/pkgs/tools/networking/proxify/default.nix b/nixpkgs/pkgs/tools/networking/proxify/default.nix index 47e36df3ac64..36db5037a44c 100644 --- a/nixpkgs/pkgs/tools/networking/proxify/default.nix +++ b/nixpkgs/pkgs/tools/networking/proxify/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "proxify"; - version = "0.0.4"; + version = "0.0.5"; src = fetchFromGitHub { owner = "projectdiscovery"; repo = "proxify"; rev = "v${version}"; - sha256 = "0qhr51naa7ad80fsr12ka432071mfb1zq2wd852p1lyvy0mdf52s"; + sha256 = "sha256-jITmLJHKTIXnQRUTLaXQPv57gJSbD+6AfJNl36AemR0="; }; - vendorSha256 = "0dynyhqh8jzmljqng1yh07r6k6zfzlsgh36rlynbdgcvjl7jdhnx"; + vendorSha256 = "sha256-Yf1edWWHao2A+iY/5N14mvtvLP+IJDZEEB0Voj47sCs="; meta = with lib; { description = "Proxy tool for HTTP/HTTPS traffic capture"; diff --git a/nixpkgs/pkgs/tools/networking/radsecproxy/default.nix b/nixpkgs/pkgs/tools/networking/radsecproxy/default.nix index 1c56d520b907..7f15ef91e1be 100644 --- a/nixpkgs/pkgs/tools/networking/radsecproxy/default.nix +++ b/nixpkgs/pkgs/tools/networking/radsecproxy/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "radsecproxy"; - version = "1.9.0"; + version = "1.9.1"; src = fetchFromGitHub { owner = pname; repo = pname; rev = version; - sha256 = "0ppgnvmzk5j42zvz74mwaz6767lzf9vpl8y57w612fvqpg65g4bv"; + sha256 = "sha256-gSXjwQ9zJPVNzGqLsZzTEQ0OxbQUiUJYGxrEm56DZDE="; }; nativeBuildInputs = [ autoreconfHook ]; @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { ]; meta = with lib; { - homepage = "https://software.nordu.net/radsecproxy/"; + homepage = "https://radsecproxy.github.io/"; description = "A generic RADIUS proxy that supports both UDP and TLS (RadSec) RADIUS transports"; license = licenses.bsd3; maintainers = with maintainers; [ sargon ]; diff --git a/nixpkgs/pkgs/tools/networking/redsocks/default.nix b/nixpkgs/pkgs/tools/networking/redsocks/default.nix index b609cce90bc5..9b8989f30c2a 100644 --- a/nixpkgs/pkgs/tools/networking/redsocks/default.nix +++ b/nixpkgs/pkgs/tools/networking/redsocks/default.nix @@ -1,15 +1,12 @@ { lib, stdenv, fetchFromGitHub, libevent }: -let - pkg = "redsocks"; +stdenv.mkDerivation rec { + pname = "redsocks"; version = "0.5"; -in -stdenv.mkDerivation { - name = "${pkg}-${version}"; src = fetchFromGitHub { owner = "darkk"; - repo = pkg; + repo = "redsocks"; rev = "release-${version}"; sha256 = "170cpvvivb6y2kwsqj9ppx5brgds9gkn8mixrnvj8z9c15xhvplm"; }; diff --git a/nixpkgs/pkgs/tools/networking/rp-pppoe/default.nix b/nixpkgs/pkgs/tools/networking/rp-pppoe/default.nix index fd3a563c209d..572625651e9a 100644 --- a/nixpkgs/pkgs/tools/networking/rp-pppoe/default.nix +++ b/nixpkgs/pkgs/tools/networking/rp-pppoe/default.nix @@ -1,9 +1,10 @@ { lib, stdenv, fetchurl, ppp } : let - version = "3.12"; in -stdenv.mkDerivation { - name = "rp-pppoe-" + version; +stdenv.mkDerivation rec { + pname = "rp-pppoe"; + version = "3.12"; + src = fetchurl { url = "https://www.roaringpenguin.com/files/download/rp-pppoe-${version}.tar.gz"; sha256 = "1hl6rjvplapgsyrap8xj46kc9kqwdlm6ya6gp3lv0ihm0c24wy80"; @@ -11,7 +12,6 @@ stdenv.mkDerivation { buildInputs = [ ppp ]; - preConfigure = '' cd src export PPPD=${ppp}/sbin/pppd diff --git a/nixpkgs/pkgs/tools/networking/s5cmd/default.nix b/nixpkgs/pkgs/tools/networking/s5cmd/default.nix index c472e2626e01..f7847f324cb0 100644 --- a/nixpkgs/pkgs/tools/networking/s5cmd/default.nix +++ b/nixpkgs/pkgs/tools/networking/s5cmd/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "s5cmd"; - version = "1.3.0"; + version = "1.4.0"; src = fetchFromGitHub { owner = "peak"; repo = "s5cmd"; rev = "v${version}"; - sha256 = "sha256-sood01wI0ZnkXUKDHX14ix3bWHR/PRu6+MDNeos5Jk0="; + sha256 = "sha256-12bKMZ6SMPsqLqaBTVxCxvs7PZ0CKimI9wlqvWZ/bgY="; }; vendorSha256 = null; diff --git a/nixpkgs/pkgs/tools/networking/s6-dns/default.nix b/nixpkgs/pkgs/tools/networking/s6-dns/default.nix index 0a7307b6293b..678b8639f07b 100644 --- a/nixpkgs/pkgs/tools/networking/s6-dns/default.nix +++ b/nixpkgs/pkgs/tools/networking/s6-dns/default.nix @@ -4,8 +4,8 @@ with skawarePackages; buildPackage { pname = "s6-dns"; - version = "2.3.5.2"; - sha256 = "0nczzjprvp6wirzycgf5h32dlgx4r8grzkqhif27n3ii6f5g78yw"; + version = "2.3.5.3"; + sha256 = "1nknkh2rw7ggf5ncspb11wyp6ldyqc9lf3nmnklwb5fcf5kjzi1a"; description = "A suite of DNS client programs and libraries for Unix systems"; diff --git a/nixpkgs/pkgs/tools/networking/s6-networking/default.nix b/nixpkgs/pkgs/tools/networking/s6-networking/default.nix index 42f7187fabed..abdc773280b4 100644 --- a/nixpkgs/pkgs/tools/networking/s6-networking/default.nix +++ b/nixpkgs/pkgs/tools/networking/s6-networking/default.nix @@ -19,8 +19,8 @@ assert sslSupportEnabled -> sslLibs ? ${sslSupport}; buildPackage { pname = "s6-networking"; - version = "2.5.0.0"; - sha256 = "1fn3g9gkwgmnxallhk82f5rly81pnkilj7n49g5fbfmaalsq96mh"; + version = "2.5.1.0"; + sha256 = "0hgzj68bk17r1gr32ld1dm5s1x1a5x8ac03klykhfbasx8gwa1r5"; description = "A suite of small networking utilities for Unix systems"; diff --git a/nixpkgs/pkgs/tools/networking/shadowsocks-rust/default.nix b/nixpkgs/pkgs/tools/networking/shadowsocks-rust/default.nix index 971570717331..b6d91da334e4 100644 --- a/nixpkgs/pkgs/tools/networking/shadowsocks-rust/default.nix +++ b/nixpkgs/pkgs/tools/networking/shadowsocks-rust/default.nix @@ -2,28 +2,36 @@ rustPlatform.buildRustPackage rec { pname = "shadowsocks-rust"; - version = "1.10.7"; + version = "1.12.5"; src = fetchFromGitHub { rev = "v${version}"; owner = "shadowsocks"; repo = pname; - sha256 = "08k5j469750bhlq49qc5nwc2jjgmy9qsm58nf2jfwhxlpflv12sc"; + sha256 = "sha256-whPaFb+4mYOWmtFc/a+NkH9avCfOnGnAvqz3UFTt+RY="; }; - cargoSha256 = "1r8w5cdygd26m95q9qpqa85aixx25jr510hpjlllbpfvm7zjpbqk"; + cargoSha256 = "sha256-w7AqNsa9lolPEiHEv7E4XGaFV/UbCeYvmWekr9YzO6Q="; RUSTC_BOOTSTRAP = 1; buildInputs = lib.optionals stdenv.isDarwin [ CoreServices libiconv ]; - checkFlags = [ "--skip=http_proxy" "--skip=udp_tunnel" ]; + # all of these rely on connecting to www.example.com:80 + checkFlags = [ + "--skip=http_proxy" + "--skip=tcp_tunnel" + "--skip=udp_tunnel" + "--skip=udp_relay" + "--skip=socks4_relay_connect" + "--skip=socks5_relay_aead" + "--skip=socks5_relay_stream" + ]; meta = with lib; { homepage = "https://github.com/shadowsocks/shadowsocks-rust"; description = "A Rust port of shadowsocks"; license = licenses.mit; maintainers = [ maintainers.marsam ]; - broken = stdenv.isAarch64; # crypto2 crate doesn't build on aarch64 }; } diff --git a/nixpkgs/pkgs/tools/networking/shorewall/default.nix b/nixpkgs/pkgs/tools/networking/shorewall/default.nix index f95fc9d92b18..0c9e515ce094 100644 --- a/nixpkgs/pkgs/tools/networking/shorewall/default.nix +++ b/nixpkgs/pkgs/tools/networking/shorewall/default.nix @@ -1,10 +1,8 @@ { coreutils -, ebtables , fetchurl , gnugrep , gnused , iproute2 -, ipset , iptables , perl , perlPackages @@ -17,8 +15,6 @@ let [ "${coreutils}/bin" "${iproute2}/bin" "${iptables}/bin" - "${ipset}/bin" - "${ebtables}/bin" "${util-linux}/bin" "${gnugrep}/bin" "${gnused}/bin" @@ -47,9 +43,7 @@ stdenv.mkDerivation rec { buildInputs = [ coreutils iproute2 - ipset iptables - ebtables util-linux gnugrep gnused diff --git a/nixpkgs/pkgs/tools/networking/slowlorust/default.nix b/nixpkgs/pkgs/tools/networking/slowlorust/default.nix new file mode 100644 index 000000000000..dc98d95828f5 --- /dev/null +++ b/nixpkgs/pkgs/tools/networking/slowlorust/default.nix @@ -0,0 +1,26 @@ +{ lib +, stdenv +, fetchFromGitHub +, rustPlatform +}: + +rustPlatform.buildRustPackage rec { + pname = "slowlorust"; + version = "0.1.1"; + + src = fetchFromGitHub { + owner = "MJVL"; + repo = pname; + rev = version; + sha256 = "c4NWkQ/QvlUo1YoV2s7rWB6wQskAP5Qp1WVM23wvV3c="; + }; + + cargoSha256 = "Wu1mm+yJw2SddddxC5NfnMWLr+dplnRxH3AJ1/mTAKM="; + + meta = with lib; { + description = "Lightweight slowloris (HTTP DoS) tool"; + homepage = "https://github.com/MJVL/slowlorust"; + license = licenses.mit; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/nixpkgs/pkgs/tools/networking/sniffglue/default.nix b/nixpkgs/pkgs/tools/networking/sniffglue/default.nix index 502ab323e8e2..48ffb550c205 100644 --- a/nixpkgs/pkgs/tools/networking/sniffglue/default.nix +++ b/nixpkgs/pkgs/tools/networking/sniffglue/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "sniffglue"; - version = "0.13.1"; + version = "0.14.0"; src = fetchFromGitHub { owner = "kpcyrd"; repo = pname; rev = "v${version}"; - sha256 = "sha256-P8ubw523sw1O6Gpruy1Wa/Y0I3qJgvMdT53wBBoEGhE="; + sha256 = "sha256-s+2YzfSy7+o0VZZ4j/Cfd6F5GvBytthmDJqrPw+7SU0="; }; - cargoSha256 = "sha256-+Wh+/C9LvYppCghv11e8NKNhiMy0SV4S3nEWA6b1hQk="; + cargoSha256 = "sha256-4G1OGY7/vE8NKBFeuOZzqyZ0DQN4hy/HBO9qrEtBYlM="; nativeBuildInputs = [ pkg-config ]; diff --git a/nixpkgs/pkgs/tools/networking/socat/default.nix b/nixpkgs/pkgs/tools/networking/socat/default.nix index 7a24ccf33b74..b26760a72941 100644 --- a/nixpkgs/pkgs/tools/networking/socat/default.nix +++ b/nixpkgs/pkgs/tools/networking/socat/default.nix @@ -9,13 +9,20 @@ stdenv.mkDerivation rec { pname = "socat"; - version = "1.7.4.1"; + version = "1.7.4.2"; src = fetchurl { url = "http://www.dest-unreach.org/socat/download/${pname}-${version}.tar.bz2"; - sha256 = "1sbmqqvni3ss9wyay6ik5v81kxffkra80mh4ypgj74g82iba5b1z"; + sha256 = "sha256-ZpCp+ZkEV7UFCXonK78sv0zDVXYXb3ZkbjUksOkcF2M="; }; + patches = [ + # This adds missing feature checks for TCP_INFO, a Linux feature + # + # Discussed in https://github.com/Homebrew/homebrew-core/pull/88595 + ./socat-fix-feature-check-tcpinfo.patch + ]; + postPatch = '' patchShebangs test.sh substituteInPlace test.sh \ diff --git a/nixpkgs/pkgs/tools/networking/socat/socat-fix-feature-check-tcpinfo.patch b/nixpkgs/pkgs/tools/networking/socat/socat-fix-feature-check-tcpinfo.patch new file mode 100644 index 000000000000..ec0ea88359c8 --- /dev/null +++ b/nixpkgs/pkgs/tools/networking/socat/socat-fix-feature-check-tcpinfo.patch @@ -0,0 +1,21 @@ +diff --git a/filan.c b/filan.c +index 3465f7c..77c22a4 100644 +--- a/filan.c ++++ b/filan.c +@@ -905,6 +905,7 @@ int tcpan(int fd, FILE *outfile) { + #if WITH_TCP + + int tcpan2(int fd, FILE *outfile) { ++#ifdef TCP_INFO + struct tcp_info tcpinfo; + socklen_t tcpinfolen = sizeof(tcpinfo); + int result; +@@ -930,6 +931,8 @@ int tcpan2(int fd, FILE *outfile) { + // fprintf(outfile, "%s={%u}\t", "TCPI_", tcpinfo.tcpi_); + + return 0; ++#endif ++ return -1; + } + + #endif /* WITH_TCP */ diff --git a/nixpkgs/pkgs/tools/networking/spiped/default.nix b/nixpkgs/pkgs/tools/networking/spiped/default.nix index 8b9d4c9e7b89..233da21ec93e 100644 --- a/nixpkgs/pkgs/tools/networking/spiped/default.nix +++ b/nixpkgs/pkgs/tools/networking/spiped/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "spiped"; - version = "1.6.1"; + version = "1.6.2"; src = fetchurl { url = "https://www.tarsnap.com/spiped/${pname}-${version}.tgz"; - sha256 = "8d7089979db79a531a0ecc507b113ac6f2cf5f19305571eff1d3413e0ab33713"; + sha256 = "sha256-BdRofRLRHX+YiNQ/PYDFQbdyHJhwONCF9xyRuwYgRWc="; }; buildInputs = [ openssl ]; diff --git a/nixpkgs/pkgs/tools/networking/spoof-mac/default.nix b/nixpkgs/pkgs/tools/networking/spoof-mac/default.nix index fdd282fa8b5f..3b7bbd0d52a2 100644 --- a/nixpkgs/pkgs/tools/networking/spoof-mac/default.nix +++ b/nixpkgs/pkgs/tools/networking/spoof-mac/default.nix @@ -16,6 +16,8 @@ buildPythonPackage rec { # No tests doCheck = false; + pythonImportsCheck = [ "spoofmac" ]; + meta = with lib; { description = "Change your MAC address for debugging purposes"; homepage = "https://github.com/feross/SpoofMAC"; diff --git a/nixpkgs/pkgs/tools/networking/sshoogr/default.nix b/nixpkgs/pkgs/tools/networking/sshoogr/default.nix index f3c9c1a31fb8..e20978c277d9 100644 --- a/nixpkgs/pkgs/tools/networking/sshoogr/default.nix +++ b/nixpkgs/pkgs/tools/networking/sshoogr/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { version = "0.9.26"; src = fetchzip { - url = "https://repo1.maven.org/maven2/com/aestasit/infrastructure/${pname}/${pname}/${version}/${pname}-${version}.zip"; + url = "mirror://maven/com/aestasit/infrastructure/${pname}/${pname}/${version}/${pname}-${version}.zip"; sha256 = "134qlx90y82g1rfxhyn12z9r2imm1l3fz09hrrn3pgcdcq5jz2s1"; }; diff --git a/nixpkgs/pkgs/tools/networking/ssldump/default.nix b/nixpkgs/pkgs/tools/networking/ssldump/default.nix index 0d3e5ccf07e6..dd01bf504404 100644 --- a/nixpkgs/pkgs/tools/networking/ssldump/default.nix +++ b/nixpkgs/pkgs/tools/networking/ssldump/default.nix @@ -47,6 +47,6 @@ stdenv.mkDerivation rec { homepage = "http://ssldump.sourceforge.net"; license = "BSD-style"; maintainers = with maintainers; [ aycanirican ]; - platforms = platforms.linux; + platforms = platforms.unix; }; } diff --git a/nixpkgs/pkgs/tools/networking/sstp/default.nix b/nixpkgs/pkgs/tools/networking/sstp/default.nix index 151538462a35..65449c203e1d 100644 --- a/nixpkgs/pkgs/tools/networking/sstp/default.nix +++ b/nixpkgs/pkgs/tools/networking/sstp/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "sstp-client"; - version = "1.0.15"; + version = "1.0.16"; src = fetchurl { url = "mirror://sourceforge/sstp-client/sstp-client/sstp-client-${version}.tar.gz"; - sha256 = "sha256-hISqUfv75Big661YrSCo7hxG7XH4AL4YvNI7Qua6rWQ="; + sha256 = "sha256-r74U/RIveHX0+tDtmC0XRRNtLmbMNrl/cu8aERF4TKE="; }; postPatch = '' diff --git a/nixpkgs/pkgs/tools/networking/strongswan/default.nix b/nixpkgs/pkgs/tools/networking/strongswan/default.nix index 601446abb95c..9edc1c79fb0c 100644 --- a/nixpkgs/pkgs/tools/networking/strongswan/default.nix +++ b/nixpkgs/pkgs/tools/networking/strongswan/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchpatch, fetchFromGitHub +{ lib, stdenv, fetchFromGitHub , pkg-config, autoreconfHook, perl, gperf, bison, flex , gmp, python3, iptables, ldns, unbound, openssl, pcsclite, glib , openresolv @@ -17,13 +17,13 @@ with lib; stdenv.mkDerivation rec { pname = "strongswan"; - version = "5.8.1"; # Make sure to also update <nixpkgs/nixos/modules/services/networking/strongswan-swanctl/swanctl-params.nix> when upgrading! + version = "5.9.4"; # Make sure to also update <nixpkgs/nixos/modules/services/networking/strongswan-swanctl/swanctl-params.nix> when upgrading! src = fetchFromGitHub { owner = "strongswan"; repo = "strongswan"; rev = version; - sha256 = "1a1hw2jsbwvkdhhxjmq87hz13ivbgvqwks1q3adz14mqgbc64snd"; + sha256 = "1y1gs232x7hsbccjga9nbkf4bbi5wxazlkg00qd2v1nz86sfy4cd"; }; dontPatchELF = true; @@ -40,19 +40,6 @@ stdenv.mkDerivation rec { ./ext_auth-path.patch ./firewall_defaults.patch ./updown-path.patch - - # Don't use etc/dbus-1/system.d - (fetchpatch { - url = "https://patch-diff.githubusercontent.com/raw/strongswan/strongswan/pull/150.patch"; - sha256 = "1irfxb99blb8v3hs0kmlhzkkwbmds1p0gq319z8lmacz36cgyj2c"; - }) - - # fix build with -fno-common tollchain - (fetchpatch { - name = "fno-common.patch"; - url = "https://git.strongswan.org/?p=strongswan.git;a=patch;h=91c6387e69c09beaa9b9ca1e28471751a834fc24"; - sha256 = "0jp9walxwffp5cl7q0hb80h3s2gdj1nn3n8bvnbmwgh2s6pi148f"; - }) ]; postPatch = optionalString stdenv.isLinux '' diff --git a/nixpkgs/pkgs/tools/networking/stubby/default.nix b/nixpkgs/pkgs/tools/networking/stubby/default.nix deleted file mode 100644 index abe11b7bcb91..000000000000 --- a/nixpkgs/pkgs/tools/networking/stubby/default.nix +++ /dev/null @@ -1,33 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, getdns, doxygen, libyaml, darwin, cmake, systemd }: - -stdenv.mkDerivation rec { - pname = "stubby"; - version = "0.3.0"; - - src = fetchFromGitHub { - owner = "getdnsapi"; - repo = pname; - rev = "v${version}"; - sha256 = "04izd1v4fv9l7r75aafkrp6svczbx4cvv1vnfyx5n9105pin11mx"; - }; - - nativeBuildInputs = [ cmake libyaml ]; - - buildInputs = [ doxygen getdns systemd ] - ++ lib.optionals stdenv.isDarwin [ darwin.Security ]; - - meta = with lib; { - description = "A local DNS Privacy stub resolver (using DNS-over-TLS)"; - longDescription = '' - Stubby is an application that acts as a local DNS Privacy stub - resolver (using RFC 7858, aka DNS-over-TLS). Stubby encrypts DNS - queries sent from a client machine (desktop or laptop) to a DNS - Privacy resolver increasing end user privacy. Stubby is developed by - the getdns team. - ''; - homepage = "https://dnsprivacy.org/wiki/x/JYAT"; - downloadPage = "https://github.com/getdnsapi/stubby"; - maintainers = with maintainers; [ leenaars ehmry ]; - license = licenses.bsd3; platforms = platforms.all; - }; -} diff --git a/nixpkgs/pkgs/tools/networking/stunnel/default.nix b/nixpkgs/pkgs/tools/networking/stunnel/default.nix index 68c2fc935fcd..5b73e7d3fb48 100644 --- a/nixpkgs/pkgs/tools/networking/stunnel/default.nix +++ b/nixpkgs/pkgs/tools/networking/stunnel/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "stunnel"; - version = "5.60"; + version = "5.61"; src = fetchurl { url = "https://www.stunnel.org/downloads/${pname}-${version}.tar.gz"; - sha256 = "sha256-xF12WxUhhh/qmwO0JbndfUizBVEowK7Gc7ul75uPeH0="; + sha256 = "sha256-keoMpkgtj359lx7mSrT4aigX0DijcvCJPigxXvIBXXo="; # please use the contents of "https://www.stunnel.org/downloads/${name}.tar.gz.sha256", # not the output of `nix-prefetch-url` }; diff --git a/nixpkgs/pkgs/tools/networking/subfinder/default.nix b/nixpkgs/pkgs/tools/networking/subfinder/default.nix index ae87d02fe236..7960324cbd71 100644 --- a/nixpkgs/pkgs/tools/networking/subfinder/default.nix +++ b/nixpkgs/pkgs/tools/networking/subfinder/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "subfinder"; - version = "2.4.8"; + version = "2.4.9"; src = fetchFromGitHub { owner = "projectdiscovery"; repo = pname; rev = "v${version}"; - sha256 = "1g1j3il1a595g7z8blhvyd5l03h6kccl7mzrx51c33jz74cms5kn"; + sha256 = "sha256-BtyPy6ow3flHl4jM9cfF+y3JCtLYx2c+a8f7ol3nQj4="; }; - vendorSha256 = "1jmik0zmfy1n3g4yjkskiqzd28dpywf0hw6adgz2jshlhka58iw0"; + vendorSha256 = "sha256-jIU5UZdmBUqyjva+g7zoijPqHF2p3vzImEFQCP/CFwE="; modRoot = "./v2"; diff --git a/nixpkgs/pkgs/tools/networking/swagger-codegen/default.nix b/nixpkgs/pkgs/tools/networking/swagger-codegen/default.nix index f2847703bdba..37e35e95e7f4 100644 --- a/nixpkgs/pkgs/tools/networking/swagger-codegen/default.nix +++ b/nixpkgs/pkgs/tools/networking/swagger-codegen/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { ]; src = fetchurl { - url = "https://repo1.maven.org/maven2/io/swagger/${pname}-cli/${version}/${jarfilename}"; + url = "mirror://maven/io/swagger/${pname}-cli/${version}/${jarfilename}"; sha256 = "04wl5k8k1ziqz7k5w0g7i6zdfn41pbh3k0m8vq434k1886inf8yn"; }; diff --git a/nixpkgs/pkgs/tools/networking/swagger-codegen3/default.nix b/nixpkgs/pkgs/tools/networking/swagger-codegen3/default.nix index 8fc908a1f2c2..499b829b4376 100644 --- a/nixpkgs/pkgs/tools/networking/swagger-codegen3/default.nix +++ b/nixpkgs/pkgs/tools/networking/swagger-codegen3/default.nix @@ -1,7 +1,7 @@ { lib, stdenv, fetchurl, jre, makeWrapper }: stdenv.mkDerivation rec { - version = "3.0.25"; + version = "3.0.31"; pname = "swagger-codegen"; jarfilename = "${pname}-cli-${version}.jar"; @@ -11,8 +11,8 @@ stdenv.mkDerivation rec { ]; src = fetchurl { - url = "https://repo1.maven.org/maven2/io/swagger/codegen/v3/${pname}-cli/${version}/${jarfilename}"; - sha256 = "1rdz45kmmg60fs7ddnla1xq30nah6s6rd18fqbjbjxng8r92brnd"; + url = "mirror://maven/io/swagger/codegen/v3/${pname}-cli/${version}/${jarfilename}"; + sha256 = "sha256-GZJLS+gy23FcSS2twF4fnRf5QkVEpx23UaN7pdJIudM="; }; dontUnpack = true; diff --git a/nixpkgs/pkgs/tools/networking/tcpreplay/default.nix b/nixpkgs/pkgs/tools/networking/tcpreplay/default.nix index ed83e4d45549..6e2fb35fd4c2 100644 --- a/nixpkgs/pkgs/tools/networking/tcpreplay/default.nix +++ b/nixpkgs/pkgs/tools/networking/tcpreplay/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { "--enable-shared" "--enable-tcpreplay-edit" "--with-libpcap=${libpcap}" - "--with-tcpdump=${tcpdump}/bin" + "--with-tcpdump=${tcpdump}/bin/tcpdump" ]; meta = with lib; { diff --git a/nixpkgs/pkgs/tools/networking/tdns-cli/default.nix b/nixpkgs/pkgs/tools/networking/tdns-cli/default.nix index 9f1ac89ce8ec..a38456bcc760 100644 --- a/nixpkgs/pkgs/tools/networking/tdns-cli/default.nix +++ b/nixpkgs/pkgs/tools/networking/tdns-cli/default.nix @@ -1,17 +1,17 @@ { lib, fetchFromGitHub, rustPlatform }: rustPlatform.buildRustPackage rec { - name = "tdns-cli"; + pname = "tdns-cli"; version = "0.0.5"; src = fetchFromGitHub { owner = "rotty"; - repo = name; + repo = pname; rev = "v${version}"; sha256 = "0nn036in5j1h0vxkwif0lf7fn900zy4f4kxlzy6qdx3jakgmxvwh"; }; - cargoSha256 = "14mmfj5my8gbsdhlhz17w8wjcc085c6dkj78kwr2hhsbcxp1vjgg"; + cargoSha256 = "sha256-O4n38dla2WgZ4949Ata6AYbZF9LMnXDyuFNoXRrTN7I="; meta = with lib; { description = "DNS tool that aims to replace dig and nsupdate"; diff --git a/nixpkgs/pkgs/tools/networking/telepresence2/default.nix b/nixpkgs/pkgs/tools/networking/telepresence2/default.nix index e7ae903e8682..9a2e1b4bbc78 100644 --- a/nixpkgs/pkgs/tools/networking/telepresence2/default.nix +++ b/nixpkgs/pkgs/tools/networking/telepresence2/default.nix @@ -1,17 +1,27 @@ -{ lib, buildGoModule, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub, kubernetes-helm }: buildGoModule rec { pname = "telepresence2"; - version = "2.4.0"; + version = "2.4.6"; src = fetchFromGitHub { owner = "telepresenceio"; repo = "telepresence"; rev = "v${version}"; - sha256 = "1v2jkhdlyq37akqyhb8mwsh7rjdv2fjw8kyzys3dv04k3dy5sl0f"; + sha256 = "09w7yk7jk5m6clq3drbgdr61w60b21jmfd635brfahms8pykmmzl"; }; - vendorSha256 = "1snmp461h8driy1w1xggk669yxl0sjl1m9pbqm7dwk44yb94zi1q"; + # The Helm chart is go:embed'ed as a tarball in the binary. + # That tarball is generated by running ./build-aux/package_embedded_chart/main.go, + # which tries to invoke helm from tools/bin/helm. + # Oh well… + preBuild = '' + mkdir -p tools/bin + ln -sfn ${kubernetes-helm}/bin/helm tools/bin/helm + go run ./build-aux/package_embedded_chart/main.go ${src.rev} + ''; + + vendorSha256 = "0przkcqaf56a0sgan2xxqfpbs9nbmq4brwdv1qnag7i9myzvixxb"; ldflags = [ "-s" "-w" "-X=github.com/telepresenceio/telepresence/v2/pkg/version.Version=${src.rev}" diff --git a/nixpkgs/pkgs/tools/networking/tendermint/default.nix b/nixpkgs/pkgs/tools/networking/tendermint/default.nix index 1f363ae3f9f1..12eb1a7f0a64 100644 --- a/nixpkgs/pkgs/tools/networking/tendermint/default.nix +++ b/nixpkgs/pkgs/tools/networking/tendermint/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "tendermint"; - version = "0.34.13"; + version = "0.35.0"; src = fetchFromGitHub { owner = "tendermint"; repo = pname; rev = "v${version}"; - sha256 = "sha256-z3rbDdk68PTvJ/LPnAx8kOjCGXMfxQA0LK9GLYgaiUY="; + sha256 = "sha256-fSDmwZNKAHXcMtNZlqJmUFkuFdZLkDbnn+ZrNtnszgU="; }; - vendorSha256 = "sha256-bwDyis/dHKSqBFw5jFWSZip5YjBe1bq/ieg6Jg0P/TM="; + vendorSha256 = "sha256-DktuZ0NUyg8LbYklxde2ZZJ8/WOyBq50E9yEHtS+Hqw="; subPackages = [ "cmd/tendermint" ]; diff --git a/nixpkgs/pkgs/tools/networking/termscp/default.nix b/nixpkgs/pkgs/tools/networking/termscp/default.nix new file mode 100644 index 000000000000..58bbfe5e46c6 --- /dev/null +++ b/nixpkgs/pkgs/tools/networking/termscp/default.nix @@ -0,0 +1,48 @@ +{ lib +, dbus +, fetchFromGitHub +, libssh +, openssl +, pkg-config +, rustPlatform +, Foundation +, Security +, stdenv +}: + +rustPlatform.buildRustPackage rec { + pname = "termscp"; + version = "0.7.0"; + + src = fetchFromGitHub { + owner = "veeso"; + repo = pname; + rev = "v${version}"; + sha256 = "131kij6pnw9r0p2a28g00z85dh758h4rm9ic09qmp61cq7dphkc1"; + }; + + cargoSha256 = "1k2vwmfy6dczgs3bz8k4j24cc8l7l9fdh3ymp79ril4rp1v6kfp2"; + + nativeBuildInputs = [ + pkg-config + ]; + + buildInputs = [ + dbus + libssh + openssl + ] ++ lib.optional stdenv.isDarwin [ + Foundation + Security + ]; + + # Requires network access + doCheck = false; + + meta = with lib; { + description = "Terminal tool for file transfer and explorer"; + homepage = "https://github.com/veeso/termscp"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/nixpkgs/pkgs/tools/networking/tgt/default.nix b/nixpkgs/pkgs/tools/networking/tgt/default.nix index ba1f89af433e..fdaf0dc177f3 100644 --- a/nixpkgs/pkgs/tools/networking/tgt/default.nix +++ b/nixpkgs/pkgs/tools/networking/tgt/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "tgt"; - version = "1.0.80"; + version = "1.0.81"; src = fetchFromGitHub { owner = "fujita"; repo = pname; rev = "v${version}"; - sha256 = "sha256-5qBqCHbkL6yw/iT2AtSumw8V0bV74TEyYMRgcPHW2lg="; + sha256 = "sha256-SgMpoaVAuTbgpmnXRfQFWlK5gl01fsE9vJxu3C2ctPU="; }; nativeBuildInputs = [ libxslt docbook_xsl makeWrapper ]; @@ -51,7 +51,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "iSCSI Target daemon with RDMA support"; - homepage = "http://stgt.sourceforge.net/"; + homepage = "https://github.com/fujita/tgt"; license = licenses.gpl2; platforms = platforms.linux; maintainers = with maintainers; [ johnazoidberg ]; diff --git a/nixpkgs/pkgs/tools/networking/tinyssh/default.nix b/nixpkgs/pkgs/tools/networking/tinyssh/default.nix new file mode 100644 index 000000000000..9bfa8aa3ab53 --- /dev/null +++ b/nixpkgs/pkgs/tools/networking/tinyssh/default.nix @@ -0,0 +1,28 @@ +{ lib, stdenv, fetchFromGitHub }: + +stdenv.mkDerivation rec { + pname = "tinyssh"; + version = "20210601"; + + src = fetchFromGitHub { + owner = "janmojzis"; + repo = "tinyssh"; + rev = version; + sha256 = "sha256-+THoPiD6dW5ZuiQmmLckOJGyjhzdF3qF0DgC51zjGY8="; + }; + + preConfigure = '' + echo /bin > conf-bin + echo /share/man > conf-man + ''; + + DESTDIR = placeholder "out"; + + meta = with lib; { + description = "minimalistic SSH server"; + homepage = "https://tinyssh.org"; + license = licenses.publicDomain; + platforms = platforms.unix; + maintainers = [ maintainers.kaction ]; + }; +} diff --git a/nixpkgs/pkgs/tools/networking/tox-node/default.nix b/nixpkgs/pkgs/tools/networking/tox-node/default.nix index 5ed6aa632d33..80d20a7ce7f7 100644 --- a/nixpkgs/pkgs/tools/networking/tox-node/default.nix +++ b/nixpkgs/pkgs/tools/networking/tox-node/default.nix @@ -1,6 +1,7 @@ { lib, rustPlatform, fetchFromGitHub , libsodium, openssl , pkg-config +, fetchpatch }: with rustPlatform; @@ -16,6 +17,14 @@ buildRustPackage rec { sha256 = "sha256-tB6v2NEBdTNHf89USdQOr/pV0mbxxb8ftOYPPJMvz5Y="; }; + cargoPatches = [ + # update cargo lock + (fetchpatch { + url = "https://github.com/tox-rs/tox-node/commit/63712d49d84e55df7bba9710e129780bbc636de3.patch"; + sha256 = "sha256-jI6b5IHsAuGuM+7sPCdFnOOuV6K9rBmc5QqU5x72Fl0="; + }) + ]; + buildInputs = [ libsodium openssl ]; nativeBuildInputs = [ pkg-config ]; @@ -23,13 +32,13 @@ buildRustPackage rec { doCheck = false; - cargoSha256 = "sha256-J/0KO33vZmOvm6V7qCXInuAJTbRqyy5/qj6p6dEmoas="; + cargoSha256 = "sha256-yHsYjKJJNjepvcNszj4XQ0DbOY3AEJMZOnz0cAiwO1A="; meta = with lib; { description = "A server application to run tox node written in pure Rust"; homepage = "https://github.com/tox-rs/tox-node"; license = [ licenses.gpl3Plus ]; platforms = platforms.linux; - maintainers = with maintainers; [ suhr ]; + maintainers = with maintainers; [ suhr kurnevsky ]; }; } diff --git a/nixpkgs/pkgs/tools/networking/toxvpn/default.nix b/nixpkgs/pkgs/tools/networking/toxvpn/default.nix index c5aaec66d9e3..57a5510bd430 100644 --- a/nixpkgs/pkgs/tools/networking/toxvpn/default.nix +++ b/nixpkgs/pkgs/tools/networking/toxvpn/default.nix @@ -11,7 +11,7 @@ }: stdenv.mkDerivation { - name = "toxvpn"; + pname = "toxvpn"; version = "unstable-2019-09-09"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/tools/networking/unbound/default.nix b/nixpkgs/pkgs/tools/networking/unbound/default.nix index 393756a9b2ab..f9ff82735b90 100644 --- a/nixpkgs/pkgs/tools/networking/unbound/default.nix +++ b/nixpkgs/pkgs/tools/networking/unbound/default.nix @@ -12,6 +12,8 @@ , pkg-config , makeWrapper , symlinkJoin +, bison +, nixosTests # # By default unbound will not be built with systemd support. Unbound is a very # commmon dependency. The transitive dependency closure of systemd also @@ -30,6 +32,9 @@ , withDNSTAP ? false , withTFO ? false , withRedis ? false +# Avoid .lib depending on openssl.out +# The build gets a little hacky, so in some cases we disable this approach. +, withSlimLib ? stdenv.isLinux && !stdenv.hostPlatform.isMusl && !withDNSTAP , libnghttp2 }: @@ -82,7 +87,7 @@ stdenv.mkDerivation rec { "--with-libhiredis=${hiredis}" ]; - PROTOC_C = if withDNSTAP then "${protobufc}/bin/protoc-c" else null; + PROTOC_C = lib.optionalString withDNSTAP "${protobufc}/bin/protoc-c"; # Remove references to compile-time dependencies that are included in the configure flags postConfigure = let @@ -91,6 +96,10 @@ stdenv.mkDerivation rec { sed -E '/CONFCMDLINE/ s;${storeDir}/[a-z0-9]{32}-;${storeDir}/eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee-;g' -i config.h ''; + checkInputs = [ bison ]; + + doCheck = true; + installFlags = [ "configfile=\${out}/etc/unbound/unbound.conf" ]; postInstall = '' @@ -99,14 +108,16 @@ stdenv.mkDerivation rec { --prefix PATH : ${lib.makeBinPath [ openssl ]} ''; - preFixup = lib.optionalString (stdenv.isLinux && !stdenv.hostPlatform.isMusl) # XXX: revisit + preFixup = lib.optionalString withSlimLib # Build libunbound again, but only against nettle instead of openssl. # This avoids gnutls.out -> unbound.lib -> openssl.out. - # There was some problem with this on Darwin; let's not complicate non-Linux. '' configureFlags="$configureFlags --with-nettle=${nettle.dev} --with-libunbound-only" configurePhase buildPhase + if [ -n "$doCheck" ]; then + checkPhase + fi installPhase '' # get rid of runtime dependencies on $dev outputs @@ -115,6 +126,8 @@ stdenv.mkDerivation rec { (pkg: lib.optionalString (pkg ? dev) " --replace '-L${pkg.dev}/lib' '-L${pkg.out}/lib' --replace '-R${pkg.dev}/lib' '-R${pkg.out}/lib'") (builtins.filter (p: p != null) buildInputs); + passthru.tests = nixosTests.unbound; + meta = with lib; { description = "Validating, recursive, and caching DNS resolver"; license = licenses.bsd3; diff --git a/nixpkgs/pkgs/tools/networking/urlwatch/default.nix b/nixpkgs/pkgs/tools/networking/urlwatch/default.nix index b1a374f0349d..705b2397c6ac 100644 --- a/nixpkgs/pkgs/tools/networking/urlwatch/default.nix +++ b/nixpkgs/pkgs/tools/networking/urlwatch/default.nix @@ -5,13 +5,13 @@ python3Packages.buildPythonApplication rec { pname = "urlwatch"; - version = "2.23"; + version = "2.24"; src = fetchFromGitHub { owner = "thp"; repo = "urlwatch"; rev = version; - sha256 = "1ryygy7lalmwnv9kc8q4920gkdx878izy33a5dgxb780sy2qq8pg"; + sha256 = "sha256-H7dusAXVEGOUu2fr6UjiXjw13Gm9xNeJDQ4jqV+8QmU="; }; propagatedBuildInputs = with python3Packages; [ diff --git a/nixpkgs/pkgs/tools/networking/v2ray/default.nix b/nixpkgs/pkgs/tools/networking/v2ray/default.nix index b37b98d7efc6..d3ea5a071e10 100644 --- a/nixpkgs/pkgs/tools/networking/v2ray/default.nix +++ b/nixpkgs/pkgs/tools/networking/v2ray/default.nix @@ -1,43 +1,23 @@ -{ lib, fetchFromGitHub, fetchurl, linkFarm, buildGoModule, runCommand, makeWrapper, nixosTests -, assetOverrides ? {} +{ lib, fetchFromGitHub, fetchurl, symlinkJoin, buildGoModule, runCommand, makeWrapper, nixosTests +, v2ray-geoip, v2ray-domain-list-community, assets ? [ v2ray-geoip v2ray-domain-list-community ] }: let - version = "4.43.0"; + version = "4.44.0"; src = fetchFromGitHub { owner = "v2fly"; repo = "v2ray-core"; rev = "v${version}"; - sha256 = "sha256-kOTQQUbaRQBABopU0x36j8Qre+Ko0UecUDNN8dvFni8="; + sha256 = "1yk02n2lllbcwqkz4f3l3d2df1w3m768zxvdawgmafjgmbqf0gjf"; }; vendorSha256 = "sha256-7zSIAKcMwtaTvokKuLJ8orqJc2jGuaw5FglEJadeZ9I="; - assets = { - # MIT licensed - "geoip.dat" = let - geoipRev = "202109300030"; - geoipSha256 = "1d2z3ljs0v9rd10cfj8cpiijz3ikkplsymr44f7y90g4dmniwqh0"; - in fetchurl { - url = "https://github.com/v2fly/geoip/releases/download/${geoipRev}/geoip.dat"; - sha256 = geoipSha256; - }; - - # MIT licensed - "geosite.dat" = let - geositeRev = "20211001023210"; - geositeSha256 = "02d55i1pdndwvmi4v42hnncjng517s0k06gr3yn5krnj2qfjli2w"; - in fetchurl { - url = "https://github.com/v2fly/domain-list-community/releases/download/${geositeRev}/dlc.dat"; - sha256 = geositeSha256; - }; - - } // assetOverrides; - - assetsDrv = linkFarm "v2ray-assets" (lib.mapAttrsToList (name: path: { - inherit name path; - }) assets); + assetsDrv = symlinkJoin { + name = "v2ray-assets"; + paths = assets; + }; core = buildGoModule rec { pname = "v2ray-core"; @@ -84,6 +64,6 @@ in runCommand "v2ray-${version}" { } '' for file in ${core}/bin/*; do makeWrapper "$file" "$out/bin/$(basename "$file")" \ - --set-default V2RAY_LOCATION_ASSET ${assetsDrv} + --set-default V2RAY_LOCATION_ASSET ${assetsDrv}/share/v2ray done '' diff --git a/nixpkgs/pkgs/tools/networking/v2ray/update.sh b/nixpkgs/pkgs/tools/networking/v2ray/update.sh index f645b8ea0939..9b8e4cef13a4 100755 --- a/nixpkgs/pkgs/tools/networking/v2ray/update.sh +++ b/nixpkgs/pkgs/tools/networking/v2ray/update.sh @@ -8,10 +8,8 @@ deps_nix=./deps.nix nixpkgs=../../../.. old_core_rev=$(sed -En 's/.*\bversion = "(.*?)".*/\1/p' "$version_nix") -old_geoip_rev=$(sed -En 's/.*\bgeoipRev = "(.*?)".*/\1/p' "$version_nix") -old_geosite_rev=$(sed -En 's/.*\bgeositeRev = "(.*?)".*/\1/p' "$version_nix") echo "Current version:" >&2 -echo "core: $old_core_rev, geoip: $old_geoip_rev, geosite: $old_geosite_rev" >&2 +echo "core: $old_core_rev" >&2 function fetch_latest_rev { curl "https://api.github.com/repos/v2fly/$1/releases" | @@ -20,10 +18,8 @@ function fetch_latest_rev { core_rev=$(fetch_latest_rev 'v2ray-core') core_rev=${core_rev:1} -geoip_rev=$(fetch_latest_rev 'geoip') -geosite_rev=$(fetch_latest_rev 'domain-list-community') echo "Latest version:" >&2 -echo "core: $core_rev, geoip: $geoip_rev, geosite: $geosite_rev" >&2 +echo "core: $core_rev" >&2 if [[ $core_rev != $old_core_rev ]]; then echo "Prefetching core..." >&2 @@ -38,24 +34,6 @@ if [[ $core_rev != $old_core_rev ]]; then "$version_nix" fi -if [[ $geoip_rev != $old_geoip_rev ]]; then - echo "Prefetching geoip..." >&2 - hash=$(nix-prefetch-url "https://github.com/v2fly/geoip/releases/download/$geoip_rev/geoip.dat") - sed --in-place \ - -e "s/\bgeoipRev = \".*\"/geoipRev = \"$geoip_rev\"/" \ - -e "s/\bgeoipSha256 = \".*\"/geoipSha256 = \"$hash\"/" \ - "$version_nix" -fi - -if [[ $geosite_rev != $old_geosite_rev ]]; then - echo "Prefetching geosite..." >&2 - hash=$(nix-prefetch-url "https://github.com/v2fly/domain-list-community/releases/download/$geosite_rev/dlc.dat") - sed --in-place \ - -e "s/\bgeositeRev = \".*\"/geositeRev = \"$geosite_rev\"/" \ - -e "s/\bgeositeSha256 = \".*\"/geositeSha256 = \"$hash\"/" \ - "$version_nix" -fi - echo "Prebuilding..." >&2 set +o pipefail vendorSha256=$( diff --git a/nixpkgs/pkgs/tools/networking/vde2/default.nix b/nixpkgs/pkgs/tools/networking/vde2/default.nix index 694a2bc02056..31d4f9e3ff57 100644 --- a/nixpkgs/pkgs/tools/networking/vde2/default.nix +++ b/nixpkgs/pkgs/tools/networking/vde2/default.nix @@ -34,6 +34,13 @@ stdenv.mkDerivation rec { hardeningDisable = [ "format" ]; + # Disable parallel build as it fails as: + # make: *** No rule to make target '../../src/lib/libvdemgmt.la', + # needed by 'libvdesnmp.la'. Stop. + # Next release should address it with + # https://github.com/virtualsquare/vde-2/commit/7dd9ed46d5dca125ca45d679ac9f3acbfb0f9300.patch + enableParallelBuilding = false; + meta = with lib; { homepage = "https://github.com/virtualsquare/vde-2"; description = "Virtual Distributed Ethernet, an Ethernet compliant virtual network"; diff --git a/nixpkgs/pkgs/tools/networking/vopono/default.nix b/nixpkgs/pkgs/tools/networking/vopono/default.nix index b90f405ec684..aa49d93ef660 100644 --- a/nixpkgs/pkgs/tools/networking/vopono/default.nix +++ b/nixpkgs/pkgs/tools/networking/vopono/default.nix @@ -5,14 +5,14 @@ rustPlatform.buildRustPackage rec { pname = "vopono"; - version = "0.8.6"; + version = "0.8.10"; src = fetchCrate { inherit pname version; - sha256 = "0dsyav755mggnsybj7iwvdqbqzz0gfd3j9vh0hmg5b7pbffanzvy"; + sha256 = "sha256-+ZRvuUA7BvM8YW1QZQ7iJrLvleitl1hqEOrTkrLVSes"; }; - cargoHash = "sha256:187mi36dgr2f1klqclci175zqgyrm0b6awrcnav63vira7hqz076"; + cargoHash = "sha256-zM5JufS0qEYPEEwl6iPZYge3cssrsLu835AhAd8F3vc"; meta = with lib; { description = "Run applications through VPN connections in network namespaces"; diff --git a/nixpkgs/pkgs/tools/networking/vpn-slice/default.nix b/nixpkgs/pkgs/tools/networking/vpn-slice/default.nix index 9511c214c08c..0e98212ad5a5 100644 --- a/nixpkgs/pkgs/tools/networking/vpn-slice/default.nix +++ b/nixpkgs/pkgs/tools/networking/vpn-slice/default.nix @@ -1,20 +1,26 @@ -{ lib, buildPythonApplication, python3Packages, fetchFromGitHub }: +{ lib, buildPythonApplication, nix-update-script, python3Packages, fetchFromGitHub }: buildPythonApplication rec { pname = "vpn-slice"; - version = "0.14"; + version = "0.16.1"; src = fetchFromGitHub { owner = "dlenski"; repo = pname; rev = "v${version}"; - sha256 = "1z2mdl3arzl95zrj4ir57f762gcimmmq5nk91j679cshxz4snxyr"; + sha256 = "sha256-T6VULLNRLWO4OcAsuTmhty6H4EhinyxQSg0dfv2DUJs="; }; propagatedBuildInputs = with python3Packages; [ setproctitle dnspython ]; doCheck = false; + passthru = { + updateScript = nix-update-script { + attrPath = pname; + }; + }; + meta = with lib; { homepage = "https://github.com/dlenski/vpn-slice"; description = diff --git a/nixpkgs/pkgs/tools/networking/vpnc-scripts/default.nix b/nixpkgs/pkgs/tools/networking/vpnc-scripts/default.nix index 776e8450d13c..f0d5991d34bc 100644 --- a/nixpkgs/pkgs/tools/networking/vpnc-scripts/default.nix +++ b/nixpkgs/pkgs/tools/networking/vpnc-scripts/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation { pname = "vpnc-scripts"; - version = "unstable-2021-03-21"; + version = "unstable-2021-09-24"; src = fetchgit { - url = "git://git.infradead.org/users/dwmw2/vpnc-scripts.git"; - rev = "8fff06090ed193c4a7285e9a10b42e6679e8ecf3"; - sha256 = "14bzzpwz7kdmlbx825h6s4jjdml9q6ziyrq8311lp8caql68qdq1"; + url = "https://gitlab.com/openconnect/vpnc-scripts.git"; + rev = "b749c2cadc2f32e2efffa69302861f9a7d4a4e5f"; + sha256 = "sha256:19aj6mfkclbkx6ycyd4xm7id1bq78ismw0y6z23f6s016k3sjc8c"; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/nixpkgs/pkgs/tools/networking/vpnc/default.nix b/nixpkgs/pkgs/tools/networking/vpnc/default.nix index 6928bacd6ce7..f67d29f09d49 100644 --- a/nixpkgs/pkgs/tools/networking/vpnc/default.nix +++ b/nixpkgs/pkgs/tools/networking/vpnc/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation { rm -r $sourceRoot/{trunk,branches,tags} ''; - patches = [ ./makefile.patch ./no_default_route_when_netmask.patch ]; + patches = [ ./no_default_route_when_netmask.patch ]; # The `etc/vpnc/vpnc-script' script relies on `which' and on # `ifconfig' as found in net-tools (not GNU Inetutils). @@ -23,6 +23,16 @@ stdenv.mkDerivation { nativeBuildInputs = [ makeWrapper ]; buildInputs = [libgcrypt perl openssl ]; + makeFlags = [ + "PREFIX=$(out)" + "ETCDIR=$(out)/etc/vpnc" + "SCRIPT_PATH=$(out)/etc/vpnc/vpnc-script" + ]; + + postPatch = '' + patchShebangs makeman.pl + ''; + preConfigure = '' sed -i 's|^#OPENSSL|OPENSSL|g' Makefile @@ -33,9 +43,6 @@ stdenv.mkDerivation { substituteInPlace "config.c" \ --replace "/etc/vpnc/vpnc-script" "$out/etc/vpnc/vpnc-script" - - substituteInPlace "pcf2vpnc" \ - --replace "/usr/bin/perl" "${perl}/bin/perl" ''; postInstall = '' diff --git a/nixpkgs/pkgs/tools/networking/vpnc/makefile.patch b/nixpkgs/pkgs/tools/networking/vpnc/makefile.patch deleted file mode 100644 index 89a8cd6da952..000000000000 --- a/nixpkgs/pkgs/tools/networking/vpnc/makefile.patch +++ /dev/null @@ -1,22 +0,0 @@ ---- vpnc-0.5.1.orig/Makefile 2008-02-10 22:22:43.000000000 +0100 -+++ vpnc-0.5.1/Makefile 2008-02-10 22:22:32.000000000 +0100 -@@ -20,8 +20,8 @@ - # $Id: Makefile 236 2007-09-05 20:40:59Z Joerg Mayer $ - - DESTDIR= --PREFIX=/usr/local --ETCDIR=/etc/vpnc -+PREFIX=$(out) -+ETCDIR=$(out)/etc/vpnc - BINDIR=$(PREFIX)/bin - SBINDIR=$(PREFIX)/sbin - MANDIR=$(PREFIX)/share/man -@@ -71,7 +71,7 @@ - $(CC) -o $@ $^ $(LDFLAGS) - - vpnc.8 : vpnc.8.template makeman.pl vpnc -- ./makeman.pl -+ perl makeman.pl - - cisco-decrypt : cisco-decrypt.o config.o supp.o sysdep.o vpnc-debug.o - $(CC) -o $@ $^ $(LDFLAGS) diff --git a/nixpkgs/pkgs/tools/networking/vtun/default.nix b/nixpkgs/pkgs/tools/networking/vtun/default.nix deleted file mode 100644 index 61c18af16561..000000000000 --- a/nixpkgs/pkgs/tools/networking/vtun/default.nix +++ /dev/null @@ -1,37 +0,0 @@ -{ lib, stdenv, fetchurl, fetchpatch, openssl, lzo, zlib, bison, flex }: - -stdenv.mkDerivation rec { - pname = "vtun"; - version = "3.0.4"; - - src = fetchurl { - url = "mirror://sourceforge/vtun/vtun-${version}.tar.gz"; - sha256 = "1fcqzn2bdjw31j1hvv6lg99v2phhszm29kp2xambxzp32mmxzy5b"; - }; - - patches = [ - (fetchpatch { url = "http://sources.debian.net/data/main/v/vtun/3.0.3-2.2/debian/patches/08-gcc5-inline.patch"; - sha256 = "18sys97v2hx6vac5zp3ld7sa6kz4izv3g9dnkm0lflbaxhym2vs1"; - }) - ]; - - postPatch = '' - sed -i -e 's/-m 755//' -e 's/-o root -g 0//' Makefile.in - sed -i '/strip/d' Makefile.in - ''; - buildInputs = [ lzo openssl zlib bison flex ]; - - configureFlags = [ - "--with-lzo-headers=${lzo}/include/lzo" - "--with-ssl-headers=${openssl.dev}/include/openssl" - "--with-blowfish-headers=${openssl.dev}/include/openssl" - ]; - - meta = with lib; { - description = "Virtual Tunnels over TCP/IP with traffic shaping, compression and encryption"; - homepage = "http://vtun.sourceforge.net/"; - license = licenses.gpl2; - platforms = platforms.linux; - maintainers = with maintainers; [ pSub ]; - }; -} diff --git a/nixpkgs/pkgs/tools/networking/waitron/default.nix b/nixpkgs/pkgs/tools/networking/waitron/default.nix index 8364cd5763dc..c37d82024fe6 100644 --- a/nixpkgs/pkgs/tools/networking/waitron/default.nix +++ b/nixpkgs/pkgs/tools/networking/waitron/default.nix @@ -2,8 +2,8 @@ { lib, buildGoPackage, fetchgit, fetchhg, fetchbzr, fetchsvn }: buildGoPackage rec { - name = "waitron-unstable-${version}"; - version = "2020-01-24"; + pname = "waitron"; + version = "unstable-2020-01-24"; rev = "c96833619cbb0cf2bc71b1d7b534101e139cc6e6"; goPackagePath = "github.com/ns1/waitron"; diff --git a/nixpkgs/pkgs/tools/networking/wg-friendly-peer-names/default.nix b/nixpkgs/pkgs/tools/networking/wg-friendly-peer-names/default.nix new file mode 100644 index 000000000000..a2ec966a6045 --- /dev/null +++ b/nixpkgs/pkgs/tools/networking/wg-friendly-peer-names/default.nix @@ -0,0 +1,29 @@ +{ stdenv +, lib +, fetchFromGitHub +, wireguard-tools +}: + +stdenv.mkDerivation { + pname = "wg-friendly-peer-names"; + version = "unstable-2021-11-08"; + + src = fetchFromGitHub { + owner = "FlyveHest"; + repo = "wg-friendly-peer-names"; + rev = "66b9b6b74ec77b9fec69b2a58296635321d4f5f1"; + sha256 = "pH/b5rCHIqLxz/Fnx+Dm0m005qAUWBsczSU9vGEQ2RQ="; + }; + + installPhase = '' + install -D wgg.sh $out/bin/wgg + ''; + + meta = with lib; { + homepage = "https://github.com/FlyveHest/wg-friendly-peer-names"; + description = "Small shellscript that makes it possible to give peers a friendlier and more readable name in the `wg` peer list"; + license = licenses.mit; + platforms = wireguard-tools.meta.platforms; + maintainers = with maintainers; [ mkg20001 ]; + }; +} diff --git a/nixpkgs/pkgs/tools/networking/wifite2/default.nix b/nixpkgs/pkgs/tools/networking/wifite2/default.nix index 8a4b5f2e0514..4069e378a29b 100644 --- a/nixpkgs/pkgs/tools/networking/wifite2/default.nix +++ b/nixpkgs/pkgs/tools/networking/wifite2/default.nix @@ -1,6 +1,6 @@ { lib, fetchFromGitHub, fetchpatch, python3, wirelesstools , aircrack-ng, wireshark-cli, reaverwps-t6x, cowpatty, hashcat, hcxtools -, hcxdumptool, pyrit, which, bully, pixiewps }: +, hcxdumptool, which, bully, pixiewps }: python3.pkgs.buildPythonApplication rec { version = "2.5.7"; @@ -14,6 +14,11 @@ python3.pkgs.buildPythonApplication rec { }; patches = [ + # Fix issue when missing optional pyrit dependency: https://github.com/kimocoder/wifite2/pull/76 + (fetchpatch { + url = "https://github.com/kimocoder/wifite2/commit/2e5d76c794f2e5493cf5048384d6564727ae2c19.patch"; + sha256 = "0lawk8s1md98g061xg6ma37wqyqc4j2ag0gmf7insf4kvlgg3l9z"; + }) (fetchpatch { url = "https://salsa.debian.org/pkg-security-team/wifite/raw/debian/${version}-1/debian/patches/Disable-aircrack-failing-test.patch"; sha256 = "04qql8w27c1lqk59ghkr1n6r08jwdrb1dcam5k88szkk2bxv8yx1"; @@ -22,6 +27,10 @@ python3.pkgs.buildPythonApplication rec { url = "https://salsa.debian.org/pkg-security-team/wifite/raw/debian/${version}-1/debian/patches/Disable-two-failing-tests.patch"; sha256 = "1sixcqz1kbkhxf38yq55pwycm54adjx22bq46dfnl44mg69nx356"; }) + (fetchpatch { + url = "https://salsa.debian.org/pkg-security-team/wifite/raw/debian/2.5.8-2/debian/patches/fix-for-new-which.patch"; + sha256 = "0p6sa09qpq9qarkjrai2ksx9nz2v2hs6dk1y01qnfbsmc4hhm30g"; + }) ]; propagatedBuildInputs = [ @@ -33,7 +42,6 @@ python3.pkgs.buildPythonApplication rec { hcxtools hcxdumptool wirelesstools - pyrit which bully pixiewps diff --git a/nixpkgs/pkgs/tools/networking/wireguard-go/default.nix b/nixpkgs/pkgs/tools/networking/wireguard-go/default.nix index 3fa487a7dc6d..6f7bc6caa7f0 100644 --- a/nixpkgs/pkgs/tools/networking/wireguard-go/default.nix +++ b/nixpkgs/pkgs/tools/networking/wireguard-go/default.nix @@ -25,6 +25,6 @@ buildGoPackage rec { description = "Userspace Go implementation of WireGuard"; homepage = "https://git.zx2c4.com/wireguard-go/about/"; license = licenses.mit; - maintainers = with maintainers; [ elseym kirelagin yegortimoshenko zx2c4 ]; + maintainers = with maintainers; [ elseym kirelagin yana zx2c4 ]; }; } diff --git a/nixpkgs/pkgs/tools/networking/wireguard-tools/default.nix b/nixpkgs/pkgs/tools/networking/wireguard-tools/default.nix index 5df98954ae16..00b91adc2738 100644 --- a/nixpkgs/pkgs/tools/networking/wireguard-tools/default.nix +++ b/nixpkgs/pkgs/tools/networking/wireguard-tools/default.nix @@ -63,7 +63,7 @@ stdenv.mkDerivation rec { downloadPage = "https://git.zx2c4.com/wireguard-tools/refs/"; homepage = "https://www.wireguard.com/"; license = licenses.gpl2; - maintainers = with maintainers; [ elseym ericsagnes mic92 zx2c4 globin ma27 d-xo ]; + maintainers = with maintainers; [ elseym ericsagnes zx2c4 globin ma27 d-xo ]; platforms = platforms.unix; }; } diff --git a/nixpkgs/pkgs/tools/networking/wormhole-william/default.nix b/nixpkgs/pkgs/tools/networking/wormhole-william/default.nix index 4379aa89ceb5..157119e64750 100644 --- a/nixpkgs/pkgs/tools/networking/wormhole-william/default.nix +++ b/nixpkgs/pkgs/tools/networking/wormhole-william/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "wormhole-william"; - version = "1.0.5"; + version = "1.0.6"; src = fetchFromGitHub { owner = "psanford"; repo = "wormhole-william"; rev = "v${version}"; - sha256 = "sha256-75pSFMzaZW+rtikO0khuxXIgb3Wj8ieSE4sB6quKgo4="; + sha256 = "sha256-L/0zgQkwADElpIzOJAROa3CN/YNl76Af2pAhX8y2Wxs="; }; - vendorSha256 = "sha256-8GZ4h+DFQaCizOCxsMzAllXyaQgzQQBsbCnVi5MWbFg="; + vendorSha256 = "sha256-J6iht3cagcwFekydShgaYJtkNLfEvSDqonkC7+frldM="; doCheck = false; diff --git a/nixpkgs/pkgs/tools/networking/wrk/default.nix b/nixpkgs/pkgs/tools/networking/wrk/default.nix index 4298bd70d600..74280724ca40 100644 --- a/nixpkgs/pkgs/tools/networking/wrk/default.nix +++ b/nixpkgs/pkgs/tools/networking/wrk/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "wrk"; - version = "4.1.0"; + version = "4.2.0"; src = fetchFromGitHub { owner = "wg"; repo = "wrk"; rev = version; - sha256 = "0dblb3qdg8mbgb8iiks0g420pza13npbr33b2xkc5dgv7kcwmvqj"; + sha256 = "sha256-nCfA444p7krXOB3qRtDKWxWj9tsrDZsGf03ThtE1dXM="; }; buildInputs = [ luajit openssl perl ]; diff --git a/nixpkgs/pkgs/tools/networking/xh/default.nix b/nixpkgs/pkgs/tools/networking/xh/default.nix index 75eaa8774df2..ad6d02399efe 100644 --- a/nixpkgs/pkgs/tools/networking/xh/default.nix +++ b/nixpkgs/pkgs/tools/networking/xh/default.nix @@ -1,22 +1,33 @@ -{ stdenv, lib, openssl, pkg-config, rustPlatform, fetchFromGitHub, Security -, libiconv, installShellFiles }: +{ stdenv +, lib +, pkg-config +, rustPlatform +, fetchFromGitHub +, installShellFiles +, withNativeTls ? true +, Security +, libiconv +, openssl }: rustPlatform.buildRustPackage rec { pname = "xh"; - version = "0.13.0"; + version = "0.14.1"; src = fetchFromGitHub { owner = "ducaale"; repo = "xh"; rev = "v${version}"; - sha256 = "sha256-fTd4VSUUj9Im+kCEuFgDsA7eofM1xQfrRzigr1vyJ3I="; + sha256 = "sha256-zq1jpkMcq7WHc6weht2iEFMlxIJSoDreWqJCi8F+Lxs="; }; - cargoSha256 = "sha256-yZdGw/6iVg8PaUyjTrxj6h/2yhBtqEqvMhdRHhMwDZc="; + cargoSha256 = "sha256-NcznWWMcgK4RixqvumPEQUlvIFRyYkbeTTGvjQ91ggE="; + + buildFeatures = lib.optional withNativeTls "native-tls"; nativeBuildInputs = [ installShellFiles pkg-config ]; - buildInputs = if stdenv.isDarwin then [ Security libiconv ] else [ openssl ]; + buildInputs = lib.optionals withNativeTls + (if stdenv.isDarwin then [ Security libiconv ] else [ openssl ]); # Get openssl-sys to use pkg-config OPENSSL_NO_VENDOR = 1; diff --git a/nixpkgs/pkgs/tools/networking/yggdrasil/default.nix b/nixpkgs/pkgs/tools/networking/yggdrasil/default.nix index bb17691cbad4..0284e5117d31 100644 --- a/nixpkgs/pkgs/tools/networking/yggdrasil/default.nix +++ b/nixpkgs/pkgs/tools/networking/yggdrasil/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "yggdrasil"; - version = "0.4.0"; + version = "0.4.2"; src = fetchFromGitHub { owner = "yggdrasil-network"; repo = "yggdrasil-go"; rev = "v${version}"; - sha256 = "sha256-sMcbOTLdmAXp3U2XeNM0hrwOTjzr+9B6IvAaVbjhuFY="; + sha256 = "sha256-5bx9KGZD7m+FX9hWU1pu8uJ2FU+P/TetRS3kJL5jhhI="; }; vendorSha256 = "sha256-QQN8ePOQ7DT9KeuY4ohFuPtocuinh3Y3us6QMnCQ4gc="; @@ -33,6 +33,6 @@ buildGoModule rec { "An experiment in scalable routing as an encrypted IPv6 overlay network"; homepage = "https://yggdrasil-network.github.io/"; license = licenses.lgpl3; - maintainers = with maintainers; [ ehmry gazally lassulus ]; + maintainers = with maintainers; [ bbigras ehmry gazally lassulus ]; }; } diff --git a/nixpkgs/pkgs/tools/networking/yrd/default.nix b/nixpkgs/pkgs/tools/networking/yrd/default.nix index 75a89b859fe8..1aace6aefbb5 100644 --- a/nixpkgs/pkgs/tools/networking/yrd/default.nix +++ b/nixpkgs/pkgs/tools/networking/yrd/default.nix @@ -1,27 +1,37 @@ -{ lib, fetchFromGitHub, pythonPackages }: +{ lib +, python3 +, fetchFromGitHub +}: -let +python3.pkgs.buildPythonApplication rec { pname = "yrd"; version = "0.5.3"; - sha256 = "1yx1hr8z4cvlb3yi24dwafs0nxq41k4q477jc9q24w61a0g662ps"; - -in pythonPackages.buildPythonApplication { - name = "${pname}-${version}"; src = fetchFromGitHub { owner = "kpcyrd"; repo = pname; rev = "v${version}"; - inherit sha256; + sha256 = "1yx1hr8z4cvlb3yi24dwafs0nxq41k4q477jc9q24w61a0g662ps"; }; - propagatedBuildInputs = with pythonPackages; [ argh ]; + propagatedBuildInputs = with python3.pkgs; [ + argh + requests + ]; + + checkInputs = with python3.pkgs; [ + nose + ]; + + checkPhase = '' + nosetests -v yrd + ''; meta = with lib; { description = "Cjdns swiss army knife"; maintainers = with maintainers; [ akru ]; platforms = platforms.linux; - license = licenses.gpl3; + license = licenses.gpl3Only; homepage = "https://github.com/kpcyrd/yrd"; }; } diff --git a/nixpkgs/pkgs/tools/networking/ytcc/default.nix b/nixpkgs/pkgs/tools/networking/ytcc/default.nix index 1c83acc2a186..46b6e649b5c6 100644 --- a/nixpkgs/pkgs/tools/networking/ytcc/default.nix +++ b/nixpkgs/pkgs/tools/networking/ytcc/default.nix @@ -1,24 +1,21 @@ -{ lib, python3Packages, fetchFromGitHub, gettext }: +{ lib, python3Packages, fetchFromGitHub, gettext, installShellFiles }: python3Packages.buildPythonApplication rec { pname = "ytcc"; - version = "2.5.1"; + version = "2.5.4"; src = fetchFromGitHub { owner = "woefe"; repo = "ytcc"; rev = "v${version}"; - sha256 = "1w2frcy51kwsvd486awhpl5kkm11zj1nw3nnv9337316gfs213nw"; + sha256 = "sha256-nYHfmksZnIZGMSSFDhW7ajvv1F5h3aJo8IXw6yYOEw0="; }; - nativeBuildInputs = [ gettext ]; + nativeBuildInputs = [ gettext installShellFiles ]; propagatedBuildInputs = with python3Packages; [ + yt-dlp click - feedparser - lxml - sqlalchemy - youtube-dl wcwidth ]; @@ -38,10 +35,14 @@ python3Packages.buildPythonApplication rec { "test_download" ]; + postInstall = '' + installManPage doc/ytcc.1 + ''; + meta = { description = "Command Line tool to keep track of your favourite YouTube channels without signing up for a Google account"; homepage = "https://github.com/woefe/ytcc"; license = lib.licenses.gpl3Plus; - maintainers = with lib.maintainers; [ marius851000 ]; + maintainers = with lib.maintainers; [ marius851000 marsam ]; }; } diff --git a/nixpkgs/pkgs/tools/networking/zap/default.nix b/nixpkgs/pkgs/tools/networking/zap/default.nix index bccc840a27a4..8fdf8a38f317 100644 --- a/nixpkgs/pkgs/tools/networking/zap/default.nix +++ b/nixpkgs/pkgs/tools/networking/zap/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { pname = "zap"; - version = "2.10.0"; + version = "2.11.1"; src = fetchurl { url = "https://github.com/zaproxy/zaproxy/releases/download/v${version}/ZAP_${version}_Linux.tar.gz"; - sha256 = "1mz9s56pbs62g4pnd1ml8y6jpf9ilisdwwvjv5kn6yxrcdi2zzqh"; + sha256 = "0b1qqrjm4m76djy0az9hnz3rqpz1qkql4faqmi7gkx33b1p6d0sz"; }; buildInputs = [ jre ]; diff --git a/nixpkgs/pkgs/tools/networking/zerotierone/default.nix b/nixpkgs/pkgs/tools/networking/zerotierone/default.nix index f2afb6d3baeb..3062befe2d3b 100644 --- a/nixpkgs/pkgs/tools/networking/zerotierone/default.nix +++ b/nixpkgs/pkgs/tools/networking/zerotierone/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "zerotierone"; - version = "1.6.6"; + version = "1.8.4"; src = fetchFromGitHub { owner = "zerotier"; repo = "ZeroTierOne"; rev = version; - sha256 = "0pi22252c21gxmjcgwmagkrnp5y1hhqrm9jkjj9pg1nlzzrlyrnm"; + sha256 = "sha256-aM0FkcrSd5dEJVdJryIGuyWNFwvKH0SBfOuy4dIMK4A="; }; preConfigure = '' |