diff options
| author | Mark H Weaver <mhw@netris.org> | 2014-08-23 20:43:51 -0400 |
|---|---|---|
| committer | Mark H Weaver <mhw@netris.org> | 2014-08-23 20:43:51 -0400 |
| commit | ce3e35ed6af5c502029fb79cb5e2bdbca528d841 (patch) | |
| tree | f2db16e01972bc8dcf5d69e4c94b8c4da52e9547 /gnu/packages | |
| parent | fa5731baabdb4a9240aad2154847f352aed02d6e (diff) | |
| parent | f0dafadcfc0336e8d437f39c3563029eaa0f7953 (diff) | |
| download | guix-ce3e35ed6af5c502029fb79cb5e2bdbca528d841.tar.gz guix-ce3e35ed6af5c502029fb79cb5e2bdbca528d841.zip | |
Merge branch 'master' into core-updates
Diffstat (limited to 'gnu/packages')
| -rw-r--r-- | gnu/packages/bdw-gc.scm | 4 | ||||
| -rw-r--r-- | gnu/packages/gnupg.scm | 4 | ||||
| -rw-r--r-- | gnu/packages/video.scm | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/gnu/packages/bdw-gc.scm b/gnu/packages/bdw-gc.scm index df7cd1b489..66158912d7 100644 --- a/gnu/packages/bdw-gc.scm +++ b/gnu/packages/bdw-gc.scm @@ -27,14 +27,14 @@ (define-public libgc-7.2 (package (name "libgc") - (version "7.2e") + (version "7.2f") (source (origin (method url-fetch) (uri (string-append "http://www.hboehm.info/gc/gc_source/gc-" version ".tar.gz")) (sha256 (base32 - "0jxgr71rhk58dzc1ihqs51vldh2qs1m154bn41qh6q1dm145nc89")))) + "119x7p1cqw40mpwj80xfq879l9m1dkc7vbc1f3bz3kvkf8bf6p16")))) (build-system gnu-build-system) (arguments ;; Make it so that we don't rely on /proc. This is especially useful in diff --git a/gnu/packages/gnupg.scm b/gnu/packages/gnupg.scm index 384ec6289e..3207c74b0b 100644 --- a/gnu/packages/gnupg.scm +++ b/gnu/packages/gnupg.scm @@ -96,7 +96,7 @@ generation.") (define-public libgcrypt-1.5 (package (inherit libgcrypt) - (version "1.5.3") + (version "1.5.4") (source (origin (method url-fetch) @@ -104,7 +104,7 @@ generation.") version ".tar.bz2")) (sha256 (base32 - "1lar8y3lh61zl5flljpz540d78g99h4d5idfwrfw8lm3gm737xdw")))))) + "0czvqxkzd5y872ipy6s010ifwdwv29sqbnqc4pf56sd486gqvy6m")))))) (define-public libassuan (package diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index 23c63fabdb..2873c49e3b 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -58,14 +58,14 @@ (define-public ffmpeg (package (name "ffmpeg") - (version "2.3.1") + (version "2.3.3") (source (origin (method url-fetch) (uri (string-append "http://www.ffmpeg.org/releases/ffmpeg-" version ".tar.bz2")) (sha256 (base32 - "10w1sw5c9qjlaqlr77r3znzm7y0y9qpkni0mfr9rhij22562yspf")))) + "0ik4c06anh49r5b0d3rq9if4zl6ysjsa341655kzw22fl880sk5v")))) (build-system gnu-build-system) (inputs `(("fontconfig" ,fontconfig) |