diff options
Diffstat (limited to 'nixpkgs/pkgs/applications/networking/p2p')
4 files changed, 54 insertions, 39 deletions
diff --git a/nixpkgs/pkgs/applications/networking/p2p/fragments/default.nix b/nixpkgs/pkgs/applications/networking/p2p/fragments/default.nix index 5034f401a98d..edb31ba66957 100644 --- a/nixpkgs/pkgs/applications/networking/p2p/fragments/default.nix +++ b/nixpkgs/pkgs/applications/networking/p2p/fragments/default.nix @@ -83,5 +83,6 @@ in stdenv.mkDerivation rec { maintainers = with maintainers; [ emilytrau ]; license = licenses.gpl3Plus; platforms = platforms.linux; + mainProgram = "fragments"; }; } diff --git a/nixpkgs/pkgs/applications/networking/p2p/pyrosimple/default.nix b/nixpkgs/pkgs/applications/networking/p2p/pyrosimple/default.nix index 2f75ce1b29a1..866727ba4349 100644 --- a/nixpkgs/pkgs/applications/networking/p2p/pyrosimple/default.nix +++ b/nixpkgs/pkgs/applications/networking/p2p/pyrosimple/default.nix @@ -10,14 +10,14 @@ python3.pkgs.buildPythonApplication rec { pname = "pyrosimple"; - version = "2.12.1"; + version = "2.13.0"; format = "pyproject"; src = fetchFromGitHub { owner = "kannibalox"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-ppSQknpRoxq35t7lPbqz7MPJzy98yq/GgSchPOx4VT4="; + hash = "sha256-e69e1Aa10/pew1UZBCIPIH3BK7I8C3HiW59fRuSZlkc="; }; pythonRelaxDeps = [ diff --git a/nixpkgs/pkgs/applications/networking/p2p/transgui/default.nix b/nixpkgs/pkgs/applications/networking/p2p/transgui/default.nix index 4f3f711d1f2c..707ff45b3498 100644 --- a/nixpkgs/pkgs/applications/networking/p2p/transgui/default.nix +++ b/nixpkgs/pkgs/applications/networking/p2p/transgui/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "transgui"; - version = "unstable-2023-10-19"; + version = "unstable-2024-02-26"; src = fetchFromGitHub { owner = "transmission-remote-gui"; repo = "transgui"; - rev = "b1f5c2334edb6659c04863ef4a534ba1e57284f0"; - hash = "sha256-XCokcA5lINC9B+qwg0vjkymwa16ZNHRKLI829+X7CvE="; + rev = "25df397d92fbd53b970ef72a6ffd9f644458f935"; + hash = "sha256-jQIe2vTDeJM/lhl6alNhEPOqXjyd18x+Kg29+le/dks="; }; nativeBuildInputs = [ pkg-config unzip ]; diff --git a/nixpkgs/pkgs/applications/networking/p2p/transmission/4.nix b/nixpkgs/pkgs/applications/networking/p2p/transmission/4.nix index 9e0a1d69ef21..75515ef414b0 100644 --- a/nixpkgs/pkgs/applications/networking/p2p/transmission/4.nix +++ b/nixpkgs/pkgs/applications/networking/p2p/transmission/4.nix @@ -27,8 +27,10 @@ , gtkmm3 , xorg , wrapGAppsHook -, enableQt ? false +, enableQt5 ? false +, enableQt6 ? false , qt5 +, qt6Packages , nixosTests , enableSystemd ? lib.meta.availableOn stdenv.hostPlatform systemd , enableDaemon ? true @@ -37,6 +39,24 @@ , apparmorRulesFromClosure }: +let + inherit (lib) cmakeBool optionals; + + apparmorRules = apparmorRulesFromClosure { name = "transmission-daemon"; } ([ + curl + libdeflate + libevent + libnatpmp + libpsl + miniupnpc + openssl + pcre + zlib + ] + ++ optionals enableSystemd [ systemd ] + ++ optionals stdenv.isLinux [ inotify-tools ]); + +in stdenv.mkDerivation (finalAttrs: { pname = "transmission"; version = "4.0.5"; @@ -51,21 +71,17 @@ stdenv.mkDerivation (finalAttrs: { outputs = [ "out" "apparmor" ]; - cmakeFlags = - let - mkFlag = opt: if opt then "ON" else "OFF"; - in - [ - "-DENABLE_MAC=OFF" # requires xcodebuild - "-DENABLE_GTK=${mkFlag enableGTK3}" - "-DENABLE_QT=${mkFlag enableQt}" - "-DENABLE_DAEMON=${mkFlag enableDaemon}" - "-DENABLE_CLI=${mkFlag enableCli}" - "-DINSTALL_LIB=${mkFlag installLib}" - ] ++ lib.optionals stdenv.isDarwin [ - # Transmission sets this to 10.13 if not explicitly specified, see https://github.com/transmission/transmission/blob/0be7091eb12f4eb55f6690f313ef70a66795ee72/CMakeLists.txt#L7-L16. - "-DCMAKE_OSX_DEPLOYMENT_TARGET=${stdenv.hostPlatform.darwinMinVersion}" - ]; + cmakeFlags = [ + (cmakeBool "ENABLE_CLI" enableCli) + (cmakeBool "ENABLE_DAEMON" enableDaemon) + (cmakeBool "ENABLE_GTK" enableGTK3) + (cmakeBool "ENABLE_MAC" false) # requires xcodebuild + (cmakeBool "ENABLE_QT" (enableQt5 || enableQt6)) + (cmakeBool "INSTALL_LIB" installLib) + ] ++ optionals stdenv.isDarwin [ + # Transmission sets this to 10.13 if not explicitly specified, see https://github.com/transmission/transmission/blob/0be7091eb12f4eb55f6690f313ef70a66795ee72/CMakeLists.txt#L7-L16. + "-DCMAKE_OSX_DEPLOYMENT_TARGET=${stdenv.hostPlatform.darwinMinVersion}" + ]; postPatch = '' # Clean third-party libraries to ensure system ones are used. @@ -89,8 +105,9 @@ stdenv.mkDerivation (finalAttrs: { cmake python3 ] - ++ lib.optionals enableGTK3 [ wrapGAppsHook ] - ++ lib.optionals enableQt [ qt5.wrapQtAppsHook ] + ++ optionals enableGTK3 [ wrapGAppsHook ] + ++ optionals enableQt5 [ qt5.wrapQtAppsHook ] + ++ optionals enableQt6 [ qt6Packages.wrapQtAppsHook ] ; buildInputs = [ @@ -109,11 +126,12 @@ stdenv.mkDerivation (finalAttrs: { utf8cpp zlib ] - ++ lib.optionals enableQt [ qt5.qttools qt5.qtbase ] - ++ lib.optionals enableGTK3 [ gtkmm3 xorg.libpthreadstubs ] - ++ lib.optionals enableSystemd [ systemd ] - ++ lib.optionals stdenv.isLinux [ inotify-tools ] - ++ lib.optionals stdenv.isDarwin [ libiconv Foundation ]; + ++ optionals enableQt5 (with qt5; [ qttools qtbase ]) + ++ optionals enableQt6 (with qt6Packages; [ qttools qtbase qtsvg ]) + ++ optionals enableGTK3 [ gtkmm3 xorg.libpthreadstubs ] + ++ optionals enableSystemd [ systemd ] + ++ optionals stdenv.isLinux [ inotify-tools ] + ++ optionals stdenv.isDarwin [ libiconv Foundation ]; postInstall = '' mkdir $apparmor @@ -123,11 +141,7 @@ stdenv.mkDerivation (finalAttrs: { include <abstractions/base> include <abstractions/nameservice> include <abstractions/ssl_certs> - include "${apparmorRulesFromClosure { name = "transmission-daemon"; } ([ - curl libevent openssl pcre zlib libdeflate libpsl libnatpmp miniupnpc - ] ++ lib.optionals enableSystemd [ systemd ] - ++ lib.optionals stdenv.isLinux [ inotify-tools ] - )}" + include "${apparmorRules}" r @{PROC}/sys/kernel/random/uuid, r @{PROC}/sys/vm/overcommit_memory, r @{PROC}/@{pid}/environ, @@ -147,9 +161,9 @@ stdenv.mkDerivation (finalAttrs: { smoke-test = nixosTests.bittorrent; }; - meta = { + meta = with lib; { description = "A fast, easy and free BitTorrent client"; - mainProgram = if enableQt then "transmission-qt" else if enableGTK3 then "transmission-gtk" else "transmission-cli"; + 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 on top of a cross-platform back-end. @@ -161,9 +175,9 @@ stdenv.mkDerivation (finalAttrs: { * Bluetack (PeerGuardian) blocklists with automatic updates * Full encryption, DHT, and PEX support ''; - homepage = "http://www.transmissionbt.com/"; - license = with lib.licenses; [ gpl2Plus mit ]; - maintainers = with lib.maintainers; [ astsmtl ]; - platforms = lib.platforms.unix; + homepage = "https://www.transmissionbt.com/"; + license = with licenses; [ gpl2Plus mit ]; + maintainers = with maintainers; [ astsmtl ]; + platforms = platforms.unix; }; }) |