Unverified Commit 426c785e authored by Maciej Krüger's avatar Maciej Krüger Committed by GitHub
Browse files

Merge pull request #310754 from JohnRTitor/tribler 

tribler: 7.13.0 -> 7.14.0
parents 8f10cb5a 961427a5

pkgs/applications/networking/p2p/tribler/default.nix→pkgs/by-name/tr/tribler/package.nix

+74 −67
Original line number Diff line number Diff line 
{ lib

, stdenv

, fetchurl

, fetchPypi

, python3

, makeWrapper

, libtorrent-rasterbar-1_2_x

, qt5

{

  lib,

  stdenv,

  fetchurl,

  fetchPypi,

  python3,

  makeWrapper,

  libtorrent-rasterbar-1_2_x,

  qt5,

  nix-update-script,

}:



let

  libtorrent = (python3.pkgs.toPythonModule (libtorrent-rasterbar-1_2_x)).python;

in

stdenv.mkDerivation rec {

stdenv.mkDerivation (finalAttrs: {

  pname = "tribler";

  version = "7.13.0";

  version = "7.14.0";



  src = fetchurl {

    url = "https://github.com/Tribler/tribler/releases/download/v${version}/Tribler-${version}.tar.xz";

    hash = "sha256-j9+Kq6dOqiJCTY3vuRWGnciuwACU7L0pl73l6nkDLN4=";

    url = "https://github.com/Tribler/tribler/releases/download/v${finalAttrs.version}/Tribler-${finalAttrs.version}.tar.xz";

    hash = "sha256-fQJOs9P4y71De/+svmD7YZ4+tm/bC3rspm7SbOHlSR4=";

  };



  nativeBuildInputs = [
@@ -28,13 +30,11 @@ stdenv.mkDerivation rec { 
    qt5.wrapQtAppsHook

  ];



  buildInputs = [

    python3.pkgs.python

  ];

  buildInputs = [ python3.pkgs.python ];



  pythonPath = [

    libtorrent

  ] ++ (with python3.pkgs; [

  pythonPath =

    [ libtorrent ]

    ++ (with python3.pkgs; [

      # requirements-core.txt

      aiohttp

      aiohttp-apispec
@@ -60,6 +60,7 @@ stdenv.mkDerivation rec { 
      yappi

      yarl

      bitarray

      filelock

      (pyipv8.overrideAttrs (p: rec {

        version = "2.10.0";

        src = fetchPypi {
@@ -68,7 +69,6 @@ stdenv.mkDerivation rec { 
          hash = "sha256-yxiXBxBiPokequm+vjsHIoG9kQnRnbsOx3mYOd8nmiU=";

        };

      }))

    libtorrent

      file-read-backwards

      brotli

      human-readable
@@ -106,12 +106,19 @@ stdenv.mkDerivation rec { 
    export QT_PLUGIN_PATH="${qt5.qtsvg.bin}/${qt5.qtbase.qtPluginPrefix}"

  '';



  meta = with lib; {

  passthru.updateScript = nix-update-script { };



  meta = {

    description = "Decentralised P2P filesharing client based on the Bittorrent protocol";

    mainProgram = "tribler";

    homepage = "https://www.tribler.org/";

    license = licenses.lgpl21Plus;

    maintainers = with maintainers; [ xvapx viric mkg20001 ];

    platforms = platforms.linux;

    changelog = "https://github.com/Tribler/tribler/releases/tag/v${finalAttrs.version}";

    license = lib.licenses.lgpl21Plus;

    maintainers = with lib.maintainers; [

      xvapx

      viric

      mkg20001

    ];

    platforms = lib.platforms.linux;

  };

}
 
})

pkgs/top-level/all-packages.nix

+0 −2
Original line number Diff line number Diff line
@@ -35017,8 +35017,6 @@ with pkgs; 














  tremc = callPackage ../applications/networking/p2p/tremc { };



























  tribler = callPackage ../applications/networking/p2p/tribler { };



























  trillian-im = callPackage ../applications/networking/instant-messengers/trillian-im { };





























  trojita = libsForQt5.callPackage ../applications/networking/mailreaders/trojita { };