From 69e661230508bf2c4b7b8dbb0518de6c951986ce Mon Sep 17 00:00:00 2001 From: Winter Date: Thu, 21 Apr 2022 19:26:44 -0400 Subject: [PATCH 1/4] {jesec-,}rtorrent: don't use package sets --- .../p2p/jesec-rtorrent/default.nix} | 0 .../p2p/jesec-rtorrent/libtorrent.nix | 0 .../p2p/rakshasa-rtorrent/default.nix} | 0 .../p2p/rakshasa-rtorrent/libtorrent.nix | 0 .../networking/p2p/jesec-rtorrent/default.nix | 9 --------- .../p2p/rakshasa-rtorrent/default.nix | 9 --------- pkgs/top-level/all-packages.nix | 20 ++++++------------- 7 files changed, 6 insertions(+), 32 deletions(-) rename pkgs/{tools/networking/p2p/jesec-rtorrent/rtorrent.nix => applications/networking/p2p/jesec-rtorrent/default.nix} (100%) rename pkgs/{tools => applications}/networking/p2p/jesec-rtorrent/libtorrent.nix (100%) rename pkgs/{tools/networking/p2p/rakshasa-rtorrent/rtorrent.nix => applications/networking/p2p/rakshasa-rtorrent/default.nix} (100%) rename pkgs/{tools => applications}/networking/p2p/rakshasa-rtorrent/libtorrent.nix (100%) delete mode 100644 pkgs/tools/networking/p2p/jesec-rtorrent/default.nix delete mode 100644 pkgs/tools/networking/p2p/rakshasa-rtorrent/default.nix diff --git a/pkgs/tools/networking/p2p/jesec-rtorrent/rtorrent.nix b/pkgs/applications/networking/p2p/jesec-rtorrent/default.nix similarity index 100% rename from pkgs/tools/networking/p2p/jesec-rtorrent/rtorrent.nix rename to pkgs/applications/networking/p2p/jesec-rtorrent/default.nix diff --git a/pkgs/tools/networking/p2p/jesec-rtorrent/libtorrent.nix b/pkgs/applications/networking/p2p/jesec-rtorrent/libtorrent.nix similarity index 100% rename from pkgs/tools/networking/p2p/jesec-rtorrent/libtorrent.nix rename to pkgs/applications/networking/p2p/jesec-rtorrent/libtorrent.nix diff --git a/pkgs/tools/networking/p2p/rakshasa-rtorrent/rtorrent.nix b/pkgs/applications/networking/p2p/rakshasa-rtorrent/default.nix similarity index 100% rename from pkgs/tools/networking/p2p/rakshasa-rtorrent/rtorrent.nix rename to pkgs/applications/networking/p2p/rakshasa-rtorrent/default.nix diff --git a/pkgs/tools/networking/p2p/rakshasa-rtorrent/libtorrent.nix b/pkgs/applications/networking/p2p/rakshasa-rtorrent/libtorrent.nix similarity index 100% rename from pkgs/tools/networking/p2p/rakshasa-rtorrent/libtorrent.nix rename to pkgs/applications/networking/p2p/rakshasa-rtorrent/libtorrent.nix 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/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/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 434d94509ab..6d830daecdd 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7926,21 +7926,13 @@ with pkgs; libnids = callPackage ../tools/networking/libnids { }; - rakshasa-rtorrent = recurseIntoAttrs - (callPackage ../tools/networking/p2p/rakshasa-rtorrent { - callPackage = newScope pkgs.rakshasa-rtorrent; - }); + rtorrent = callPackage ../applications/networking/p2p/rakshasa-rtorrent { + libtorrent = callPackage ../applications/networking/p2p/rakshasa-rtorrent/libtorrent.nix { }; + }; - rtorrent = rakshasa-rtorrent.rtorrent; - libtorrent = rakshasa-rtorrent.libtorrent; - - jesec-rtorrent = recurseIntoAttrs - (callPackage ../tools/networking/p2p/jesec-rtorrent { - callPackage = newScope pkgs.jesec-rtorrent; - }); - - rtorrent-jesec = jesec-rtorrent.rtorrent; - libtorrent-jesec = jesec-rtorrent.libtorrent; + jesec-rtorrent = callPackage ../applications/networking/p2p/jesec-rtorrent { + libtorrent = callPackage ../applications/networking/p2p/jesec-rtorrent/libtorrent.nix { }; + }; libmpack = callPackage ../development/libraries/libmpack { }; From 6d5589346b4d21c068d9309fde31cb80880330b9 Mon Sep 17 00:00:00 2001 From: Winter Date: Thu, 21 Apr 2022 19:48:46 -0400 Subject: [PATCH 2/4] jesec-rtorrent: 0.9.8-r15 -> 0.9.8-r16 --- pkgs/applications/networking/p2p/jesec-rtorrent/default.nix | 4 ++-- .../applications/networking/p2p/jesec-rtorrent/libtorrent.nix | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/networking/p2p/jesec-rtorrent/default.nix b/pkgs/applications/networking/p2p/jesec-rtorrent/default.nix index 7fe444228d3..0df07cd5510 100644 --- a/pkgs/applications/networking/p2p/jesec-rtorrent/default.nix +++ b/pkgs/applications/networking/p2p/jesec-rtorrent/default.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation rec { pname = "jesec-rtorrent"; - version = "0.9.8-r15"; + version = "0.9.8-r16"; src = fetchFromGitHub { owner = "jesec"; repo = "rtorrent"; rev = "v${version}"; - hash = "sha256-yYOw8wsiQd478JijLgPtEWsw2/ewd46re+t9D705rmk="; + hash = "sha256-i7c1jSawHshj1kaXl8tdpelIKU24okeg9K5/+ht6t2k="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/networking/p2p/jesec-rtorrent/libtorrent.nix b/pkgs/applications/networking/p2p/jesec-rtorrent/libtorrent.nix index d46e4a15939..fb7515e8671 100644 --- a/pkgs/applications/networking/p2p/jesec-rtorrent/libtorrent.nix +++ b/pkgs/applications/networking/p2p/jesec-rtorrent/libtorrent.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "jesec-libtorrent"; - version = "0.13.8-r3"; + version = "0.13.8-r4"; src = fetchFromGitHub { owner = "jesec"; repo = "libtorrent"; rev = "v${version}"; - hash = "sha256-S3DOKzXkvU+ZJxfrxwLXCVBnepzmiZ+3iiQqz084BEk="; + hash = "sha256-jC/hgGSi2qy+ToZgdxl1PhASLYbUL0O8trX0th2v5H0="; }; nativeBuildInputs = [ From 73ff43b391531565a8542acbdee03693a51d1cc3 Mon Sep 17 00:00:00 2001 From: Winter Date: Thu, 21 Apr 2022 19:49:32 -0400 Subject: [PATCH 3/4] jesec-rtorrent: clean up formatting --- pkgs/applications/networking/p2p/jesec-rtorrent/default.nix | 2 +- pkgs/applications/networking/p2p/jesec-rtorrent/libtorrent.nix | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/networking/p2p/jesec-rtorrent/default.nix b/pkgs/applications/networking/p2p/jesec-rtorrent/default.nix index 0df07cd5510..a760a0f96c3 100644 --- a/pkgs/applications/networking/p2p/jesec-rtorrent/default.nix +++ b/pkgs/applications/networking/p2p/jesec-rtorrent/default.nix @@ -39,8 +39,8 @@ stdenv.mkDerivation rec { ++ lib.optional (!jsonRpcSupport) "-DUSE_JSONRPC=NO" ++ lib.optional (!xmlRpcSupport) "-DUSE_XMLRPC=NO"; - doCheck = true; + checkInputs = [ gtest ]; diff --git a/pkgs/applications/networking/p2p/jesec-rtorrent/libtorrent.nix b/pkgs/applications/networking/p2p/jesec-rtorrent/libtorrent.nix index fb7515e8671..a08eb8f1293 100644 --- a/pkgs/applications/networking/p2p/jesec-rtorrent/libtorrent.nix +++ b/pkgs/applications/networking/p2p/jesec-rtorrent/libtorrent.nix @@ -21,15 +21,18 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; + buildInputs = [ openssl zlib ]; doCheck = true; + preCheck = '' export LD_LIBRARY_PATH=$LD_LIBRARY_PATH''${LD_LIBRARY_PATH:+:}$PWD ''; + checkInputs = [ gtest ]; From b9e02e7495e1bb9d524b6e47aeef005e2da6bcaf Mon Sep 17 00:00:00 2001 From: Winter Date: Thu, 21 Apr 2022 20:37:19 -0400 Subject: [PATCH 4/4] jesec-libtorrent: disable checks --- pkgs/applications/networking/p2p/jesec-rtorrent/libtorrent.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/networking/p2p/jesec-rtorrent/libtorrent.nix b/pkgs/applications/networking/p2p/jesec-rtorrent/libtorrent.nix index a08eb8f1293..ac7e15b6a2e 100644 --- a/pkgs/applications/networking/p2p/jesec-rtorrent/libtorrent.nix +++ b/pkgs/applications/networking/p2p/jesec-rtorrent/libtorrent.nix @@ -27,7 +27,8 @@ stdenv.mkDerivation rec { zlib ]; - doCheck = true; + # Disabled because a test is flaky; see https://github.com/jesec/libtorrent/issues/4. + # doCheck = true; preCheck = '' export LD_LIBRARY_PATH=$LD_LIBRARY_PATH''${LD_LIBRARY_PATH:+:}$PWD