From 3ad8cb4163deee77882ee4bded83a548752b896f Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Thu, 24 Nov 2016 17:05:47 +0100 Subject: gnu: sqlite: Update to 3.15.1. * gnu/packages/databases.scm (sqlite): Update to 3.15.1. [source]: Download from sqlite.org. [home-page]: Use HTTPS. (sqlite-3.15.1): Remove. * gnu/packages/php.scm (php)[inputs]: Change 'sqlite-3.15.1' to 'sqlite'. --- gnu/packages/databases.scm | 45 +++++---------------------------------------- 1 file changed, 5 insertions(+), 40 deletions(-) (limited to 'gnu/packages/databases.scm') diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm index d6746f092f..859e242cc7 100644 --- a/gnu/packages/databases.scm +++ b/gnu/packages/databases.scm @@ -507,12 +507,9 @@ for example from a shell script.") (define-public sqlite (package (name "sqlite") - (version "3.14.1") + (version "3.15.1") (source (origin (method url-fetch) - ;; TODO: Download from sqlite.org once this bug : - ;; http://lists.gnu.org/archive/html/bug-guile/2013-01/msg00027.html - ;; has been fixed. (uri (let ((numeric-version (match (string-split version #\.) ((first-digit other-digits ...) @@ -522,23 +519,11 @@ for example from a shell script.") (map (cut string-pad <> 2 #\0) other-digits)) 6 #\0)))))) - (list - (string-append - "https://fossies.org/linux/misc/sqlite-autoconf-" - numeric-version ".tar.gz") - (string-append - "http://distfiles.gentoo.org/distfiles/" - "/sqlite-autoconf-" numeric-version ".tar.gz")) - - ;; XXX: As of 2015-09-08, SourceForge is squatting the URL - ;; below, returning 200 and showing an advertising page. - ;; (string-append - ;; "mirror://sourceforge/sqlite.mirror/SQLite%20" version - ;; "/sqlite-autoconf-" numeric-version ".tar.gz") - )) + (string-append "https://sqlite.org/2016/sqlite-autoconf-" + numeric-version ".tar.gz"))) (sha256 (base32 - "19j73j44akqgc6m82wm98yvnmm3mfzmfqr8mp3n7n080d53q4wdw")))) + "1ig2d9jzzixiifmgqsl6kjcvy17jwxby3s24gfnc5qvyd6vqkyjx")))) (build-system gnu-build-system) (inputs `(("readline" ,readline))) (arguments @@ -549,7 +534,7 @@ for example from a shell script.") (list (string-append "CFLAGS=-O2 -DSQLITE_SECURE_DELETE " "-DSQLITE_ENABLE_UNLOCK_NOTIFY " "-DSQLITE_ENABLE_DBSTAT_VTAB")))) - (home-page "http://www.sqlite.org/") + (home-page "https://www.sqlite.org/") (synopsis "The SQLite database management system") (description "SQLite is a software library that implements a self-contained, serverless, @@ -558,26 +543,6 @@ widely deployed SQL database engine in the world. The source code for SQLite is in the public domain.") (license public-domain))) -(define-public sqlite-3.15.1 - (package (inherit sqlite) - (version "3.15.1") - (source (origin - (method url-fetch) - (uri (let ((numeric-version - (match (string-split version #\.) - ((first-digit other-digits ...) - (string-append first-digit - (string-pad-right - (string-concatenate - (map (cut string-pad <> 2 #\0) - other-digits)) - 6 #\0)))))) - (string-append "https://sqlite.org/2016/sqlite-autoconf-" - numeric-version ".tar.gz"))) - (sha256 - (base32 - "1ig2d9jzzixiifmgqsl6kjcvy17jwxby3s24gfnc5qvyd6vqkyjx")))))) - (define-public tdb (package (name "tdb") -- cgit v1.2.3 From 1d0ceb4775ec045af24253e232c0f8475324500a Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 12 Dec 2016 22:54:25 +0100 Subject: gnu: sqlite: Update to 3.15.2. * gnu/packages/databases.scm (sqlite): Update to 3.15.2. --- gnu/packages/databases.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/databases.scm') diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm index 859e242cc7..2f46c2a4ec 100644 --- a/gnu/packages/databases.scm +++ b/gnu/packages/databases.scm @@ -507,7 +507,7 @@ for example from a shell script.") (define-public sqlite (package (name "sqlite") - (version "3.15.1") + (version "3.15.2") (source (origin (method url-fetch) (uri (let ((numeric-version @@ -523,7 +523,7 @@ for example from a shell script.") numeric-version ".tar.gz"))) (sha256 (base32 - "1ig2d9jzzixiifmgqsl6kjcvy17jwxby3s24gfnc5qvyd6vqkyjx")))) + "0j9i1zrwxc7dfd6xr3xagal3incrlalsrk96havnas1qp5im1cq7")))) (build-system gnu-build-system) (inputs `(("readline" ,readline))) (arguments -- cgit v1.2.3 From e58db46bb8ab638d1a305c824807e2ef690bdeda Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 15 Jan 2017 23:36:31 +0100 Subject: gnu: sqlite: Update to 3.16.2. * gnu/packages/databases.scm (sqlite): Update to 3.16.2. --- gnu/packages/databases.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu/packages/databases.scm') diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm index c5e8599028..16d43a31de 100644 --- a/gnu/packages/databases.scm +++ b/gnu/packages/databases.scm @@ -507,7 +507,7 @@ for example from a shell script.") (define-public sqlite (package (name "sqlite") - (version "3.15.2") + (version "3.16.2") (source (origin (method url-fetch) (uri (let ((numeric-version @@ -519,11 +519,11 @@ for example from a shell script.") (map (cut string-pad <> 2 #\0) other-digits)) 6 #\0)))))) - (string-append "https://sqlite.org/2016/sqlite-autoconf-" + (string-append "https://sqlite.org/2017/sqlite-autoconf-" numeric-version ".tar.gz"))) (sha256 (base32 - "0j9i1zrwxc7dfd6xr3xagal3incrlalsrk96havnas1qp5im1cq7")))) + "059n4s9qd35qpbd4g29y9ay99a6f68ad7k65g430rxb6jcz0rk35")))) (build-system gnu-build-system) (inputs `(("readline" ,readline))) (arguments -- cgit v1.2.3 From 8a68a353172a7b359ee8a909441b81fb6c68b955 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 13 Feb 2017 20:14:39 +0100 Subject: gnu: sqlite: Update to 3.17.0. * gnu/packages/databases.scm (sqlite): Update to 3.17.0. --- gnu/packages/databases.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/databases.scm') diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm index 477f806734..f55b1b6d0e 100644 --- a/gnu/packages/databases.scm +++ b/gnu/packages/databases.scm @@ -665,7 +665,7 @@ for example from a shell script.") (define-public sqlite (package (name "sqlite") - (version "3.16.2") + (version "3.17.0") (source (origin (method url-fetch) (uri (let ((numeric-version @@ -681,7 +681,7 @@ for example from a shell script.") numeric-version ".tar.gz"))) (sha256 (base32 - "059n4s9qd35qpbd4g29y9ay99a6f68ad7k65g430rxb6jcz0rk35")))) + "0k472gq0p706jq4529p60znvw02hdf172qxgbdv59q0n7anqbr54")))) (build-system gnu-build-system) (inputs `(("readline" ,readline))) (arguments -- cgit v1.2.3 From 9a9d6d782c4752124912e545b411ed8189e2d754 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Wed, 22 Feb 2017 20:36:11 +0200 Subject: gnu: bdb@5.3: Support aarch64. * gnu/packages/databases.scm (bdb@5.3)[arguments]: Copy arguments from * bdb, add '--build' flag for aarch64. --- gnu/packages/databases.scm | 41 +++++++++++++++++++++++++++++++++++++++-- 1 file changed, 39 insertions(+), 2 deletions(-) (limited to 'gnu/packages/databases.scm') diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm index 93776c366c..877eac9559 100644 --- a/gnu/packages/databases.scm +++ b/gnu/packages/databases.scm @@ -7,7 +7,7 @@ ;;; Copyright © 2015 Eric Bavier ;;; Copyright © 2015 Sou Bunnbu ;;; Copyright © 2015 Leo Famulari -;;; Copyright © 2016 Efraim Flashner +;;; Copyright © 2016, 2017 Efraim Flashner ;;; Copyright © 2016 ng0 ;;; Copyright © 2016 Roel Janssen ;;; Copyright © 2016 David Craven @@ -210,7 +210,44 @@ SQL, Key/Value, XML/XQuery or Java Object storage for their data model.") version ".tar.gz")) (sha256 (base32 - "0a1n5hbl7027fbz5lm0vp0zzfp1hmxnz14wx3zl9563h83br5ag0")))))) + "0a1n5hbl7027fbz5lm0vp0zzfp1hmxnz14wx3zl9563h83br5ag0")))) + (arguments + `(#:tests? #f ; no check target available + #:disallowed-references ("doc") + #:phases + (alist-replace + 'configure + (lambda* (#:key outputs #:allow-other-keys) + (let ((out (assoc-ref outputs "out")) + (doc (assoc-ref outputs "doc"))) + ;; '--docdir' is not honored, so we need to patch. + (substitute* "dist/Makefile.in" + (("docdir[[:blank:]]*=.*") + (string-append "docdir = " doc "/share/doc/bdb"))) + + (zero? + (system* "./dist/configure" + (string-append "--prefix=" out) + (string-append "CONFIG_SHELL=" (which "bash")) + (string-append "SHELL=" (which "bash")) + + ;; Bdb doesn't recognize aarch64 as an architecture. + ,@(if (string=? "aarch64-linux" (%current-system)) + '("--build=aarch64-unknown-linux-gnu") + '()) + + ;; Remove 7 MiB of .a files. + "--disable-static" + + ;; The compatibility mode is needed by some packages, + ;; notably iproute2. + "--enable-compat185" + + ;; The following flag is needed so that the inclusion + ;; of db_cxx.h into C++ files works; it leads to + ;; HAVE_CXX_STDHEADERS being defined in db_cxx.h. + "--enable-cxx")))) + %standard-phases))))) (define-public leveldb (package -- cgit v1.2.3 From 5ac097e28c3b654ae7ae821e757599e1738e23aa Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 26 Mar 2017 09:10:30 +0200 Subject: gnu: libpqxx: Fix build with newer sed. * gnu/packages/databases.scm (libpqxx)[arguments]: Add 'fix-sed-command' phase that corrects a typo in the configure script. --- gnu/packages/databases.scm | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) (limited to 'gnu/packages/databases.scm') diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm index 8b01a2f01b..be92c416fb 100644 --- a/gnu/packages/databases.scm +++ b/gnu/packages/databases.scm @@ -1349,7 +1349,15 @@ trees (LSM), for sustained throughput under random insert workloads.") `(("python" ,python-2))) (inputs `(("postgresql" ,postgresql))) (arguments - `(#:tests? #f)) ; # FAIL: 1 + `(#:tests? #f ; # FAIL: 1 + #:phases + (modify-phases %standard-phases + (add-before 'configure 'fix-sed-command + (lambda _ + ;; Newer sed versions error out if double brackets are not used. + (substitute* "configure" + (("\\[:space:\\]") "[[:space:]]")) + #t))))) (synopsis "C++ connector for PostgreSQL") (description "Libpqxx is a C++ library to enable user programs to communicate with the -- cgit v1.2.3 From b4f67b7ebb44fa0a6c8abeb4d6fc3bb2ac2de329 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Mon, 27 Mar 2017 11:52:48 +0300 Subject: gnu: mysql: Disable tests on aarch64-linux. * gnu/packages/databases.scm (mysql)[arguments]: Disable the test suite on aarch64-linux. --- gnu/packages/databases.scm | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'gnu/packages/databases.scm') diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm index be92c416fb..a47f844c75 100644 --- a/gnu/packages/databases.scm +++ b/gnu/packages/databases.scm @@ -344,7 +344,12 @@ mapping from string keys to string values.") (for-each delete-file (find-files (string-append out "/bin") "_embedded$")) - #t)))))) + #t)))) + ;; On aarch64 the test suite runs out of memory and fails. + ,@(if (string-prefix? "aarch64-linux" + (or (%current-target-system) (%current-system))) + '(#:tests? #f) + '()))) (native-inputs `(("bison" ,bison) ("perl" ,perl))) -- cgit v1.2.3