14 files changed, 19 insertions, 262 deletions
diff --git a/pkgs/tools/networking/bore-cli/default.nix b/pkgs/tools/networking/bore-cli/default.nix
index 9d9d99b45fa..370a726caa6 100644
--- a/pkgs/tools/networking/bore-cli/default.nix
+++ b/pkgs/tools/networking/bore-cli/default.nix
@@ -2,16 +2,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "bore-cli";
-  version = "0.2.1";
+  version = "0.2.3";
 
   src = fetchFromGitHub {
     owner = "ekzhang";
     repo = "bore";
     rev = "v${version}";
-    sha256 = "sha256-k1QpNpN6MVt7+PIDFcJtd7yD1ZpBJ9GFBBagVArRifs=";
+    sha256 = "sha256-KSJ5KYXOwjtK1oE9IpsVKb7H4uuKJroCpM1Dk+2XJlY=";
   };
 
-  cargoSha256 = "sha256-fNsMNU4npChqyIeonMSc6AjcBxVYVJhiG++HkQ3FM9M=";
+  cargoSha256 = "sha256-HPMEbHDRmsmcr7Fuhsyr+NkdI9t1sL7q8uzj8sFks0s=";
 
   # tests do not find grcov path correctly
   meta = with lib; {
diff --git a/pkgs/tools/networking/checkip/default.nix b/pkgs/tools/networking/checkip/default.nix
index 7959bdaa83e..1ae0f003602 100644
--- a/pkgs/tools/networking/checkip/default.nix
+++ b/pkgs/tools/networking/checkip/default.nix
@@ -5,13 +5,13 @@
 
 buildGoModule rec {
   pname = "checkip";
-  version = "0.24.5";
+  version = "0.35.2";
 
   src = fetchFromGitHub {
     owner = "jreisinger";
     repo = pname;
     rev = "v${version}";
-    sha256 = "sha256-/sTagdlWU6hU3TTeJcZ8WK4TqmvxgUbC5eLBz2FH6Jo=";
+    sha256 = "sha256-O6jVedVwzC575s7LS0gx1t6mUizQGv4Gcqra57vXX+w=";
   };
 
   vendorSha256 = "sha256-NHu1hZFPT2k8izrvvz7w0vlVe/nKH0nS4oXUGS8CWcc=";
diff --git a/pkgs/tools/networking/clash/default.nix b/pkgs/tools/networking/clash/default.nix
index 844335df223..c73e487904e 100644
--- a/pkgs/tools/networking/clash/default.nix
+++ b/pkgs/tools/networking/clash/default.nix
@@ -1,4 +1,4 @@
-{ lib, fetchFromGitHub, buildGoModule, testVersion, clash }:
+{ lib, fetchFromGitHub, buildGoModule, testers, clash }:
 
 buildGoModule rec {
   pname = "clash";
@@ -26,7 +26,7 @@ buildGoModule rec {
     "-X github.com/Dreamacro/clash/constant.Version=${version}"
   ];
 
-  passthru.tests.version = testVersion {
+  passthru.tests.version = testers.testVersion {
     package = clash;
     command = "clash -v";
   };
diff --git a/pkgs/tools/networking/curlie/default.nix b/pkgs/tools/networking/curlie/default.nix
index fb46ab3fe10..c251e1c149e 100644
--- a/pkgs/tools/networking/curlie/default.nix
+++ b/pkgs/tools/networking/curlie/default.nix
@@ -1,4 +1,4 @@
-{ buildGoModule, fetchFromGitHub, lib, curlie, testVersion }:
+{ buildGoModule, fetchFromGitHub, lib, curlie, testers }:
 
 buildGoModule rec {
   pname = "curlie";
@@ -15,7 +15,7 @@ buildGoModule rec {
 
   ldflags = [ "-s" "-w" "-X main.version=${version}" ];
 
-  passthru.tests.version = testVersion {
+  passthru.tests.version = testers.testVersion {
     package = curlie;
     command = "curlie version";
   };
diff --git a/pkgs/tools/networking/findomain/default.nix b/pkgs/tools/networking/findomain/default.nix
index 6295c4562b0..a1020a319a7 100644
--- a/pkgs/tools/networking/findomain/default.nix
+++ b/pkgs/tools/networking/findomain/default.nix
@@ -10,16 +10,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "findomain";
-  version = "8.0.0";
+  version = "8.1.1";
 
   src = fetchFromGitHub {
     owner = "Edu4rdSHL";
     repo = pname;
     rev = version;
-    sha256 = "sha256-Bk3p8+FkjrF/nLsPRx8daqieV8iewAbcoO2DglFSERg=";
+    sha256 = "sha256-ngT9ZtPsCzcmZbwpmzbEcSUTHPezzdyAB12qrm5Z6n0=";
   };
 
-  cargoSha256 = "sha256-chHr/3yN2PLUQLYqkln12q3+n7tX2IclVGpXBCkPxCQ=";
+  cargoSha256 = "sha256-nHNS1Uskggm5e1paWRSiL4HHcooDbYe0toMwR05OkDQ=";
 
   nativeBuildInputs = [ installShellFiles perl ];
   buildInputs = lib.optionals stdenv.isDarwin [ libiconv Security ];
diff --git a/pkgs/tools/networking/innernet/default.nix b/pkgs/tools/networking/innernet/default.nix
index 68ccdfc3870..6f7669ff6f7 100644
--- a/pkgs/tools/networking/innernet/default.nix
+++ b/pkgs/tools/networking/innernet/default.nix
@@ -8,7 +8,7 @@
 , Security
 , libiconv
 , innernet
-, testVersion
+, testers
 }:
 
 rustPlatform.buildRustPackage rec {
@@ -40,8 +40,8 @@ rustPlatform.buildRustPackage rec {
   '';
 
   passthru.tests = {
-    serverVersion = testVersion { package = innernet; command = "innernet-server --version"; };
-    version = testVersion { package = innernet; command = "innernet --version"; };
+    serverVersion = testers.testVersion { package = innernet; command = "innernet-server --version"; };
+    version = testers.testVersion { package = innernet; command = "innernet --version"; };
   };
 
   meta = with lib; {
diff --git a/pkgs/tools/networking/p2p/jesec-rtorrent/default.nix b/pkgs/tools/networking/p2p/jesec-rtorrent/default.nix
deleted file mode 100644
index 56fec5333fc..00000000000
--- a/pkgs/tools/networking/p2p/jesec-rtorrent/default.nix
+++ /dev/null
@@ -1,9 +0,0 @@
-{ lib
-, pkgs
-, callPackage
-}:
-
-rec {
-  libtorrent = callPackage ./libtorrent.nix { };
-  rtorrent = callPackage ./rtorrent.nix { };
-}
diff --git a/pkgs/tools/networking/p2p/jesec-rtorrent/libtorrent.nix b/pkgs/tools/networking/p2p/jesec-rtorrent/libtorrent.nix
deleted file mode 100644
index d46e4a15939..00000000000
--- a/pkgs/tools/networking/p2p/jesec-rtorrent/libtorrent.nix
+++ /dev/null
@@ -1,44 +0,0 @@
-{ 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/pkgs/tools/networking/p2p/jesec-rtorrent/rtorrent.nix b/pkgs/tools/networking/p2p/jesec-rtorrent/rtorrent.nix
deleted file mode 100644
index 7fe444228d3..00000000000
--- a/pkgs/tools/networking/p2p/jesec-rtorrent/rtorrent.nix
+++ /dev/null
@@ -1,65 +0,0 @@
-{ lib
-, stdenv
-, fetchFromGitHub
-, cmake
-, curl
-, gtest
-, libtorrent
-, ncurses
-, jsonRpcSupport ? true, nlohmann_json
-, xmlRpcSupport ? true, xmlrpc_c
-}:
-
-stdenv.mkDerivation rec {
-  pname = "jesec-rtorrent";
-  version = "0.9.8-r15";
-
-  src = fetchFromGitHub {
-    owner = "jesec";
-    repo = "rtorrent";
-    rev = "v${version}";
-    hash = "sha256-yYOw8wsiQd478JijLgPtEWsw2/ewd46re+t9D705rmk=";
-  };
-
-  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";
-
-
-  doCheck = true;
-  checkInputs = [
-    gtest
-  ];
-
-  prePatch = ''
-    substituteInPlace src/main.cc \
-      --replace "/etc/rtorrent/rtorrent.rc" "${placeholder "out"}/etc/rtorrent/rtorrent.rc"
-  '';
-
-  postFixup = ''
-    mkdir -p $out/etc/rtorrent
-    cp $src/doc/rtorrent.rc $out/etc/rtorrent/rtorrent.rc
-  '';
-
-  meta = with lib; {
-    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; [ winter AndersonTorres ];
-    platforms = platforms.linux;
-  };
-}
diff --git a/pkgs/tools/networking/p2p/rakshasa-rtorrent/default.nix b/pkgs/tools/networking/p2p/rakshasa-rtorrent/default.nix
deleted file mode 100644
index 56fec5333fc..00000000000
--- a/pkgs/tools/networking/p2p/rakshasa-rtorrent/default.nix
+++ /dev/null
@@ -1,9 +0,0 @@
-{ lib
-, pkgs
-, callPackage
-}:
-
-rec {
-  libtorrent = callPackage ./libtorrent.nix { };
-  rtorrent = callPackage ./rtorrent.nix { };
-}
diff --git a/pkgs/tools/networking/p2p/rakshasa-rtorrent/libtorrent.nix b/pkgs/tools/networking/p2p/rakshasa-rtorrent/libtorrent.nix
deleted file mode 100644
index fff4cbb36cf..00000000000
--- a/pkgs/tools/networking/p2p/rakshasa-rtorrent/libtorrent.nix
+++ /dev/null
@@ -1,48 +0,0 @@
-# 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/pkgs/tools/networking/p2p/rakshasa-rtorrent/rtorrent.nix b/pkgs/tools/networking/p2p/rakshasa-rtorrent/rtorrent.nix
deleted file mode 100644
index f166f6d0e29..00000000000
--- a/pkgs/tools/networking/p2p/rakshasa-rtorrent/rtorrent.nix
+++ /dev/null
@@ -1,68 +0,0 @@
-{ 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/pkgs/tools/networking/pmacct/default.nix b/pkgs/tools/networking/pmacct/default.nix
index 32b800521e1..aa699d5bcad 100644
--- a/pkgs/tools/networking/pmacct/default.nix
+++ b/pkgs/tools/networking/pmacct/default.nix
@@ -13,7 +13,7 @@
 , withPgSQL ? true, postgresql
 , withMysql ? true, libmysqlclient, zlib, numactl
 , gnutlsSupport ? false, gnutls
-, testVersion
+, testers
 , pmacct
 }:
 
@@ -55,7 +55,7 @@ stdenv.mkDerivation rec {
   ++ lib.optional gnutlsSupport "--enable-gnutls";
 
   passthru.tests = {
-    version = testVersion { package = pmacct; command = "pmacct -V"; };
+    version = testers.testVersion { package = pmacct; command = "pmacct -V"; };
   };
 
   meta = with lib; {
diff --git a/pkgs/tools/networking/smartdns/default.nix b/pkgs/tools/networking/smartdns/default.nix
index 399aeefd9c3..9763d52d0b1 100644
--- a/pkgs/tools/networking/smartdns/default.nix
+++ b/pkgs/tools/networking/smartdns/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitHub, openssl, testVersion, smartdns }:
+{ lib, stdenv, fetchFromGitHub, openssl, testers, smartdns }:
 
 stdenv.mkDerivation rec {
   pname = "smartdns";
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
   installFlags = [ "SYSCONFDIR=${placeholder "out"}/etc" ];
 
   passthru.tests = {
-    version = testVersion { package = smartdns; };
+    version = testers.testVersion { package = smartdns; };
   };
 
   meta = with lib; {