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

youtube-dl: upgrade to 2013.06.21

Browse Source
This commit is contained in:
Mathijs Kwik 2013-06-23 09:38:44 +02:00
parent ab3c2b4678
commit e387731b82
2 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,27 +1,25 @@
{ stdenv, fetchurl, python, pandoc, zip }: { stdenv, fetchurl, python, zip }:
let let
version = "2012.12.11"; version = "2013.06.21";
in in
stdenv.mkDerivation { stdenv.mkDerivation rec {
name = "youtube-dl-${version}"; name = "youtube-dl-${version}";
src = fetchurl { src = fetchurl {
url = "https://github.com/downloads/rg3/youtube-dl/youtube-dl.${version}.tar.gz"; url = "http://youtube-dl.org/downloads/${version}/${name}.tar.gz";
sha256 = "03zv3z8p0fi122nqj7ff8hkgqscir4s7psm03rq7dfpg1z35klmn"; sha256 = "3d4e9cc38af3c2fccfafd83d0c6382080531fd03e9067ceccc6864dfbea92b1e";
}; };
buildInputs = [ python ]; buildInputs = [ python ];
nativeBuildInputs = [ zip ] ++ nativeBuildInputs = [ zip ];
stdenv.lib.optional (stdenv.isi686 || stdenv.isx86_64) pandoc;
patchPhase = '' patchPhase = ''
rm youtube-dl rm youtube-dl
substituteInPlace Makefile --replace "#!/usr/bin/env python" "#!${python}/bin/python"
''; '';
configurePhase = '' configurePhase = ''
makeFlagsArray=( PREFIX=$out SYSCONFDIR=$out/etc ) makeFlagsArray=( PREFIX=$out SYSCONFDIR=$out/etc PYTHON=${python}/bin/python )
''; '';
meta = { meta = {

2
pkgs/top-level/all-packages.nix
View File

@ -1989,7 +1989,7 @@ let
xvfb_run = callPackage ../tools/misc/xvfb-run { inherit (texFunctions) fontsConf; }; xvfb_run = callPackage ../tools/misc/xvfb-run { inherit (texFunctions) fontsConf; };
youtubeDL = callPackage ../tools/misc/youtube-dl { inherit (haskellPackages) pandoc; }; youtubeDL = callPackage ../tools/misc/youtube-dl { };
zbar = callPackage ../tools/graphics/zbar { zbar = callPackage ../tools/graphics/zbar {
pygtk = lib.overrideDerivation pygtk (x: { pygtk = lib.overrideDerivation pygtk (x: {