libtorrent,rtorrent: 0.15.6 -> 0.16.0; cleanup (#441737)

pkgs/by-name/li/libtorrent-rakshasa/package.nix

@@ -1,30 +1,32 @@
 # 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,
   autoreconfHook,
   cppunit,
+  curl,
+  fetchFromGitHub,
+  lib,
+  nix-update-script,
   openssl,
   pkg-config,
+  stdenv,
   zlib,
-  gitUpdater,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
-  pname = "rakshasa-libtorrent";
-  version = "0.15.6";
+  pname = "libtorrent-rakshasa";
+  version = "0.16.0";
 
   src = fetchFromGitHub {
     owner = "rakshasa";
     repo = "libtorrent";
-    rev = "v${finalAttrs.version}";
-    hash = "sha256-udEe9VyUzPXuCTrB3U3+XCbVWvfTT7xNvJJkLSQrRt4=";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-CtLRZK384IlfXoXLIpdXWa8s9M0n0EopKrJGrK6xq3c=";
   };
 
   nativeBuildInputs = [
     autoreconfHook
+    curl
     pkg-config
   ];
 
@@ -36,13 +38,13 @@ stdenv.mkDerivation (finalAttrs: {
 
   configureFlags = [ "--enable-aligned=yes" ];
 
-  passthru.updateScript = gitUpdater { rev-prefix = "v"; };
+  passthru.updateScript = nix-update-script { };
 
   enableParallelBuilding = true;
 
   meta = {
-    homepage = "https://github.com/rakshasa/libtorrent";
     description = "BitTorrent library written in C++ for *nix, with focus on high performance and good code";
+    homepage = "https://github.com/rakshasa/libtorrent";
     license = lib.licenses.gpl2Plus;
     maintainers = with lib.maintainers; [
       ebzzry

pkgs/by-name/rt/rtorrent/package.nix

@@ -1,32 +1,33 @@
 {
-  lib,
-  stdenv,
   autoreconfHook,
   cppunit,
   curl,
   fetchFromGitHub,
   installShellFiles,
+  lib,
   libtool,
-  libtorrent,
+  libtorrent-rakshasa,
+  lua5_4_compat,
   ncurses,
+  nixosTests,
+  nix-update-script,
   openssl,
   pkg-config,
-  zlib,
-  nixosTests,
-  gitUpdater,
+  stdenv,
+  versionCheckHook,
   withLua ? false,
-  lua5_4_compat,
+  zlib,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
-  pname = "rakshasa-rtorrent";
-  version = "0.15.6";
+  pname = "rtorrent";
+  version = "0.16.0";
 
   src = fetchFromGitHub {
     owner = "rakshasa";
     repo = "rtorrent";
-    rev = "v${finalAttrs.version}";
-    hash = "sha256-B/5m1JXdUpczUMNN4cy5p6YurjmRFxMQHG3cQFSmZSs=";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-+lpivm3MXbuJ4XYhK5OaASpqpDKcCdW7JCFjQYBYCSA=";
   };
 
   outputs = [
@@ -34,10 +35,6 @@ stdenv.mkDerivation (finalAttrs: {
     "man"
   ];
 
-  passthru = {
-    inherit libtorrent;
-  };
-
   nativeBuildInputs = [
     autoreconfHook
     installShellFiles
@@ -48,7 +45,7 @@ stdenv.mkDerivation (finalAttrs: {
     cppunit
     curl
     libtool
-    libtorrent
+    libtorrent-rakshasa
     ncurses
     openssl
     zlib
@@ -61,13 +58,6 @@ stdenv.mkDerivation (finalAttrs: {
   ]
   ++ lib.optionals withLua [ "--with-lua" ];
 
-  passthru = {
-    updateScript = gitUpdater { rev-prefix = "v"; };
-    tests = {
-      inherit (nixosTests) rtorrent;
-    };
-  };
-
   enableParallelBuilding = true;
 
   postInstall = ''
@@ -75,16 +65,26 @@ stdenv.mkDerivation (finalAttrs: {
     install -Dm644 doc/rtorrent.rc-example -t $out/share/doc/rtorrent/rtorrent.rc
   '';
 
+  doInstallCheck = true;
+  nativeInstallCheckInputs = [ versionCheckHook ];
+  versionCheckProgramArg = "-h";
+
+  passthru = {
+    inherit libtorrent-rakshasa;
+    tests = { inherit (nixosTests) rtorrent; };
+    updateScript = nix-update-script { };
+  };
+
   meta = {
-    homepage = "https://rakshasa.github.io/rtorrent/";
     description = "Ncurses client for libtorrent, ideal for use with screen, tmux, or dtach";
+    homepage = "https://rakshasa.github.io/rtorrent/";
     license = lib.licenses.gpl2Plus;
+    mainProgram = "rtorrent";
     maintainers = with lib.maintainers; [
       ebzzry
       codyopel
       thiagokokada
     ];
     platforms = lib.platforms.unix;
-    mainProgram = "rtorrent";
   };
 })

pkgs/top-level/aliases.nix

@@ -1355,6 +1355,7 @@ mapAliases {
   libsoup = lib.warnOnInstantiate "‘libsoup’ has been renamed to ‘libsoup_2_4’" libsoup_2_4; # Added 2024-12-02
   libstdcxx5 = throw "libstdcxx5 is severly outdated and has been removed"; # Added 2024-11-24
   libtensorflow-bin = libtensorflow; # Added 2022-09-25
+  libtorrent = throw "'libtorrent' has been renamed to 'libtorrent-rakshasa' for clearer distinction from 'libtorrent-rasterbar'"; # Added 2025-09-10
   libtorrentRasterbar = throw "'libtorrentRasterbar' has been renamed to/replaced by 'libtorrent-rasterbar'"; # Converted to throw 2024-10-17
   libtorrentRasterbar-1_2_x = throw "'libtorrentRasterbar-1_2_x' has been renamed to/replaced by 'libtorrent-rasterbar-1_2_x'"; # Converted to throw 2024-10-17
   libtorrentRasterbar-2_0_x = throw "'libtorrentRasterbar-2_0_x' has been renamed to/replaced by 'libtorrent-rasterbar-2_0_x'"; # Converted to throw 2024-10-17