diff options
| author | David McFarland <corngood@gmail.com> | 2018-01-03 22:20:00 -0400 |
|---|---|---|
| committer | David McFarland <corngood@gmail.com> | 2018-01-04 19:47:50 -0400 |
| commit | 93f30a4144c037e44af7d5287d04980a49bebac8 (patch) | |
| tree | b2c31bad861daba50bce346c48381de7572bf692 | |
| parent | a325405c930a60b5cd241fb6fde8eac2eac8d826 (diff) | |
| download | nixlib-93f30a4144c037e44af7d5287d04980a49bebac8.tar nixlib-93f30a4144c037e44af7d5287d04980a49bebac8.tar.gz nixlib-93f30a4144c037e44af7d5287d04980a49bebac8.tar.bz2 nixlib-93f30a4144c037e44af7d5287d04980a49bebac8.tar.lz nixlib-93f30a4144c037e44af7d5287d04980a49bebac8.tar.xz nixlib-93f30a4144c037e44af7d5287d04980a49bebac8.tar.zst nixlib-93f30a4144c037e44af7d5287d04980a49bebac8.zip | |
youtube-dl: 2017.12.23 -> 2017.12.31
- add phantomjs2 to PATH for openload plugin
| -rw-r--r-- | pkgs/tools/misc/youtube-dl/default.nix | 10 | ||||
| -rw-r--r-- | pkgs/top-level/python-packages.nix | 1 |
2 files changed, 7 insertions, 4 deletions
diff --git a/pkgs/tools/misc/youtube-dl/default.nix b/pkgs/tools/misc/youtube-dl/default.nix index d8af8169a188..808858724e67 100644 --- a/pkgs/tools/misc/youtube-dl/default.nix +++ b/pkgs/tools/misc/youtube-dl/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, buildPythonApplication -, zip, ffmpeg, rtmpdump, atomicparsley, pycryptodome, pandoc +, zip, ffmpeg, rtmpdump, phantomjs2, atomicparsley, pycryptodome, pandoc # Pandoc is required to build the package's man page. Release tarballs contain a # formatted man page already, though, it will still be installed. We keep the # manpage argument in place in case someone wants to use this derivation to @@ -8,6 +8,7 @@ , generateManPage ? false , ffmpegSupport ? true , rtmpSupport ? true +, phantomjsSupport ? true , hlsEncryptedSupport ? true , makeWrapper }: @@ -15,11 +16,11 @@ with stdenv.lib; buildPythonApplication rec { name = "youtube-dl-${version}"; - version = "2017.12.23"; + version = "2017.12.31"; src = fetchurl { url = "https://yt-dl.org/downloads/${version}/${name}.tar.gz"; - sha256 = "12m1bjdqm9bsc1f5psnzc203avzwr070xpdr6fqr728am536q845"; + sha256 = "0cq10ii96lpq3z7l1js0s59sqb4h4yqwdqinl2yf7cdjynvj62xi"; }; nativeBuildInputs = [ makeWrapper ]; @@ -33,7 +34,8 @@ buildPythonApplication rec { packagesToBinPath = [ atomicparsley ] ++ optional ffmpegSupport ffmpeg - ++ optional rtmpSupport rtmpdump; + ++ optional rtmpSupport rtmpdump + ++ optional phantomjsSupport phantomjs2; in '' wrapProgram $out/bin/youtube-dl --prefix PATH : "${makeBinPath packagesToBinPath}" ''; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index d9588e9f9f24..b356c1005bcb 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -18873,6 +18873,7 @@ EOF youtube-dl-light = callPackage ../tools/misc/youtube-dl { ffmpegSupport = false; + phantomjsSupport = false; }; zbase32 = buildPythonPackage (rec { |