Merge branch 'master' into core-updates

This commit is contained in:
Mark H Weaver 2016-10-19 10:54:36 -04:00
commit d2478b4cdd
No known key found for this signature in database
GPG key ID: 7CEF29847562C516
68 changed files with 1712 additions and 1976 deletions

View file

@ -210,7 +210,7 @@ SQL, Key/Value, XML/XQuery or Java Object storage for their data model.")
(define-public mysql
(package
(name "mysql")
(version "5.7.15")
(version "5.7.16")
(source (origin
(method url-fetch)
(uri (list (string-append
@ -222,7 +222,7 @@ SQL, Key/Value, XML/XQuery or Java Object storage for their data model.")
name "-" version ".tar.gz")))
(sha256
(base32
"0mlrxcvkn6bf869hjw9fb6m24ak26ndffnd91b4mknmz8cqkb1ch"))))
"198qhd9bdm0fnpp307mgby2aar92yzya0937kxi7bcpdfjcvada9"))))
(build-system cmake-build-system)
(arguments
`(#:configure-flags
@ -285,7 +285,7 @@ Language.")
(define-public mariadb
(package
(name "mariadb")
(version "10.1.17")
(version "10.1.18")
(source (origin
(method url-fetch)
(uri (string-append "https://downloads.mariadb.org/f/"
@ -293,7 +293,7 @@ Language.")
name "-" version ".tar.gz"))
(sha256
(base32
"1ddalhxxcn95qp5b50z213niylcd0s6bqphid0c7c624wg2mm92c"))))
"0wrvhyck95czhz553834i9im7ljvn8k2byakcinlji7zx43njcyp"))))
(build-system cmake-build-system)
(arguments
'(#:configure-flags