diff options
author | Maciej Krüger <mkg20001@gmail.com> | 2023-11-27 06:35:56 +0100 |
---|---|---|
committer | Maciej Krüger <mkg20001@gmail.com> | 2023-11-28 02:48:52 +0100 |
commit | fbd57b4324786ec8db39d7ce60e0adbc065df87e (patch) | |
tree | 4619022358230ccacec5e48282f28f3f494f25a0 /pkgs/applications/networking/p2p | |
parent | 8856d14f0c672ade3b9f00cd7bb52c6d7e428bec (diff) |
tribler: 7.11.0 -> 7.13.0
Diffstat (limited to 'pkgs/applications/networking/p2p')
-rw-r--r-- | pkgs/applications/networking/p2p/tribler/default.nix | 53 |
1 files changed, 33 insertions, 20 deletions
diff --git a/pkgs/applications/networking/p2p/tribler/default.nix b/pkgs/applications/networking/p2p/tribler/default.nix index 5bc1cb7264435..b4fba4b9197e6 100644 --- a/pkgs/applications/networking/p2p/tribler/default.nix +++ b/pkgs/applications/networking/p2p/tribler/default.nix @@ -1,6 +1,7 @@ { lib , stdenv , fetchurl +, fetchPypi , python3 , makeWrapper , libtorrent-rasterbar-1_2_x @@ -12,16 +13,19 @@ let in stdenv.mkDerivation rec { pname = "tribler"; - version = "7.11.0"; + version = "7.13.0"; src = fetchurl { - url = "https://github.com/Tribler/tribler/releases/download/v${version}/Tribler-v${version}.tar.xz"; - sha256 = "0ffh8chb47iaar8872gvalgm84fjzyxph16nixsxknnprqdxyrkx"; + url = "https://github.com/Tribler/tribler/releases/download/v${version}/Tribler-${version}.tar.xz"; + hash = "sha256-j9+Kq6dOqiJCTY3vuRWGnciuwACU7L0pl73l6nkDLN4="; }; nativeBuildInputs = [ python3.pkgs.wrapPython makeWrapper + # we had a "copy" of this in tribler's makeWrapper + # but it went out of date and broke, so please just use it directly + qt5.wrapQtAppsHook ]; buildInputs = [ @@ -31,38 +35,49 @@ stdenv.mkDerivation rec { pythonPath = [ libtorrent ] ++ (with python3.pkgs; [ + # requirements-core.txt aiohttp aiohttp-apispec - asynctest + anyio chardet - cherrypy configobj cryptography decorator faker - feedparser libnacl lz4 - m2crypto + marshmallow netifaces networkx - pillow pony psutil pyasn1 - pycrypto - pyqt5 - pyqtgraph - pytest-asyncio - pytest-timeout + pydantic + pyopenssl pyyaml - requests sentry-sdk service-identity - twisted yappi - pydantic - anyio + yarl + bitarray + (pyipv8.overrideAttrs (p: rec { + version = "2.10.0"; + src = fetchPypi { + inherit (p) pname; + inherit version; + hash = "sha256-yxiXBxBiPokequm+vjsHIoG9kQnRnbsOx3mYOd8nmiU="; + }; + })) + libtorrent + file-read-backwards + brotli + human-readable + # requirements.txt + pillow + pyqt5 + #pyqt5-sip + pyqtgraph + pyqtwebengine ]); installPhase = '' @@ -71,8 +86,6 @@ stdenv.mkDerivation rec { wrapPythonPrograms cp -prvd ./* $out/ makeWrapper ${python3.pkgs.python}/bin/python $out/bin/tribler \ - --set QT_QPA_PLATFORM_PLUGIN_PATH ${qt5.qtbase.bin}/lib/qt-*/plugins/platforms \ - --set QT_PLUGIN_PATH "${qt5.qtsvg.bin}/${qt5.qtbase.qtPluginPrefix}" \ --set _TRIBLERPATH "$out/src" \ --set PYTHONPATH $out/src/tribler-core:$out/src/tribler-common:$out/src/tribler-gui:$program_PYTHONPATH \ --set NO_AT_BRIDGE 1 \ @@ -95,7 +108,7 @@ stdenv.mkDerivation rec { description = "Decentralised P2P filesharing client based on the Bittorrent protocol"; homepage = "https://www.tribler.org/"; license = licenses.lgpl21Plus; - maintainers = with maintainers; [ xvapx viric ]; + maintainers = with maintainers; [ xvapx viric mkg20001 ]; platforms = platforms.linux; }; } |