diff options
author | Marius Bakke <mbakke@fastmail.com> | 2017-03-30 22:59:53 +0200 |
---|---|---|
committer | Marius Bakke <mbakke@fastmail.com> | 2017-03-30 22:59:53 +0200 |
commit | 84157bb8bf2c610584e0836047da4c710f8eaf76 (patch) | |
tree | be5d8c7238e32802221db55a3ee83e7f6a58affb /gnu/packages/imagemagick.scm | |
parent | fa63939acba69e11df44073a7eb687bd2ba48349 (diff) | |
parent | 03d0aa8b22223b67ec9bbd363c4d5800efdbaf82 (diff) | |
download | patches-84157bb8bf2c610584e0836047da4c710f8eaf76.tar patches-84157bb8bf2c610584e0836047da4c710f8eaf76.tar.gz |
Merge branch 'master' into core-updates
Most conflicts are from 6fd52309b8f52c9bb59fccffac53e029ce94b698.
Diffstat (limited to 'gnu/packages/imagemagick.scm')
-rw-r--r-- | gnu/packages/imagemagick.scm | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/gnu/packages/imagemagick.scm b/gnu/packages/imagemagick.scm index 73496ccfc0..6423f91f46 100644 --- a/gnu/packages/imagemagick.scm +++ b/gnu/packages/imagemagick.scm @@ -46,14 +46,14 @@ ;; The 7 release series has an incompatible API, while the 6 series is still ;; maintained. Don't update to 7 until we've made sure that the ImageMagick ;; users are ready for the 7-series API. - (version "6.9.7-10") + (version "6.9.8-3") (source (origin (method url-fetch) (uri (string-append "mirror://imagemagick/ImageMagick-" version ".tar.xz")) (sha256 (base32 - "02gvxz1xap5nm1vrgjxhkx13q6ja06vf23n28nc6cfdpb4s2xyqb")))) + "05hk841f5fw1hh7pfmpznlwcdr68ijk3s3zwqv0g009xh17q1max")))) (build-system gnu-build-system) (arguments `(#:configure-flags '("--with-frozenpaths" "--without-gcc-arch") |