From d65016f5a492efbefb00d8f7dd834d6bbfbe1370 Mon Sep 17 00:00:00 2001 From: Thiago Kenji Okada Date: Tue, 31 Mar 2026 20:41:40 +0100 Subject: [PATCH] rtorrent: make updateScript update both this package and libtorrent-rakshasa It is common for newer versions of rtorrent to depend in newer versions of libtorrent-rakshasa to be built. So updating them separately sometimes works, sometimes it doesn't and need some intervention until someone goes and updates both. Using _experimental-update-script-combinators to update both packages at the same time should avoid this issue in future. --- pkgs/by-name/li/libtorrent-rakshasa/package.nix | 3 --- pkgs/by-name/rt/rtorrent/package.nix | 8 ++++++-- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/pkgs/by-name/li/libtorrent-rakshasa/package.nix b/pkgs/by-name/li/libtorrent-rakshasa/package.nix index 188057403354..12e647f35c8a 100644 --- a/pkgs/by-name/li/libtorrent-rakshasa/package.nix +++ b/pkgs/by-name/li/libtorrent-rakshasa/package.nix @@ -6,7 +6,6 @@ curl, fetchFromGitHub, lib, - nix-update-script, openssl, pkg-config, stdenv, @@ -38,8 +37,6 @@ stdenv.mkDerivation (finalAttrs: { configureFlags = [ "--enable-aligned=yes" ]; - passthru.updateScript = nix-update-script { }; - enableParallelBuilding = true; meta = { diff --git a/pkgs/by-name/rt/rtorrent/package.nix b/pkgs/by-name/rt/rtorrent/package.nix index 64d4ad957caf..142797ada3da 100644 --- a/pkgs/by-name/rt/rtorrent/package.nix +++ b/pkgs/by-name/rt/rtorrent/package.nix @@ -1,4 +1,5 @@ { + _experimental-update-script-combinators, autoreconfHook, cppunit, curl, @@ -9,8 +10,8 @@ libtorrent-rakshasa, lua5_4_compat, ncurses, - nixosTests, nix-update-script, + nixosTests, openssl, pkg-config, stdenv, @@ -72,7 +73,10 @@ stdenv.mkDerivation (finalAttrs: { passthru = { inherit libtorrent-rakshasa; tests = { inherit (nixosTests) rtorrent; }; - updateScript = nix-update-script { }; + updateScript = _experimental-update-script-combinators.sequence [ + (nix-update-script { attrPath = "libtorrent-rakshasa"; }) + (nix-update-script { }) + ]; }; meta = {