From c85eb67ec10d2a84fdbb24ee6dd3dbc833201df8 Mon Sep 17 00:00:00 2001 From: Thiago Kenji Okada Date: Tue, 25 Jun 2024 11:31:52 -0300 Subject: [PATCH 01/11] libtorrent: move to pkgs/by-name --- .../libtorrent.nix => by-name/li/libtorrent/package.nix} | 0 pkgs/top-level/all-packages.nix | 4 +--- 2 files changed, 1 insertion(+), 3 deletions(-) rename pkgs/{applications/networking/p2p/rakshasa-rtorrent/libtorrent.nix => by-name/li/libtorrent/package.nix} (100%) diff --git a/pkgs/applications/networking/p2p/rakshasa-rtorrent/libtorrent.nix b/pkgs/by-name/li/libtorrent/package.nix similarity index 100% rename from pkgs/applications/networking/p2p/rakshasa-rtorrent/libtorrent.nix rename to pkgs/by-name/li/libtorrent/package.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 42d96042bfeb..15392b74df88 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10210,9 +10210,7 @@ with pkgs; libnids = callPackage ../tools/networking/libnids { }; - rtorrent = callPackage ../applications/networking/p2p/rakshasa-rtorrent { - libtorrent = callPackage ../applications/networking/p2p/rakshasa-rtorrent/libtorrent.nix { }; - }; + rtorrent = callPackage ../applications/networking/p2p/rakshasa-rtorrent { }; jesec-rtorrent = callPackage ../applications/networking/p2p/jesec-rtorrent { libtorrent = callPackage ../applications/networking/p2p/jesec-rtorrent/libtorrent.nix { }; From 92f373e4a3a7ad27d43d6836d2f6bb6192217c3c Mon Sep 17 00:00:00 2001 From: Thiago Kenji Okada Date: Tue, 25 Jun 2024 11:33:40 -0300 Subject: [PATCH 02/11] libtorrent: add updateScript --- pkgs/by-name/li/libtorrent/package.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/by-name/li/libtorrent/package.nix b/pkgs/by-name/li/libtorrent/package.nix index 7217026dc805..40b3ba71dde0 100644 --- a/pkgs/by-name/li/libtorrent/package.nix +++ b/pkgs/by-name/li/libtorrent/package.nix @@ -10,6 +10,7 @@ , openssl , pkg-config , zlib +, unstableGitUpdater }: stdenv.mkDerivation rec { @@ -36,6 +37,8 @@ stdenv.mkDerivation rec { zlib ]; + passthru.updateScript = unstableGitUpdater { tagPrefix = "v"; }; + enableParallelBuilding = true; meta = with lib; { From 5bcb428248d5235547141bc1e3da1a5c000b98bf Mon Sep 17 00:00:00 2001 From: Thiago Kenji Okada Date: Tue, 25 Jun 2024 11:34:06 -0300 Subject: [PATCH 03/11] libtorrent: 0.13.8+date=2021-08-07 -> unstable-2023-03-16 --- pkgs/by-name/li/libtorrent/package.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/li/libtorrent/package.nix b/pkgs/by-name/li/libtorrent/package.nix index 40b3ba71dde0..3f4c664baaa3 100644 --- a/pkgs/by-name/li/libtorrent/package.nix +++ b/pkgs/by-name/li/libtorrent/package.nix @@ -13,15 +13,15 @@ , unstableGitUpdater }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "rakshasa-libtorrent"; - version = "0.13.8+date=2021-08-07"; + version = "0.13.8-unstable-2023-03-16"; src = fetchFromGitHub { owner = "rakshasa"; repo = "libtorrent"; - rev = "53596afc5fae275b3fb5753a4bb2a1a7f7cf6a51"; - hash = "sha256-gyl/jfbptHz/gHkkVGWShhv1Z7o9fa9nJIz27U2A6wg="; + rev = "91f8cf4b0358d9b4480079ca7798fa7d9aec76b5"; + hash = "sha256-mEIrMwpWMCAA70Qb/UIOg8XTfg71R/2F4kb3QG38duU="; }; nativeBuildInputs = [ From 694f564459d4bd24642d079991dd0aa0acce357f Mon Sep 17 00:00:00 2001 From: Thiago Kenji Okada Date: Tue, 25 Jun 2024 11:34:42 -0300 Subject: [PATCH 04/11] libtorrent: add thiagokokada as maintainer --- pkgs/by-name/li/libtorrent/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/li/libtorrent/package.nix b/pkgs/by-name/li/libtorrent/package.nix index 3f4c664baaa3..0d640fbfe803 100644 --- a/pkgs/by-name/li/libtorrent/package.nix +++ b/pkgs/by-name/li/libtorrent/package.nix @@ -45,7 +45,7 @@ stdenv.mkDerivation { homepage = "https://github.com/rakshasa/libtorrent"; description = "BitTorrent library written in C++ for *nix, with focus on high performance and good code"; license = licenses.gpl2Plus; - maintainers = with maintainers; [ ebzzry codyopel ]; + maintainers = with maintainers; [ ebzzry codyopel thiagokokada ]; platforms = platforms.unix; }; } From f0741a3b94823c06aa1fd08a522dbacc5d7466d6 Mon Sep 17 00:00:00 2001 From: Thiago Kenji Okada Date: Tue, 25 Jun 2024 11:10:40 -0300 Subject: [PATCH 05/11] rtorrent: add updateScript --- .../networking/p2p/rakshasa-rtorrent/default.nix | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/p2p/rakshasa-rtorrent/default.nix b/pkgs/applications/networking/p2p/rakshasa-rtorrent/default.nix index 52ef3f735001..81c9d7abb197 100644 --- a/pkgs/applications/networking/p2p/rakshasa-rtorrent/default.nix +++ b/pkgs/applications/networking/p2p/rakshasa-rtorrent/default.nix @@ -14,6 +14,7 @@ , xmlrpc_c , zlib , nixosTests +, unstableGitUpdater }: stdenv.mkDerivation { @@ -54,8 +55,11 @@ stdenv.mkDerivation { "--with-posix-fallocate" ]; - passthru.tests = { - inherit (nixosTests) rtorrent; + passthru = { + updateScript = unstableGitUpdater { tagPrefix = "v"; }; + tests = { + inherit (nixosTests) rtorrent; + }; }; enableParallelBuilding = true; From 0937f85d8f8206e9a4173cfb899214734f3ec34a Mon Sep 17 00:00:00 2001 From: Thiago Kenji Okada Date: Tue, 25 Jun 2024 11:10:54 -0300 Subject: [PATCH 06/11] rtorrent: 0.9.8+date=2022-06-20 -> 0.9.8-unstable-2023-03-16 --- .../networking/p2p/rakshasa-rtorrent/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/p2p/rakshasa-rtorrent/default.nix b/pkgs/applications/networking/p2p/rakshasa-rtorrent/default.nix index 81c9d7abb197..da15557b9ec1 100644 --- a/pkgs/applications/networking/p2p/rakshasa-rtorrent/default.nix +++ b/pkgs/applications/networking/p2p/rakshasa-rtorrent/default.nix @@ -19,13 +19,13 @@ stdenv.mkDerivation { pname = "rakshasa-rtorrent"; - version = "0.9.8+date=2022-06-20"; + version = "0.9.8-unstable-2023-03-16"; src = fetchFromGitHub { owner = "rakshasa"; repo = "rtorrent"; - rev = "92bec88d0904bfb31c808085c2fd0f22d0ec8db7"; - hash = "sha256-er7UdIb+flhq0ye76UmomgfHV2ZSBROpXmfrNDHwTWw="; + rev = "1da0e3476dcabbf74b2e836d6b4c37b4d96bde09"; + hash = "sha256-OXOZSMuNAU+VGwNyyfzcmkTRjDJq9HsKUNxZDYpSvFQ="; }; passthru = { From 88dd45844f5bf582050e2e3ce007729c964b9396 Mon Sep 17 00:00:00 2001 From: Thiago Kenji Okada Date: Tue, 25 Jun 2024 11:11:40 -0300 Subject: [PATCH 07/11] rtorrent: add thiagokokada as maintainer --- pkgs/applications/networking/p2p/rakshasa-rtorrent/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/networking/p2p/rakshasa-rtorrent/default.nix b/pkgs/applications/networking/p2p/rakshasa-rtorrent/default.nix index da15557b9ec1..f55c989eee6d 100644 --- a/pkgs/applications/networking/p2p/rakshasa-rtorrent/default.nix +++ b/pkgs/applications/networking/p2p/rakshasa-rtorrent/default.nix @@ -74,7 +74,7 @@ stdenv.mkDerivation { homepage = "https://rakshasa.github.io/rtorrent/"; description = "Ncurses client for libtorrent, ideal for use with screen, tmux, or dtach"; license = licenses.gpl2Plus; - maintainers = with maintainers; [ ebzzry codyopel ]; + maintainers = with maintainers; [ ebzzry codyopel thiagokokada ]; platforms = platforms.unix; mainProgram = "rtorrent"; }; From 2293f663f8fc74f6b2f4b1807e69cd3c3e93e2ff Mon Sep 17 00:00:00 2001 From: Thiago Kenji Okada Date: Tue, 25 Jun 2024 11:36:35 -0300 Subject: [PATCH 08/11] rtorrent: move to pkgs/by-name --- .../default.nix => by-name/rt/rtorrent/package.nix} | 0 pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 2 deletions(-) rename pkgs/{applications/networking/p2p/rakshasa-rtorrent/default.nix => by-name/rt/rtorrent/package.nix} (100%) diff --git a/pkgs/applications/networking/p2p/rakshasa-rtorrent/default.nix b/pkgs/by-name/rt/rtorrent/package.nix similarity index 100% rename from pkgs/applications/networking/p2p/rakshasa-rtorrent/default.nix rename to pkgs/by-name/rt/rtorrent/package.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 15392b74df88..9e4517c9247c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10210,8 +10210,6 @@ with pkgs; libnids = callPackage ../tools/networking/libnids { }; - rtorrent = callPackage ../applications/networking/p2p/rakshasa-rtorrent { }; - jesec-rtorrent = callPackage ../applications/networking/p2p/jesec-rtorrent { libtorrent = callPackage ../applications/networking/p2p/jesec-rtorrent/libtorrent.nix { }; }; From 273ed5610c9effcad8a841d28a6c140f82a00122 Mon Sep 17 00:00:00 2001 From: Thiago Kenji Okada Date: Tue, 25 Jun 2024 16:17:25 -0300 Subject: [PATCH 09/11] rtorrent: remove nested usage of with --- pkgs/by-name/rt/rtorrent/package.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/rt/rtorrent/package.nix b/pkgs/by-name/rt/rtorrent/package.nix index f55c989eee6d..86844faa293d 100644 --- a/pkgs/by-name/rt/rtorrent/package.nix +++ b/pkgs/by-name/rt/rtorrent/package.nix @@ -70,12 +70,12 @@ stdenv.mkDerivation { mv doc/rtorrent.rc $out/share/doc/rtorrent/rtorrent.rc ''; - meta = with lib; { + meta = { homepage = "https://rakshasa.github.io/rtorrent/"; description = "Ncurses client for libtorrent, ideal for use with screen, tmux, or dtach"; - license = licenses.gpl2Plus; - maintainers = with maintainers; [ ebzzry codyopel thiagokokada ]; - platforms = platforms.unix; + license = lib.licenses.gpl2Plus; + maintainers = with lib.maintainers; [ ebzzry codyopel thiagokokada ]; + platforms = lib.platforms.unix; mainProgram = "rtorrent"; }; } From a8a382d77c890e58fffccc61d538f5b38499b16f Mon Sep 17 00:00:00 2001 From: Thiago Kenji Okada Date: Tue, 25 Jun 2024 16:18:06 -0300 Subject: [PATCH 10/11] libtorrent: remove nested usage of with --- pkgs/by-name/li/libtorrent/package.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/li/libtorrent/package.nix b/pkgs/by-name/li/libtorrent/package.nix index 0d640fbfe803..04de15c9674d 100644 --- a/pkgs/by-name/li/libtorrent/package.nix +++ b/pkgs/by-name/li/libtorrent/package.nix @@ -41,11 +41,11 @@ stdenv.mkDerivation { enableParallelBuilding = true; - meta = with lib; { + meta = { homepage = "https://github.com/rakshasa/libtorrent"; description = "BitTorrent library written in C++ for *nix, with focus on high performance and good code"; - license = licenses.gpl2Plus; - maintainers = with maintainers; [ ebzzry codyopel thiagokokada ]; - platforms = platforms.unix; + license = lib.licenses.gpl2Plus; + maintainers = with lib.maintainers; [ ebzzry codyopel thiagokokada ]; + platforms = lib.platforms.unix; }; } From ba42623fd59c6845967323bafb0514c769a62d73 Mon Sep 17 00:00:00 2001 From: Thiago Kenji Okada Date: Wed, 26 Jun 2024 11:06:04 -0300 Subject: [PATCH 11/11] rtorrent: use multiple outputs, update documentation --- pkgs/by-name/rt/rtorrent/package.nix | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/pkgs/by-name/rt/rtorrent/package.nix b/pkgs/by-name/rt/rtorrent/package.nix index 86844faa293d..c7a74aecf660 100644 --- a/pkgs/by-name/rt/rtorrent/package.nix +++ b/pkgs/by-name/rt/rtorrent/package.nix @@ -1,10 +1,11 @@ { lib , stdenv -, fetchFromGitHub -, autoreconfHook , autoconf-archive +, autoreconfHook , cppunit , curl +, fetchFromGitHub +, installShellFiles , libsigcxx , libtool , libtorrent @@ -28,6 +29,8 @@ stdenv.mkDerivation { hash = "sha256-OXOZSMuNAU+VGwNyyfzcmkTRjDJq9HsKUNxZDYpSvFQ="; }; + outputs = [ "out" "man" ]; + passthru = { inherit libtorrent; }; @@ -35,6 +38,7 @@ stdenv.mkDerivation { nativeBuildInputs = [ autoconf-archive autoreconfHook + installShellFiles pkg-config ]; @@ -65,9 +69,8 @@ stdenv.mkDerivation { 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 + installManPage doc/old/rtorrent.1 + install -Dm644 doc/rtorrent.rc-example -t $out/share/doc/rtorrent/rtorrent.rc ''; meta = {