Merge pull request #104222 from freezeboy/unbreak-tubeup

This commit is contained in:
Doron Behar 2020-11-28 18:08:35 +02:00 committed by GitHub
commit a42535b6b8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 27 additions and 2 deletions

View File

@ -2,7 +2,7 @@
, buildPythonPackage , buildPythonPackage
, internetarchive , internetarchive
, fetchPypi , fetchPypi
, youtube-dl , youtube-dlc
, docopt , docopt
, isPy27 , isPy27
}: }:
@ -22,7 +22,7 @@ buildPythonPackage rec {
substituteInPlace setup.py --replace "docopt==0.6.2" "docopt" substituteInPlace setup.py --replace "docopt==0.6.2" "docopt"
''; '';
propagatedBuildInputs = [ internetarchive docopt youtube-dl ]; propagatedBuildInputs = [ internetarchive docopt youtube-dlc ];
pythonImportsCheck = [ "tubeup" ]; pythonImportsCheck = [ "tubeup" ];

View File

@ -0,0 +1,23 @@
{ lib, buildPythonPackage, fetchPypi }:
buildPythonPackage rec {
pname = "youtube_dlc";
version = "2020.11.11.post3";
src = fetchPypi {
inherit pname version;
sha256 = "WqoKpfvVPZrN+pW6s8JoApJusn5CXyPcg9VcsY8R0FM=";
};
# They are broken
doCheck = false;
pythonImportsCheck = [ "youtube_dlc" ];
meta = with lib; {
homepage = "Media downloader supporting various sites such as youtube";
description = "https://github.com/blackjack4494/yt-dlc";
platforms = platforms.linux;
maintainers = with maintainers; [ freezeboy ];
};
}

View File

@ -7891,6 +7891,8 @@ in {
phantomjsSupport = false; phantomjsSupport = false;
}; };
youtube-dlc = callPackage ../development/python-modules/youtube-dlc { };
yowsup = callPackage ../development/python-modules/yowsup { }; yowsup = callPackage ../development/python-modules/yowsup { };
yq = callPackage ../development/python-modules/yq { }; yq = callPackage ../development/python-modules/yq { };