summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDoron Behar <doron.behar@gmail.com>2020-11-28 18:08:35 +0200
committerGitHub <noreply@github.com>2020-11-28 18:08:35 +0200
commita42535b6b83f6ac02de03436bab6a70400dde6e6 (patch)
treee85a45508230b6f84295dc0baf29c496455e0f43
parent2426a0ea7857b97e19269c0d13e7eaa2beba9aaa (diff)
parent442bd5b4d18b0aba779e61acb6f01b141d3ab78c (diff)
Merge pull request #104222 from freezeboy/unbreak-tubeup
-rw-r--r--pkgs/development/python-modules/tubeup/default.nix4
-rw-r--r--pkgs/development/python-modules/youtube-dlc/default.nix23
-rw-r--r--pkgs/top-level/python-packages.nix2
3 files changed, 27 insertions, 2 deletions
diff --git a/pkgs/development/python-modules/tubeup/default.nix b/pkgs/development/python-modules/tubeup/default.nix
index 02269cdbfb28..297642599107 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" ];
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 000000000000..9599828e65ee
--- /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 b63924e2dca2..162f837fd28c 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -7891,6 +7891,8 @@ in {
phantomjsSupport = false;
};
+ youtube-dlc = callPackage ../development/python-modules/youtube-dlc { };
+
yowsup = callPackage ../development/python-modules/yowsup { };
yq = callPackage ../development/python-modules/yq { };