tribler: remove local apispec

2 files changed, 30 insertions, 78 deletions

diff --git a/pkgs/applications/networking/p2p/tribler/apispec.nix b/pkgs/applications/networking/p2p/tribler/apispec.nix
deleted file mode 100644
index e60a440df3f4b..0000000000000
--- a/pkgs/applications/networking/p2p/tribler/apispec.nix
+++ /dev/null
@@ -1,47 +0,0 @@
-{ lib
-, buildPythonPackage
-, fetchPypi
-, pyyaml
-, prance
-, marshmallow
-, pytestCheckHook
-, mock
-, openapi-spec-validator
-}:
-
-buildPythonPackage rec {
-  pname = "apispec";
-  version = "3.3.2";
-
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "d23ebd5b71e541e031b02a19db10b5e6d5ef8452c552833e3e1afc836b40b1ad";
-  };
-
-  propagatedBuildInputs = [
-    pyyaml
-    prance
-  ];
-
-  postPatch = ''
-    rm tests/test_ext_marshmallow.py
-  '';
-
-  checkInputs = [
-    openapi-spec-validator
-    marshmallow
-    mock
-    pytestCheckHook
-  ];
-
-  pythonImportsCheck = [
-    "apispec"
-  ];
-
-  meta = with lib; {
-    description = "A pluggable API specification generator. Currently supports the OpenAPI Specification (f.k.a. the Swagger specification";
-    homepage = "https://github.com/marshmallow-code/apispec";
-    license = licenses.mit;
-    maintainers = [ maintainers.viric ];
-  };
-}
diff --git a/pkgs/applications/networking/p2p/tribler/default.nix b/pkgs/applications/networking/p2p/tribler/default.nix
index 6a8f93a293814..38fc90d8e5893 100644
--- a/pkgs/applications/networking/p2p/tribler/default.nix
+++ b/pkgs/applications/networking/p2p/tribler/default.nix
@@ -1,12 +1,15 @@
-{ stdenv, lib, fetchurl, python3, makeWrapper
-, libtorrent-rasterbar-1_2_x, qt5
+{ lib
+, stdenv
+, fetchurl
+, python3
+, makeWrapper
+, libtorrent-rasterbar-1_2_x
+, qt5
 }:
 
 let
   libtorrent = (python3.pkgs.toPythonModule (
     libtorrent-rasterbar-1_2_x.override { python = python3; })).python;
-
-  aiohttp-apispec = python3.pkgs.callPackage ./aiohttp-apispec.nix { };
 in
 stdenv.mkDerivation rec {
   pname = "tribler";
@@ -14,7 +17,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "https://github.com/Tribler/tribler/releases/download/v${version}/Tribler-v${version}.tar.xz";
-    sha256 = "1x45z23d1cqf0lai7wg5ki7gi2vba5hqk0swhggzplcjwma4wmh9";
+    hash = "sha256-CVZOVOWS0fvfg1yDiWFRa4v4Tpzl8RMVBQ6z0Ib4hfQ=";
   };
 
   nativeBuildInputs = [
@@ -29,40 +32,36 @@ stdenv.mkDerivation rec {
   pythonPath = [
     libtorrent
   ] ++ (with python3.pkgs; [
-    twisted
-    netifaces
-    pycrypto
-    pyasn1
-    requests
-    m2crypto
-    pyqt5
+    aiohttp
+    aiohttp-apispec
+    asynctest
     chardet
     cherrypy
-    cryptography
-    libnacl
     configobj
+    cryptography
     decorator
+    faker
     feedparser
-    service-identity
-    psutil
-    pillow
+    libnacl
+    lz4
+    m2crypto
+    netifaces
     networkx
+    pillow
     pony
-    lz4
+    psutil
+    pyasn1
+    pycrypto
+    pyqt5
     pyqtgraph
-    pyyaml
-    aiohttp
-    aiohttp-apispec
-    faker
-    sentry-sdk
     pytest-asyncio
     pytest-timeout
-    asynctest
+    pyyaml
+    requests
+    sentry-sdk
+    service-identity
+    twisted
     yappi
-
-    # there is a BTC feature, but it requires some unclear version of
-    # bitcoinlib, so this doesn't work right now.
-    # bitcoinlib
   ]);
 
   installPhase = ''
@@ -84,10 +83,10 @@ stdenv.mkDerivation rec {
   '';
 
   meta = with lib; {
-    maintainers = with maintainers; [ xvapx viric ];
+    description = "Decentralised P2P filesharing client based on the Bittorrent protocol";
     homepage = "https://www.tribler.org/";
-    description = "A completely decentralised P2P filesharing client based on the Bittorrent protocol";
-    license = licenses.lgpl21;
+    license = licenses.lgpl21Plus;
+    maintainers = with maintainers; [ xvapx viric ];
     platforms = platforms.linux;
   };
 }