;;; Copyright © 2017 Jelle Licht <jlicht@fsfe.org>
;;; Copyright © 2017 Adriano Peluso <catonano@gmail.com>
;;; Copyright © 2017 Arun Isaac <arunisaac@systemreboot.net>
-;;; Copyright © 2017, 2018, 2019 Tobias Geerinckx-Rice <me@tobias.gr>
+;;; Copyright © 2017, 2018, 2019, 2020 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2017, 2018 Alex Vong <alexvong1995@gmail.com>
;;; Copyright © 2017, 2018 Ben Woodcroft <donttrustben@gmail.com>
;;; Copyright © 2017 Rutger Helling <rhelling@mykolab.com>
;;; Copyright © 2019 Gábor Boskovits <boskovits@gmail.com>
;;; Copyright © 2019 Pierre Langlois <pierre.langlois@gmx.com>
;;; Copyright © 2019 Guillaume Le Vaillant <glv@posteo.net>
+;;; Copyright © 2020 Pierre Neidhardt <mail@ambrevar.xyz>
;;;
;;; This file is part of GNU Guix.
;;;
#:use-module (guix build-system cmake)
#:use-module (guix build-system scons)
#:use-module (guix build-system trivial)
- #:use-module ((guix build utils) #:hide (which))
#:use-module (guix utils)
#:use-module (srfi srfi-1)
#:use-module (srfi srfi-26)
(define-public memcached
(package
(name "memcached")
- (version "1.5.16")
+ (version "1.5.20")
(source
(origin
(method url-fetch)
(uri (string-append
"https://memcached.org/files/memcached-" version ".tar.gz"))
(sha256
- (base32 "0nnccb697jhdn5gqrh3phibzs6xr4nf4ryv7nmyv5vf11n4jr8j5"))))
+ (base32 "1r511qr95q0ywdaql3pdjiwzkfqxhhfzb13ilvl7mznfm4iv1myg"))))
(build-system gnu-build-system)
(inputs
`(("libevent" ,libevent)
(define-public mariadb
(package
(name "mariadb")
- (version "10.1.41")
+ (version "10.1.43")
(source (origin
(method url-fetch)
(uri (string-append "https://downloads.mariadb.com/MariaDB"
version ".tar.gz"))
(sha256
(base32
- "1wh0073lqw3d9xs150bf2q3qvjwa6886mfi9khmsn7p8vapw6irb"))
+ "1pxyq37q4p7515by7k8hs3l3css68f3bm3akx99vw4m1rxwwbm63"))
(patches (search-patches "mariadb-client-test-32bit.patch"))
(modules '((guix build utils)))
(snippet
disabled-tests)
(close-port unstable-tests)
+ ;; XXX: This test fails because it expects a latin1 charset and
+ ;; collation. See <https://jira.mariadb.org/browse/MDEV-21264>.
+ (substitute* "mysql-test/r/gis_notembedded.result"
+ (("latin1_swedish_ci") "utf8_general_ci")
+ (("\tlatin1") "\tutf8"))
+
(substitute* "mysql-test/mysql-test-run.pl"
(("/bin/ls") (which "ls"))
(("/bin/sh") (which "sh")))
#t))
(add-after
'install 'post-install
- (lambda* (#:key outputs #:allow-other-keys)
+ (lambda* (#:key inputs outputs #:allow-other-keys)
(let* ((out (assoc-ref outputs "out"))
(dev (assoc-ref outputs "dev"))
- (lib (assoc-ref outputs "lib")))
+ (lib (assoc-ref outputs "lib"))
+ (openssl (assoc-ref inputs "openssl")))
(substitute* (string-append out "/bin/mysql_install_db")
(("basedir=\"\"")
(string-append "basedir=\"" out "\"")))
(string-append dev "/share/pkgconfig"))
(rename-file (string-append out "/bin/mysql_config")
(string-append dev "/bin/mysql_config"))
+
+ ;; Embed an absolute reference to OpenSSL in mysql_config
+ ;; and the pkg-config file to avoid propagation.
+ (substitute* (list (string-append dev "/bin/mysql_config")
+ (string-append dev "/share/pkgconfig/mariadb.pc"))
+ (("-lssl -lcrypto" all)
+ (string-append "-L" openssl "/lib " all)))
+
#t))))))
(native-inputs
`(("bison" ,bison)
("libaio" ,libaio)
("libxml2" ,libxml2)
("ncurses" ,ncurses)
+ ("openssl" ,openssl-1.0)
+ ("pam" ,linux-pam)
("pcre" ,pcre)
("xz" ,xz)
("zlib" ,zlib)))
- (propagated-inputs
- ;; mariadb.pc says -lssl -lcrypto, so propagate it.
- `(("openssl" ,openssl-1.0)))
;; The test suite is very resource intensive and can take more than three
;; hours on a x86_64 system. Give slow and busy machines some leeway.
(properties '((timeout . 64800))) ;18 hours
"/share/mysql")))
#t)))))))
+(define-public mariadb-connector-c
+ (package
+ (name "mariadb-connector-c")
+ (version "3.1.6")
+ (source (origin
+ (method url-fetch)
+ (uri (string-append
+ "https://downloads.mariadb.org/f/connector-c-"
+ version "/mariadb-connector-c-"
+ version "-src.tar.gz"))
+ (sha256
+ (base32
+ "083724f5daaqyzdcx508caz6fk2hs89jff85zg28ih43vxkvnrnj"))))
+ (inputs
+ `(("openssl" ,openssl)))
+ (build-system cmake-build-system)
+ (arguments
+ ;; No tests.
+ '(#:tests? #f))
+ (home-page "https://mariadb.com/kb/en/mariadb-connector-c/")
+ (synopsis "Client library to connect to MySQL or MariaDB")
+ (description "The MariaDB Connector/C is used to connect applications
+developed in C/C++ to MariaDB and MySQL databases.")
+ (license license:lgpl2.1+)))
+
;; Don't forget to update the other postgresql packages when upgrading this one.
(define-public postgresql
(package
(name "postgresql")
- (version "10.10")
+ (version "10.11")
(source (origin
(method url-fetch)
(uri (string-append "https://ftp.postgresql.org/pub/source/v"
version "/postgresql-" version ".tar.bz2"))
(sha256
(base32
- "0lzj46dwd9cw94gnqm36bxd7jlhfdyqjrfzr3c4xd3prfn2rnkxd"))
+ "02fcmvbh0mhplj3s2jd24s642ysx7bggnf0h8bs5amh7dgzi8p8d"))
(patches (search-patches "postgresql-disable-resolve_symlinks.patch"))))
(build-system gnu-build-system)
(arguments
(package
(inherit postgresql)
(name "postgresql")
- (version "11.5")
+ (version "11.6")
(source (origin
(method url-fetch)
(uri (string-append "https://ftp.postgresql.org/pub/source/v"
version "/postgresql-" version ".tar.bz2"))
(sha256
(base32
- "106ikalvrilihlvhq7xj7snq98hgbgq6qsgjrd252wgw1c327pvz"))))))
+ "0w1iq488kpzfgfnlw4k32lz5by695mpnkq461jrgsr99z5zlz4j9"))))))
(define-public postgresql-9.6
(package
(inherit postgresql)
(name "postgresql")
- (version "9.6.15")
+ (version "9.6.16")
(source (origin
(method url-fetch)
(uri (string-append "https://ftp.postgresql.org/pub/source/v"
version "/postgresql-" version ".tar.bz2"))
(sha256
(base32
- "02hp69h2p02asfblkaahblzdz2zmawd2r11h6237y5j7yadgxn9w"))))))
+ "1rr2dgv4ams8r2lp13w85c77rkmzpb88fjlc28mvlw6zq2fblv2w"))))))
(define-public python-pymysql
(package
(define-public rocksdb
(package
(name "rocksdb")
- (version "5.18.3")
+ (version "6.5.2")
(source (origin
(method git-fetch)
(uri (git-reference
(file-name (git-file-name name version))
(sha256
(base32
- "1v2slmmr1dsgf8z0qcfg1y9x1al96859rg48b66p9nsawczd5zv9"))
+ "01f5lcrcr809jhkkvxhv743hwpcxszj4r30hy9qy1i0mvjky02vf"))
(modules '((guix build utils)))
(snippet
'(begin
(define-public redis
(package
(name "redis")
- (version "4.0.10")
+ (version "5.0.7")
(source (origin
(method url-fetch)
(uri (string-append "http://download.redis.io/releases/redis-"
version".tar.gz"))
(sha256
(base32
- "194cydhv3hf4v95ifvjvsqrs4jn3ffrkg5lvxj5d3y04lwsp9dhx"))))
+ "0ax8sf3vw0yadr41kzc04917scrg5wir1d94zmbz00b8pzm79nv1"))))
(build-system gnu-build-system)
(arguments
'(#:tests? #f ; tests related to master/slave and replication fail
(define-public lmdb
(package
(name "lmdb")
- (version "0.9.23")
+ (version "0.9.24")
(source
(origin
(method git-fetch)
(commit (string-append "LMDB_" version))))
(file-name (git-file-name name version))
(sha256
- (base32 "0ag7l5180ajvm73y59m7sn3p52xm8m972d08cshxhpwgwa4v35k6"))))
+ (base32 "088q6m8fvr12w43s461h7cvpg5hj8csaqj6n9pci150dz7bk5lxm"))))
(build-system gnu-build-system)
(arguments
`(#:test-target "test"
HCoop / jackhill / guix / guix.git / blobdiff