From c0e781d9adc4cd7f637e1e1be29eb4dd80e6b7bd Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Wed, 20 Jan 2021 04:20:00 +0000 Subject: [PATCH 1/2] python3Packages.tubeup: 0.0.20 -> 0.0.21 --- pkgs/development/python-modules/tubeup/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/tubeup/default.nix b/pkgs/development/python-modules/tubeup/default.nix index 29764259910..7a4b4454b3b 100644 --- a/pkgs/development/python-modules/tubeup/default.nix +++ b/pkgs/development/python-modules/tubeup/default.nix @@ -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" ]; From 6d25d3e09d3fc1ceadf250ac75499eb7f7c3f7d9 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Wed, 20 Jan 2021 04:20:00 +0000 Subject: [PATCH 2/2] python3Packages.youtube-dlc: drop tubeup uses youtube-dl, and upstream seems to be unmaintained. --- .../python-modules/youtube-dlc/default.nix | 23 ------------------- pkgs/top-level/python-packages.nix | 2 -- 2 files changed, 25 deletions(-) delete mode 100644 pkgs/development/python-modules/youtube-dlc/default.nix diff --git a/pkgs/development/python-modules/youtube-dlc/default.nix b/pkgs/development/python-modules/youtube-dlc/default.nix deleted file mode 100644 index 9599828e65e..00000000000 --- a/pkgs/development/python-modules/youtube-dlc/default.nix +++ /dev/null @@ -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 ]; - }; -} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 5de1f1958dc..1e7ce27a8cd 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -8337,8 +8337,6 @@ in { phantomjsSupport = false; }; - youtube-dlc = callPackage ../development/python-modules/youtube-dlc { }; - yowsup = callPackage ../development/python-modules/yowsup { }; yq = callPackage ../development/python-modules/yq { };