diff options
Diffstat (limited to 'pkgs/applications/networking/p2p')
15 files changed, 69 insertions, 25 deletions
diff --git a/pkgs/applications/networking/p2p/eiskaltdcpp/default.nix b/pkgs/applications/networking/p2p/eiskaltdcpp/default.nix index f86eefe668f9f..5386c6636add0 100644 --- a/pkgs/applications/networking/p2p/eiskaltdcpp/default.nix +++ b/pkgs/applications/networking/p2p/eiskaltdcpp/default.nix @@ -44,7 +44,7 @@ mkDerivation rec { ''; meta = with lib; { - description = "A cross-platform program that uses the Direct Connect and ADC protocols"; + description = "Cross-platform program that uses the Direct Connect and ADC protocols"; homepage = "https://github.com/eiskaltdcpp/eiskaltdcpp"; license = licenses.gpl3Plus; platforms = platforms.linux; diff --git a/pkgs/applications/networking/p2p/flood-for-transmission/default.nix b/pkgs/applications/networking/p2p/flood-for-transmission/default.nix index c4017bc61bdbd..c3f4c5406a55b 100644 --- a/pkgs/applications/networking/p2p/flood-for-transmission/default.nix +++ b/pkgs/applications/networking/p2p/flood-for-transmission/default.nix @@ -26,7 +26,7 @@ buildNpmPackage rec { ''; meta = with lib; { - description = "A Flood clone for Transmission"; + description = "Flood clone for Transmission"; homepage = "https://github.com/johman10/flood-for-transmission"; maintainers = with maintainers; [ al3xtjames ]; license = licenses.gpl3Only; diff --git a/pkgs/applications/networking/p2p/gnunet/default.nix b/pkgs/applications/networking/p2p/gnunet/default.nix index 3f5e2f7c58a23..43f0b97c9ff08 100644 --- a/pkgs/applications/networking/p2p/gnunet/default.nix +++ b/pkgs/applications/networking/p2p/gnunet/default.nix @@ -7,11 +7,11 @@ stdenv.mkDerivation rec { pname = "gnunet"; - version = "0.21.1"; + version = "0.21.2"; src = fetchurl { url = "mirror://gnu/gnunet/gnunet-${version}.tar.gz"; - hash = "sha256-k+aLPqynCHJz49doX+auOLLoBV5MnnANNg3UBVJJeFw="; + hash = "sha256-jCNRJo6bi6KtKIuLM3zjmfecGOP/2WCAP07V3n3an6E="; }; enableParallelBuilding = true; diff --git a/pkgs/applications/networking/p2p/jesec-rtorrent/default.nix b/pkgs/applications/networking/p2p/jesec-rtorrent/default.nix index 94c1994bd0809..6308235998cfe 100644 --- a/pkgs/applications/networking/p2p/jesec-rtorrent/default.nix +++ b/pkgs/applications/networking/p2p/jesec-rtorrent/default.nix @@ -64,7 +64,7 @@ stdenv.mkDerivation rec { ''; meta = with lib; { - description = "An ncurses client for libtorrent, ideal for use with screen, tmux, or dtach (jesec's fork)"; + description = "Ncurses client for libtorrent, ideal for use with screen, tmux, or dtach (jesec's fork)"; homepage = "https://github.com/jesec/rtorrent"; license = licenses.gpl2Plus; maintainers = with maintainers; [ winter AndersonTorres ]; diff --git a/pkgs/applications/networking/p2p/jesec-rtorrent/libtorrent.nix b/pkgs/applications/networking/p2p/jesec-rtorrent/libtorrent.nix index 7acfee3671dac..6329ce94d5b18 100644 --- a/pkgs/applications/networking/p2p/jesec-rtorrent/libtorrent.nix +++ b/pkgs/applications/networking/p2p/jesec-rtorrent/libtorrent.nix @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://github.com/jesec/libtorrent"; - description = "A BitTorrent library written in C++ for *nix, with focus on high performance and good code (jesec's fork)"; + description = "BitTorrent library written in C++ for *nix, with focus on high performance and good code (jesec's fork)"; license = licenses.gpl2Plus; maintainers = with maintainers; [ winter AndersonTorres ]; platforms = platforms.linux; diff --git a/pkgs/applications/networking/p2p/magnetico/default.nix b/pkgs/applications/networking/p2p/magnetico/default.nix index 6c09ae892e27a..f3579c494ba80 100644 --- a/pkgs/applications/networking/p2p/magnetico/default.nix +++ b/pkgs/applications/networking/p2p/magnetico/default.nix @@ -1,10 +1,12 @@ { lib , fetchFromGitHub +, fetchpatch , nixosTests , buildGoModule +, sqlite }: -buildGoModule rec { +buildGoModule { pname = "magnetico"; version = "unstable-2022-08-10"; @@ -12,10 +14,20 @@ buildGoModule rec { owner = "ireun"; repo = "magnetico"; rev = "828e230d3b3c0759d3274e27f5a7b70400f4d6ea"; - sha256 = "sha256-V1pBzillWTk9iuHAhFztxYaq4uLL3U3HYvedGk6ffbk="; + hash = "sha256-V1pBzillWTk9iuHAhFztxYaq4uLL3U3HYvedGk6ffbk="; }; - vendorHash = "sha256-ngYkTtBEZSyYYnfBHi0VrotwKGvMOiowbrwigJnjsuU="; + patches = [ + # https://github.com/ireun/magnetico/pull/15 + (fetchpatch { + url = "https://github.com/ireun/magnetico/commit/90db34991aa44af9b79ab4710c638607c6211c1c.patch"; + hash = "sha256-wC9lVQqfngQ5AaRgb4TtoWSgbQ2iSHeQ2UBDUyWjMK8="; + }) + ]; + + vendorHash = "sha256-JDrBXjnQAcWp8gKvnm+q1F5oV+FozKUvhHK/Me/Cyj8="; + + buildInputs = [ sqlite ]; buildPhase = '' runHook preBuild @@ -26,18 +38,16 @@ buildGoModule rec { ''; checkPhase = '' - runHook preBuild + runHook preCheck make test - runHook postBuild + runHook postCheck ''; passthru.tests = { inherit (nixosTests) magnetico; }; meta = with lib; { - # Build fails with Go >=1.21, couldn't be fixed by updating module dependencies. - broken = true; description = "Autonomous (self-hosted) BitTorrent DHT search engine suite"; homepage = "https://github.com/ireun/magnetico"; license = licenses.agpl3Only; diff --git a/pkgs/applications/networking/p2p/pyrosimple/default.nix b/pkgs/applications/networking/p2p/pyrosimple/default.nix index 866727ba4349e..c08f6ae4b64b1 100644 --- a/pkgs/applications/networking/p2p/pyrosimple/default.nix +++ b/pkgs/applications/networking/p2p/pyrosimple/default.nix @@ -60,7 +60,7 @@ python3.pkgs.buildPythonApplication rec { }; meta = with lib; { - description = "A rTorrent client"; + description = "RTorrent client"; homepage = "https://kannibalox.github.io/pyrosimple/"; changelog = "https://github.com/kannibalox/pyrosimple/blob/v${version}/CHANGELOG.md"; license = licenses.gpl3Plus; diff --git a/pkgs/applications/networking/p2p/rakshasa-rtorrent/default.nix b/pkgs/applications/networking/p2p/rakshasa-rtorrent/default.nix index 994c5a4b11d49..bc3989f1ee67c 100644 --- a/pkgs/applications/networking/p2p/rakshasa-rtorrent/default.nix +++ b/pkgs/applications/networking/p2p/rakshasa-rtorrent/default.nix @@ -63,7 +63,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://rakshasa.github.io/rtorrent/"; - description = "An ncurses client for libtorrent, ideal for use with screen, tmux, or dtach"; + description = "Ncurses client for libtorrent, ideal for use with screen, tmux, or dtach"; license = licenses.gpl2Plus; maintainers = with maintainers; [ ebzzry codyopel ]; platforms = platforms.unix; diff --git a/pkgs/applications/networking/p2p/rakshasa-rtorrent/libtorrent.nix b/pkgs/applications/networking/p2p/rakshasa-rtorrent/libtorrent.nix index fff4cbb36cf62..7217026dc8053 100644 --- a/pkgs/applications/networking/p2p/rakshasa-rtorrent/libtorrent.nix +++ b/pkgs/applications/networking/p2p/rakshasa-rtorrent/libtorrent.nix @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://github.com/rakshasa/libtorrent"; - description = "A BitTorrent library written in C++ for *nix, with focus on high performance and good code"; + description = "BitTorrent library written in C++ for *nix, with focus on high performance and good code"; license = licenses.gpl2Plus; maintainers = with maintainers; [ ebzzry codyopel ]; platforms = platforms.unix; diff --git a/pkgs/applications/networking/p2p/retroshare/default.nix b/pkgs/applications/networking/p2p/retroshare/default.nix index 1f4edd2e49dc8..741cca91543ac 100644 --- a/pkgs/applications/networking/p2p/retroshare/default.nix +++ b/pkgs/applications/networking/p2p/retroshare/default.nix @@ -54,7 +54,7 @@ mkDerivation rec { ''; meta = with lib; { - description = "Decentralized peer to peer chat application."; + description = "Decentralized peer to peer chat application"; homepage = "https://retroshare.cc/"; license = licenses.gpl2Plus; platforms = platforms.linux; diff --git a/pkgs/applications/networking/p2p/storrent/default.nix b/pkgs/applications/networking/p2p/storrent/default.nix index a4dc0b459cfd8..57ea126a16357 100644 --- a/pkgs/applications/networking/p2p/storrent/default.nix +++ b/pkgs/applications/networking/p2p/storrent/default.nix @@ -17,7 +17,7 @@ buildGoModule rec { meta = with lib; { homepage = "https://github.com/jech/storrent"; - description = "An implementation of the BitTorrent protocol that is optimised for streaming media"; + description = "Implementation of the BitTorrent protocol that is optimised for streaming media"; mainProgram = "storrent"; license = licenses.mit; platforms = platforms.linux; diff --git a/pkgs/applications/networking/p2p/transmission/4.nix b/pkgs/applications/networking/p2p/transmission/4.nix index 8cb9724626fe5..7c5e9b3651868 100644 --- a/pkgs/applications/networking/p2p/transmission/4.nix +++ b/pkgs/applications/networking/p2p/transmission/4.nix @@ -162,7 +162,7 @@ stdenv.mkDerivation (finalAttrs: { }; meta = with lib; { - description = "A fast, easy and free BitTorrent client"; + description = "Fast, easy and free BitTorrent client"; mainProgram = if (enableQt5 || enableQt6) then "transmission-qt" else if enableGTK3 then "transmission-gtk" else "transmission-cli"; longDescription = '' Transmission is a BitTorrent client which features a simple interface diff --git a/pkgs/applications/networking/p2p/transmission/default.nix b/pkgs/applications/networking/p2p/transmission/default.nix index 2804f76f8ef96..39c160c771d8b 100644 --- a/pkgs/applications/networking/p2p/transmission/default.nix +++ b/pkgs/applications/networking/p2p/transmission/default.nix @@ -46,10 +46,7 @@ stdenv.mkDerivation (finalAttrs: { patches = [ # fix build with openssl 3.0 - (fetchurl { - url = "https://gitweb.gentoo.org/repo/gentoo.git/plain/net-p2p/transmission/files/transmission-3.00-openssl-3.patch"; - hash = "sha256-peVrkGck8AfbC9uYNfv1CIu1alIewpca7A6kRXjVlVs="; - }) + ./transmission-3.00-openssl-3.patch ]; outputs = [ "out" "apparmor" ]; @@ -125,7 +122,7 @@ stdenv.mkDerivation (finalAttrs: { }; meta = { - description = "A fast, easy and free BitTorrent client"; + description = "Fast, easy and free BitTorrent client"; mainProgram = if enableQt then "transmission-qt" else if enableGTK3 then "transmission-gtk" else "transmission-cli"; longDescription = '' Transmission is a BitTorrent client which features a simple interface diff --git a/pkgs/applications/networking/p2p/transmission/transmission-3.00-openssl-3.patch b/pkgs/applications/networking/p2p/transmission/transmission-3.00-openssl-3.patch new file mode 100644 index 0000000000000..f288298cbf3d4 --- /dev/null +++ b/pkgs/applications/networking/p2p/transmission/transmission-3.00-openssl-3.patch @@ -0,0 +1,37 @@ +From 6ee128b95bacaff20746538dc97c2b8e2b9fcc29 Mon Sep 17 00:00:00 2001 +From: Mike Gilbert <floppym@gentoo.org> +Date: Sun, 15 May 2022 10:54:38 -0400 +Subject: [PATCH] openssl: load "legacy" provider for RC4 + +--- + libtransmission/crypto-utils-openssl.c | 7 +++++++ + 1 file changed, 7 insertions(+) + +diff --git a/libtransmission/crypto-utils-openssl.c b/libtransmission/crypto-utils-openssl.c +index 45fd71913..14d680654 100644 +--- a/libtransmission/crypto-utils-openssl.c ++++ b/libtransmission/crypto-utils-openssl.c +@@ -20,6 +20,9 @@ + #include <openssl/rand.h> + #include <openssl/ssl.h> + #include <openssl/x509.h> ++#if OPENSSL_VERSION_MAJOR >= 3 ++#include <openssl/provider.h> ++#endif + + #include "transmission.h" + #include "crypto-utils.h" +@@ -184,6 +187,10 @@ static void openssl_evp_cipher_context_free(EVP_CIPHER_CTX* handle) + + tr_rc4_ctx_t tr_rc4_new(void) + { ++#if OPENSSL_VERSION_MAJOR >= 3 ++ OSSL_PROVIDER_load(NULL, "default"); ++ OSSL_PROVIDER_load(NULL, "legacy"); ++#endif + EVP_CIPHER_CTX* handle = EVP_CIPHER_CTX_new(); + + if (check_result(EVP_CipherInit_ex(handle, EVP_rc4(), NULL, NULL, NULL, -1))) +-- +2.35.1 + diff --git a/pkgs/applications/networking/p2p/zeronet-conservancy/default.nix b/pkgs/applications/networking/p2p/zeronet-conservancy/default.nix index 71799de37fc39..284578460a040 100644 --- a/pkgs/applications/networking/p2p/zeronet-conservancy/default.nix +++ b/pkgs/applications/networking/p2p/zeronet-conservancy/default.nix @@ -46,7 +46,7 @@ python3Packages.buildPythonApplication rec { }; meta = with lib; { - description = "A fork/continuation of the ZeroNet project"; + description = "Fork/continuation of the ZeroNet project"; mainProgram = "zeronet"; longDescription = '' zeronet-conservancy is a fork/continuation of ZeroNet project (that has |