Merge pull request #33413 from corngood/youtube-dl-update

youtube-dl: 2017.12.23 -> 2017.12.31

authored by Jörg Thalheim and committed by GitHub b3ba9fb9 a1a3aeaa

+7 -4
+6 -4
pkgs/tools/misc/youtube-dl/default.nix
··· 1 { stdenv, fetchurl, buildPythonApplication 2 - , zip, ffmpeg, rtmpdump, atomicparsley, pycryptodome, pandoc 3 # Pandoc is required to build the package's man page. Release tarballs contain a 4 # formatted man page already, though, it will still be installed. We keep the 5 # manpage argument in place in case someone wants to use this derivation to ··· 8 , generateManPage ? false 9 , ffmpegSupport ? true 10 , rtmpSupport ? true 11 , hlsEncryptedSupport ? true 12 , makeWrapper }: 13 ··· 15 buildPythonApplication rec { 16 17 name = "youtube-dl-${version}"; 18 - version = "2017.12.23"; 19 20 src = fetchurl { 21 url = "https://yt-dl.org/downloads/${version}/${name}.tar.gz"; 22 - sha256 = "12m1bjdqm9bsc1f5psnzc203avzwr070xpdr6fqr728am536q845"; 23 }; 24 25 nativeBuildInputs = [ makeWrapper ]; ··· 33 packagesToBinPath = 34 [ atomicparsley ] 35 ++ optional ffmpegSupport ffmpeg 36 - ++ optional rtmpSupport rtmpdump; 37 in '' 38 wrapProgram $out/bin/youtube-dl --prefix PATH : "${makeBinPath packagesToBinPath}" 39 '';
··· 1 { stdenv, fetchurl, buildPythonApplication 2 + , zip, ffmpeg, rtmpdump, phantomjs2, atomicparsley, pycryptodome, pandoc 3 # Pandoc is required to build the package's man page. Release tarballs contain a 4 # formatted man page already, though, it will still be installed. We keep the 5 # manpage argument in place in case someone wants to use this derivation to ··· 8 , generateManPage ? false 9 , ffmpegSupport ? true 10 , rtmpSupport ? true 11 + , phantomjsSupport ? true 12 , hlsEncryptedSupport ? true 13 , makeWrapper }: 14 ··· 16 buildPythonApplication rec { 17 18 name = "youtube-dl-${version}"; 19 + version = "2017.12.31"; 20 21 src = fetchurl { 22 url = "https://yt-dl.org/downloads/${version}/${name}.tar.gz"; 23 + sha256 = "0cq10ii96lpq3z7l1js0s59sqb4h4yqwdqinl2yf7cdjynvj62xi"; 24 }; 25 26 nativeBuildInputs = [ makeWrapper ]; ··· 34 packagesToBinPath = 35 [ atomicparsley ] 36 ++ optional ffmpegSupport ffmpeg 37 + ++ optional rtmpSupport rtmpdump 38 + ++ optional phantomjsSupport phantomjs2; 39 in '' 40 wrapProgram $out/bin/youtube-dl --prefix PATH : "${makeBinPath packagesToBinPath}" 41 '';
+1
pkgs/top-level/python-packages.nix
··· 18873 18874 youtube-dl-light = callPackage ../tools/misc/youtube-dl { 18875 ffmpegSupport = false; 18876 }; 18877 18878 zbase32 = buildPythonPackage (rec {
··· 18873 18874 youtube-dl-light = callPackage ../tools/misc/youtube-dl { 18875 ffmpegSupport = false; 18876 + phantomjsSupport = false; 18877 }; 18878 18879 zbase32 = buildPythonPackage (rec {