Merge branch 'master' into staging

This commit is contained in:
Efraim Flashner 2021-01-10 14:30:36 +02:00
commit 6985a1acb3
No known key found for this signature in database
GPG key ID: 41AAE7DCCA3D8351
149 changed files with 10542 additions and 2204 deletions

View file

@ -8,6 +8,7 @@
;;; Copyright © 2018, 2019 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2018 Alex Vong <alexvong1995@gmail.com>
;;; Copyright © 2020 Marius Bakke <marius@gnu.org>
;;; Copyright © 2020 Vinicius Monego <monego@posteo.net>
;;;
;;; This file is part of GNU Guix.
;;;
@ -175,7 +176,7 @@ script.")
(define-public graphicsmagick
(package
(name "graphicsmagick")
(version "1.3.35")
(version "1.3.36")
(source
(origin
(method url-fetch)
@ -188,7 +189,7 @@ script.")
"/GraphicsMagick-" version ".tar.xz")))
(sha256
(base32
"0l024l4hawm9s3jqrgi2j0lxgm61dqh8sgkj1017ma7y11hqv2hq"))))
"0ilg6fkppb4avzais1dvi3qf6ln7v3mzj7gjm83w7pwwfpg3ynsx"))))
(build-system gnu-build-system)
(arguments
`(#:configure-flags
@ -210,6 +211,7 @@ script.")
("libtiff" ,libtiff)
("libpng" ,libpng)
("libjpeg" ,libjpeg-turbo)
("libwebp" ,libwebp)
("freetype" ,freetype)
("bzip2" ,bzip2)
("xz" ,xz)