summary refs log tree commit diff
path: root/pkgs/tools/misc
diff options
context:
space:
mode:
authorLorenzo Manacorda <lorenzo@mailbox.org>2017-06-02 22:40:17 +0200
committerJörg Thalheim <Mic92@users.noreply.github.com>2017-06-02 21:40:17 +0100
commit4a62364c17819e953d943296e716c4910e57595b (patch)
tree5d453ce77539a642ddfb1393cebf1f609df78663 /pkgs/tools/misc
parent7a0bce8422413d3cd0721f0f4dd4ccda785a8a49 (diff)
downloadnixlib-4a62364c17819e953d943296e716c4910e57595b.tar
nixlib-4a62364c17819e953d943296e716c4910e57595b.tar.gz
nixlib-4a62364c17819e953d943296e716c4910e57595b.tar.bz2
nixlib-4a62364c17819e953d943296e716c4910e57595b.tar.lz
nixlib-4a62364c17819e953d943296e716c4910e57595b.tar.xz
nixlib-4a62364c17819e953d943296e716c4910e57595b.tar.zst
nixlib-4a62364c17819e953d943296e716c4910e57595b.zip
youtube-dl: 2017.05.23 -> 2017.05.29 (#26329)
* youtube-dl: add pycryptodome dependency

The pycrypto library is used for HLS streams with encrypted segments.

See https://github.com/rg3/youtube-dl/pull/8201

* youtube-dl: 2017.05.23 -> 2017.05.29
Diffstat (limited to 'pkgs/tools/misc')
-rw-r--r--pkgs/tools/misc/youtube-dl/default.nix8
1 files changed, 5 insertions, 3 deletions
diff --git a/pkgs/tools/misc/youtube-dl/default.nix b/pkgs/tools/misc/youtube-dl/default.nix
index 1acf0e65dea6..853f644634d4 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, pandoc
+, zip, ffmpeg, rtmpdump, 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,21 +8,23 @@
 , generateManPage ? false
 , ffmpegSupport ? true
 , rtmpSupport ? true
+, hlsEncryptedSupport ? true
 , makeWrapper }:
 
 with stdenv.lib;
 buildPythonApplication rec {
 
   name = "youtube-dl-${version}";
-  version = "2017.05.23";
+  version = "2017.05.29";
 
   src = fetchurl {
     url = "https://yt-dl.org/downloads/${version}/${name}.tar.gz";
-    sha256 = "1na2ccja8p18i3ypf7vjrxlh653906746l966fwm06b5q6867iwd";
+    sha256 = "11zh0h4hwwx39iv6qbkqbvf5a5mgj71ngj2kp7zmq7g0qh37x9rx";
   };
 
   nativeBuildInputs = [ makeWrapper ];
   buildInputs = [ zip ] ++ optional generateManPage pandoc;
+  propagatedBuildInputs = optional hlsEncryptedSupport pycryptodome;
 
   # Ensure ffmpeg is available in $PATH for post-processing & transcoding support.
   # rtmpdump is required to download files over RTMP