diff options
author | Marius Bakke <mbakke@fastmail.com> | 2019-03-23 22:50:07 +0100 |
---|---|---|
committer | Marius Bakke <mbakke@fastmail.com> | 2019-03-23 22:50:07 +0100 |
commit | 3cb61ca85a634db2dcc2badaf3492440bf621d92 (patch) | |
tree | 72561a5f7056aa29cec7d50fb8b960b32b44a585 /gnu/packages/imagemagick.scm | |
parent | a60370727a77d1658307698276239c153d8279e8 (diff) | |
parent | f92854fea150f0d47c4984f87bf21bd5f8051820 (diff) | |
download | guix-3cb61ca85a634db2dcc2badaf3492440bf621d92.tar guix-3cb61ca85a634db2dcc2badaf3492440bf621d92.tar.gz |
Merge branch 'master' into staging
Diffstat (limited to 'gnu/packages/imagemagick.scm')
-rw-r--r-- | gnu/packages/imagemagick.scm | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/gnu/packages/imagemagick.scm b/gnu/packages/imagemagick.scm index 0207eb6569..0857fed5d6 100644 --- a/gnu/packages/imagemagick.scm +++ b/gnu/packages/imagemagick.scm @@ -5,7 +5,7 @@ ;;; Copyright © 2016 Leo Famulari <leo@famulari.name> ;;; Copyright © 2016 Mark H Weaver <mhw@netris.org> ;;; Copyright © 2017 Efraim Flashner <efraim@flashner.co.il> -;;; Copyright © 2018 Tobias Geerinckx-Rice <me@tobias.gr> +;;; Copyright © 2018, 2019 Tobias Geerinckx-Rice <me@tobias.gr> ;;; Copyright © 2018 Alex Vong <alexvong1995@gmail.com> ;;; ;;; This file is part of GNU Guix. @@ -170,19 +170,19 @@ script.") (define-public graphicsmagick (package (name "graphicsmagick") - (version "1.3.30") - (source (origin - (method url-fetch) - (uri - (list - (string-append "mirror://sourceforge/" name "/" name - "/" version "/GraphicsMagick-" version ".tar.xz") - (string-append "ftp://ftp.graphicsmagick.org/pub/" - "GraphicsMagick/" (version-major+minor version) - "/GraphicsMagick-" version ".tar.xz"))) - (sha256 - (base32 - "1warar0731xf94r4bn5x1km85rjabl4iq8r0dk3ywmczap3farfr")))) + (version "1.3.31") + (source + (origin + (method url-fetch) + (uri + (list + (string-append "mirror://sourceforge/graphicsmagick/graphicsmagick" + "/" version "/GraphicsMagick-" version ".tar.xz") + (string-append "ftp://ftp.graphicsmagick.org/pub/" + "GraphicsMagick/" (version-major+minor version) + "/GraphicsMagick-" version ".tar.xz"))) + (sha256 + (base32 "0y22740f25qxsqqqg26xqlfp920dm57b7hrgaqmx7azksrcvnsq9")))) (build-system gnu-build-system) (arguments `(#:configure-flags |