diff options
author | Andreas Enge <andreas@enge.fr> | 2016-07-25 21:58:36 +0200 |
---|---|---|
committer | Andreas Enge <andreas@enge.fr> | 2016-07-25 21:58:36 +0200 |
commit | 14656f44959a519239910b88b783fa6adbbd8d40 (patch) | |
tree | 0ece327363bc6ee3d0cacba13c751361091b6ca8 /gnu/packages/video.scm | |
parent | d8eb912132ccdff955e3318fe549c5f7f674adf8 (diff) | |
parent | 424a323e92d92284efcd30cf548d1f41c556d592 (diff) | |
download | gnu-guix-14656f44959a519239910b88b783fa6adbbd8d40.tar gnu-guix-14656f44959a519239910b88b783fa6adbbd8d40.tar.gz |
Merge remote-tracking branch 'origin/master' into core-updates
Diffstat (limited to 'gnu/packages/video.scm')
-rw-r--r-- | gnu/packages/video.scm | 13 |
1 files changed, 3 insertions, 10 deletions
diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index 948ab5ac8a..d5880c45e2 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -805,14 +805,7 @@ SVCD, DVD, 3ivx, DivX 3/4/5, WMV and H.264 movies.") ("pulseaudio" ,pulseaudio) ("rsound" ,rsound) ("vapoursynth" ,vapoursynth) - ("waf" ,(origin - (method url-fetch) - ;; Keep this in sync with the version in the bootstrap.py - ;; script of the source tarball. - (uri "http://www.freehackers.org/~tnagy/release/waf-1.8.12") - (sha256 - (base32 - "12y9c352zwliw0zk9jm2lhynsjcf5jy0k1qch1c1av8hnbm2pgq1")))) + ("waf" ,python-waf) ("youtube-dl" ,youtube-dl) ("zlib" ,zlib))) (arguments @@ -902,7 +895,7 @@ access to mpv's powerful playback capabilities.") (define-public youtube-dl (package (name "youtube-dl") - (version "2016.06.14") + (version "2016.07.22") (source (origin (method url-fetch) (uri (string-append "https://youtube-dl.org/downloads/" @@ -910,7 +903,7 @@ access to mpv's powerful playback capabilities.") version ".tar.gz")) (sha256 (base32 - "0fmvpqipc1xwagvk7ih4slmv1xz1rb6s8wpndhypwvrq4pnnm9ns")))) + "02wcxpcbpvsbvyxcnhhf94ma0x5dcg4fygnxxca2h31dp47dkak9")))) (build-system python-build-system) (home-page "https://youtube-dl.org") (arguments |