Merge branch 'master' into core-updates

Conflicts:
	gnu/packages/image.scm
        (incorporated libtiff graft)
This commit is contained in:
Marius Bakke 2017-06-03 17:51:21 +02:00
commit d0c45d2d82
No known key found for this signature in database
GPG key ID: A2A06DF2A33A54FA
99 changed files with 3597 additions and 2885 deletions

View file

@ -372,7 +372,7 @@ Language.")
(define-public mariadb
(package
(name "mariadb")
(version "10.1.23")
(version "10.1.24")
(source (origin
(method url-fetch)
(uri (string-append "https://downloads.mariadb.org/f/"
@ -380,7 +380,7 @@ Language.")
name "-" version ".tar.gz"))
(sha256
(base32
"1gq08dj9skr0gli1nj7a8wl92w8lmmqy0sbxvkmy79dz4i713n2l"))))
"07jm9m7d5x4zdpasdjs98m36dkjl7ypc9jz4xmnczj0ybfp9kpxk"))))
(build-system cmake-build-system)
(arguments
'(#:configure-flags