Merge pull request #110134 from marsam/update-tubeup
python3Packages.tubeup: 0.0.20 -> 0.0.21, youtube-dlc: remove
This commit is contained in:
commit
fe2005af70
3 changed files with 4 additions and 29 deletions
|
@ -2,27 +2,27 @@
|
|||
, buildPythonPackage
|
||||
, internetarchive
|
||||
, fetchPypi
|
||||
, youtube-dlc
|
||||
, youtube-dl
|
||||
, docopt
|
||||
, isPy27
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "tubeup";
|
||||
version = "0.0.20";
|
||||
version = "0.0.21";
|
||||
|
||||
disabled = isPy27;
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "8bf4004629b8427173c8259e1a09065db99135d6cc390b70a8a67b52a34a3f67";
|
||||
sha256 = "326a499be032bee7f7ed921d85abff4b3b4dcd2c3d6ad694f08ef98dbcef19b6";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace setup.py --replace "docopt==0.6.2" "docopt"
|
||||
'';
|
||||
|
||||
propagatedBuildInputs = [ internetarchive docopt youtube-dlc ];
|
||||
propagatedBuildInputs = [ internetarchive docopt youtube-dl ];
|
||||
|
||||
pythonImportsCheck = [ "tubeup" ];
|
||||
|
||||
|
|
|
@ -1,23 +0,0 @@
|
|||
{ 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 ];
|
||||
};
|
||||
}
|
|
@ -8341,8 +8341,6 @@ in {
|
|||
phantomjsSupport = false;
|
||||
};
|
||||
|
||||
youtube-dlc = callPackage ../development/python-modules/youtube-dlc { };
|
||||
|
||||
yowsup = callPackage ../development/python-modules/yowsup { };
|
||||
|
||||
yq = callPackage ../development/python-modules/yq { };
|
||||
|
|
Loading…
Reference in a new issue