From 6bc59577144521f43a9d4877662c3bd60713fa97 Mon Sep 17 00:00:00 2001 From: freezeboy Date: Thu, 19 Nov 2020 00:12:02 +0100 Subject: [PATCH 1/2] python3Packages.youtube-dlc: init at 2020.11.11.post3 --- .../python-modules/youtube-dlc/default.nix | 23 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 25 insertions(+) create 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 new file mode 100644 index 00000000000..9599828e65e --- /dev/null +++ b/pkgs/development/python-modules/youtube-dlc/default.nix @@ -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 ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 4fef3c3946f..c7e5ea27974 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -7839,6 +7839,8 @@ in { phantomjsSupport = false; }; + youtube-dlc = callPackage ../development/python-modules/youtube-dlc { }; + yowsup = callPackage ../development/python-modules/yowsup { }; yq = callPackage ../development/python-modules/yq { }; From 442bd5b4d18b0aba779e61acb6f01b141d3ab78c Mon Sep 17 00:00:00 2001 From: freezeboy Date: Thu, 19 Nov 2020 00:12:55 +0100 Subject: [PATCH 2/2] python3Packages.tubeup: unbreak wrong youtube dep There are two packages used to download from youtube: youtube-dl and youtube-dlc, this packaged was using the wrong one --- pkgs/development/python-modules/tubeup/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/tubeup/default.nix b/pkgs/development/python-modules/tubeup/default.nix index 02269cdbfb2..29764259910 100644 --- a/pkgs/development/python-modules/tubeup/default.nix +++ b/pkgs/development/python-modules/tubeup/default.nix @@ -2,7 +2,7 @@ , buildPythonPackage , internetarchive , fetchPypi -, youtube-dl +, youtube-dlc , docopt , isPy27 }: @@ -22,7 +22,7 @@ buildPythonPackage rec { substituteInPlace setup.py --replace "docopt==0.6.2" "docopt" ''; - propagatedBuildInputs = [ internetarchive docopt youtube-dl ]; + propagatedBuildInputs = [ internetarchive docopt youtube-dlc ]; pythonImportsCheck = [ "tubeup" ];