gnu: mysql: Update to 5.7.11.

* gnu/packages/databases.scm (mysql): Update to 5.7.11.
[source]: Add archives as alternate download location.
[arguments]: Remove custom phase 'strip-extra-references. Add
substitution to target boost-1.60.
This commit is contained in:
Efraim Flashner 2016-03-17 21:58:50 +02:00
parent 2914af3c96
commit 23bbd7dd60

View file

@ -28,6 +28,7 @@
(define-module (gnu packages databases) (define-module (gnu packages databases)
#:use-module (gnu packages) #:use-module (gnu packages)
#:use-module (gnu packages bash) #:use-module (gnu packages bash)
#:use-module (gnu packages boost)
#:use-module (gnu packages perl) #:use-module (gnu packages perl)
#:use-module (gnu packages language) #:use-module (gnu packages language)
#:use-module (gnu packages linux) #:use-module (gnu packages linux)
@ -132,16 +133,19 @@ SQL, Key/Value, XML/XQuery or Java Object storage for their data model.")
(define-public mysql (define-public mysql
(package (package
(name "mysql") (name "mysql")
(version "5.6.25") (version "5.7.11")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append (uri (list (string-append
"http://dev.mysql.com/get/Downloads/MySQL-" "http://dev.mysql.com/get/Downloads/MySQL-"
(version-major+minor version) "/" (version-major+minor version) "/"
name "-" version ".tar.gz")) name "-" version ".tar.gz")
(string-append
"http://downloads.mysql.com/archives/get/file/"
name "-" version ".tar.gz")))
(sha256 (sha256
(base32 (base32
"1gbz5i1z3nswpq3q8f477vrx7g15j8n41pyb94k0jfnkhc5rq1qm")))) "03hzd2ikabxhh5ch2yvml2nks2wpv3qbkqmx3520in6khypwgy2l"))))
(build-system cmake-build-system) (build-system cmake-build-system)
(arguments (arguments
'(#:configure-flags '(#:configure-flags
@ -167,16 +171,11 @@ SQL, Key/Value, XML/XQuery or Java Object storage for their data model.")
"-DINSTALL_SQLBENCHDIR=") "-DINSTALL_SQLBENCHDIR=")
#:phases (modify-phases %standard-phases #:phases (modify-phases %standard-phases
(add-after (add-after
'install 'strip-extra-references 'unpack 'patch-boost-version
(lambda* (#:key outputs #:allow-other-keys) (lambda _
;; Strip references to GCC and other build-time ;; Mysql wants boost-1.59.0 specifically
;; dependencies. (substitute* "cmake/boost.cmake"
(let ((out (assoc-ref outputs "out"))) (("59") "60"))))
(for-each remove-store-references
(list (string-append out "/bin/mysqlbug")
(string-append
out "/share/mysql/docs/INFO_BIN")))
#t)))
(add-after (add-after
'install 'remove-extra-binaries 'install 'remove-extra-binaries
(lambda* (#:key outputs #:allow-other-keys) (lambda* (#:key outputs #:allow-other-keys)
@ -191,10 +190,11 @@ SQL, Key/Value, XML/XQuery or Java Object storage for their data model.")
`(("bison" ,bison) `(("bison" ,bison)
("perl" ,perl))) ("perl" ,perl)))
(inputs (inputs
`(("libaio" ,libaio) `(("boost" ,boost)
("libaio" ,libaio)
("ncurses" ,ncurses)
("openssl" ,openssl) ("openssl" ,openssl)
("zlib" ,zlib) ("zlib" ,zlib)))
("ncurses" ,ncurses)))
(home-page "http://www.mysql.com/") (home-page "http://www.mysql.com/")
(synopsis "Fast, easy to use, and popular database") (synopsis "Fast, easy to use, and popular database")
(description (description