JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
youtube-dl: 2017.12.23 -> 2017.12.31
This commit is contained in:
Jörg Thalheim 2018-01-05 09:58:16 +01:00 committed by GitHub
commit b3ba9fb9e0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pkgs/tools/misc/youtube-dl/default.nix
View File

@ -1,5 +1,5 @@
{ stdenv, fetchurl, buildPythonApplication { 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 # 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 # 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 # manpage argument in place in case someone wants to use this derivation to
@ -8,6 +8,7 @@
, generateManPage ? false , generateManPage ? false
, ffmpegSupport ? true , ffmpegSupport ? true
, rtmpSupport ? true , rtmpSupport ? true
, phantomjsSupport ? true
, hlsEncryptedSupport ? true , hlsEncryptedSupport ? true
, makeWrapper }: , makeWrapper }:
@ -15,11 +16,11 @@ with stdenv.lib;
buildPythonApplication rec { buildPythonApplication rec {
name = "youtube-dl-${version}"; name = "youtube-dl-${version}";
version = "2017.12.23"; version = "2017.12.31";
src = fetchurl { src = fetchurl {
url = "https://yt-dl.org/downloads/${version}/${name}.tar.gz"; url = "https://yt-dl.org/downloads/${version}/${name}.tar.gz";
sha256 = "12m1bjdqm9bsc1f5psnzc203avzwr070xpdr6fqr728am536q845"; sha256 = "0cq10ii96lpq3z7l1js0s59sqb4h4yqwdqinl2yf7cdjynvj62xi";
}; };
nativeBuildInputs = [ makeWrapper ]; nativeBuildInputs = [ makeWrapper ];
@ -33,7 +34,8 @@ buildPythonApplication rec {
packagesToBinPath = packagesToBinPath =
[ atomicparsley ] [ atomicparsley ]
++ optional ffmpegSupport ffmpeg ++ optional ffmpegSupport ffmpeg
++ optional rtmpSupport rtmpdump; ++ optional rtmpSupport rtmpdump
++ optional phantomjsSupport phantomjs2;
in '' in ''
wrapProgram $out/bin/youtube-dl --prefix PATH : "${makeBinPath packagesToBinPath}" wrapProgram $out/bin/youtube-dl --prefix PATH : "${makeBinPath packagesToBinPath}"
''; '';

1
pkgs/top-level/python-packages.nix
View File

@ -18873,6 +18873,7 @@ EOF
youtube-dl-light = callPackage ../tools/misc/youtube-dl { youtube-dl-light = callPackage ../tools/misc/youtube-dl {
ffmpegSupport = false; ffmpegSupport = false;
phantomjsSupport = false;
}; };
zbase32 = buildPythonPackage (rec { zbase32 = buildPythonPackage (rec {