From deb6a85d2549d1047539d239d1be8d41fe649339 Mon Sep 17 00:00:00 2001 From: Saterfield990 <> Date: Wed, 10 Sep 2025 11:12:36 +0300 Subject: [PATCH 1/5] libtorrent: 0.15.6 -> 0.16.0 --- pkgs/by-name/li/libtorrent/package.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/li/libtorrent/package.nix b/pkgs/by-name/li/libtorrent/package.nix index 6220a50b0082..e6e3dcb89924 100644 --- a/pkgs/by-name/li/libtorrent/package.nix +++ b/pkgs/by-name/li/libtorrent/package.nix @@ -1,6 +1,7 @@ # Note: this is rakshasa's version of libtorrent, used mainly by rtorrent. # *Do not* mistake it by libtorrent-rasterbar, used by Deluge, qbitttorent etc. { + curl, lib, stdenv, fetchFromGitHub, @@ -14,17 +15,18 @@ stdenv.mkDerivation (finalAttrs: { pname = "rakshasa-libtorrent"; - version = "0.15.6"; + version = "0.16.0"; src = fetchFromGitHub { owner = "rakshasa"; repo = "libtorrent"; rev = "v${finalAttrs.version}"; - hash = "sha256-udEe9VyUzPXuCTrB3U3+XCbVWvfTT7xNvJJkLSQrRt4="; + hash = "sha256-CtLRZK384IlfXoXLIpdXWa8s9M0n0EopKrJGrK6xq3c="; }; nativeBuildInputs = [ autoreconfHook + curl pkg-config ]; From 977c627d78ee5d15ea161677a1500da1dbdc8587 Mon Sep 17 00:00:00 2001 From: Saterfield990 <> Date: Wed, 10 Sep 2025 11:15:59 +0300 Subject: [PATCH 2/5] libtorrent: rename to libtorrent-rakshasa for clearer distinction from libtorrent-rasterbar --- pkgs/by-name/li/{libtorrent => libtorrent-rakshasa}/package.nix | 2 +- pkgs/top-level/aliases.nix | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) rename pkgs/by-name/li/{libtorrent => libtorrent-rakshasa}/package.nix (97%) diff --git a/pkgs/by-name/li/libtorrent/package.nix b/pkgs/by-name/li/libtorrent-rakshasa/package.nix similarity index 97% rename from pkgs/by-name/li/libtorrent/package.nix rename to pkgs/by-name/li/libtorrent-rakshasa/package.nix index e6e3dcb89924..a30747ce9f0e 100644 --- a/pkgs/by-name/li/libtorrent/package.nix +++ b/pkgs/by-name/li/libtorrent-rakshasa/package.nix @@ -14,7 +14,7 @@ }: stdenv.mkDerivation (finalAttrs: { - pname = "rakshasa-libtorrent"; + pname = "libtorrent-rakshasa"; version = "0.16.0"; src = fetchFromGitHub { diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index d9387656098c..5d2bd869f819 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -1354,6 +1354,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 From 854127d08413940948e1d071b9f17772f0d934c7 Mon Sep 17 00:00:00 2001 From: Saterfield990 <> Date: Wed, 10 Sep 2025 11:20:53 +0300 Subject: [PATCH 3/5] libtorrent-rakshasa: cleanup --- pkgs/by-name/li/libtorrent-rakshasa/package.nix | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/pkgs/by-name/li/libtorrent-rakshasa/package.nix b/pkgs/by-name/li/libtorrent-rakshasa/package.nix index a30747ce9f0e..9ac72e30088e 100644 --- a/pkgs/by-name/li/libtorrent-rakshasa/package.nix +++ b/pkgs/by-name/li/libtorrent-rakshasa/package.nix @@ -1,16 +1,16 @@ # Note: this is rakshasa's version of libtorrent, used mainly by rtorrent. # *Do not* mistake it by libtorrent-rasterbar, used by Deluge, qbitttorent etc. { - curl, - lib, - stdenv, - fetchFromGitHub, autoreconfHook, cppunit, + curl, + fetchFromGitHub, + lib, + nix-update-script, openssl, pkg-config, + stdenv, zlib, - gitUpdater, }: stdenv.mkDerivation (finalAttrs: { @@ -20,7 +20,7 @@ stdenv.mkDerivation (finalAttrs: { src = fetchFromGitHub { owner = "rakshasa"; repo = "libtorrent"; - rev = "v${finalAttrs.version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-CtLRZK384IlfXoXLIpdXWa8s9M0n0EopKrJGrK6xq3c="; }; @@ -38,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 From 300d2405b032f6ded8c1114d28181dbc008a1e8c Mon Sep 17 00:00:00 2001 From: Saterfield990 <> Date: Wed, 10 Sep 2025 11:40:41 +0300 Subject: [PATCH 4/5] rtorrent: 0.15.6 -> 0.16.0 --- pkgs/by-name/rt/rtorrent/package.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/by-name/rt/rtorrent/package.nix b/pkgs/by-name/rt/rtorrent/package.nix index c4e8959394e2..b460ce6699b2 100644 --- a/pkgs/by-name/rt/rtorrent/package.nix +++ b/pkgs/by-name/rt/rtorrent/package.nix @@ -7,7 +7,7 @@ fetchFromGitHub, installShellFiles, libtool, - libtorrent, + libtorrent-rakshasa, ncurses, openssl, pkg-config, @@ -19,14 +19,14 @@ }: 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="; + hash = "sha256-+lpivm3MXbuJ4XYhK5OaASpqpDKcCdW7JCFjQYBYCSA="; }; outputs = [ @@ -35,7 +35,7 @@ stdenv.mkDerivation (finalAttrs: { ]; passthru = { - inherit libtorrent; + inherit libtorrent-rakshasa; }; nativeBuildInputs = [ @@ -48,7 +48,7 @@ stdenv.mkDerivation (finalAttrs: { cppunit curl libtool - libtorrent + libtorrent-rakshasa ncurses openssl zlib From 379ca64b868c7a4b2db4c91b3c341831f4ae2c7e Mon Sep 17 00:00:00 2001 From: Saterfield990 <> Date: Wed, 10 Sep 2025 13:11:14 +0300 Subject: [PATCH 5/5] rtorrent: cleanup --- pkgs/by-name/rt/rtorrent/package.nix | 40 ++++++++++++++-------------- 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/pkgs/by-name/rt/rtorrent/package.nix b/pkgs/by-name/rt/rtorrent/package.nix index b460ce6699b2..cb0f536e6d41 100644 --- a/pkgs/by-name/rt/rtorrent/package.nix +++ b/pkgs/by-name/rt/rtorrent/package.nix @@ -1,21 +1,22 @@ { - lib, - stdenv, autoreconfHook, cppunit, curl, fetchFromGitHub, installShellFiles, + lib, libtool, 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: { @@ -25,7 +26,7 @@ stdenv.mkDerivation (finalAttrs: { src = fetchFromGitHub { owner = "rakshasa"; repo = "rtorrent"; - rev = "v${finalAttrs.version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-+lpivm3MXbuJ4XYhK5OaASpqpDKcCdW7JCFjQYBYCSA="; }; @@ -34,10 +35,6 @@ stdenv.mkDerivation (finalAttrs: { "man" ]; - passthru = { - inherit libtorrent-rakshasa; - }; - nativeBuildInputs = [ autoreconfHook installShellFiles @@ -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"; }; })