diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2015-11-20 14:32:58 +0100 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2015-11-20 14:32:58 +0100 |
| commit | 333d69a5f0e7ccfe7b8c0bdb14ebd3934b3f77fb (patch) | |
| tree | 0f4757ddd2bb3d73b438eea85828d8e01c049583 /pkgs/tools/misc/youtube-dl | |
| parent | bdbbfa0d4247e203ffe3171621b614374da05f70 (diff) | |
| parent | b809f886c0bdbd4665fc65a4c308d38a30c368d8 (diff) | |
| download | nixlib-333d69a5f0e7ccfe7b8c0bdb14ebd3934b3f77fb.tar nixlib-333d69a5f0e7ccfe7b8c0bdb14ebd3934b3f77fb.tar.gz nixlib-333d69a5f0e7ccfe7b8c0bdb14ebd3934b3f77fb.tar.bz2 nixlib-333d69a5f0e7ccfe7b8c0bdb14ebd3934b3f77fb.tar.lz nixlib-333d69a5f0e7ccfe7b8c0bdb14ebd3934b3f77fb.tar.xz nixlib-333d69a5f0e7ccfe7b8c0bdb14ebd3934b3f77fb.tar.zst nixlib-333d69a5f0e7ccfe7b8c0bdb14ebd3934b3f77fb.zip | |
Merge staging into closure-size
The most complex problems were from dealing with switches reverted in the meantime (gcc5, gmp6, ncurses6). It's likely that darwin is (still) broken nontrivially.
Diffstat (limited to 'pkgs/tools/misc/youtube-dl')
| -rw-r--r-- | pkgs/tools/misc/youtube-dl/default.nix | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/pkgs/tools/misc/youtube-dl/default.nix b/pkgs/tools/misc/youtube-dl/default.nix index 1c9e19750849..2037c351d4ac 100644 --- a/pkgs/tools/misc/youtube-dl/default.nix +++ b/pkgs/tools/misc/youtube-dl/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, makeWrapper, buildPythonPackage, zip, ffmpeg +{ stdenv, fetchurl, buildPythonPackage, makeWrapper, ffmpeg, zip , pandoc ? null }: # Pandoc is required to build the package's man page. Release tarballs @@ -9,12 +9,12 @@ # the tool that doesn't have the formatted man page included. buildPythonPackage rec { - name = "youtube-dl-${version}"; - version = "2015.08.28"; + + name = "youtube-dl-${meta.version}"; src = fetchurl { - url = "http://youtube-dl.org/downloads/${version}/${name}.tar.gz"; - sha256 = "0iahbynd6fw097a4cc57w26szlbqsmhb8v5ny6qrcil0d4wdqqvp"; + url = "http://yt-dl.org/downloads/${meta.version}/${name}.tar.gz"; + sha256 = "c5a34ecbcf27ff34e1aae7c17732095309012e33ea9d1d4def613ca73f47e6be"; }; buildInputs = [ makeWrapper zip pandoc ]; @@ -24,7 +24,8 @@ buildPythonPackage rec { ''wrapProgram $out/bin/youtube-dl --prefix PATH : "${ffmpeg.bin}/bin"''; meta = with stdenv.lib; { - homepage = "http://rg3.github.com/youtube-dl/"; + version = "2015.11.10"; + homepage = http://rg3.github.io/youtube-dl/; repositories.git = https://github.com/rg3/youtube-dl.git; description = "Command-line tool to download videos from YouTube.com and other sites"; longDescription = '' |