From 5bef7749d593efc764259ba2081008f24ed42daf Mon Sep 17 00:00:00 2001 From: Andreas Enge Date: Fri, 11 Sep 2015 22:23:29 +0200 Subject: gnu: bdb: Fix indentation. * gnu/packages/databases.scm (bdb): Fix indentation. --- gnu/packages/databases.scm | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) (limited to 'gnu/packages/databases.scm') diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm index cbac16eac..96bb740b4 100644 --- a/gnu/packages/databases.scm +++ b/gnu/packages/databases.scm @@ -68,26 +68,26 @@ "doc")) ; 94 MiB of HTML docs (arguments '(#:tests? #f ; no check target available - #: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"))) + #: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")) + (zero? + (system* "./dist/configure" + (string-append "--prefix=" out) + (string-append "CONFIG_SHELL=" (which "bash")) + (string-append "SHELL=" (which "bash")) - ;; The compatibility mode is needed by some packages, - ;; notably iproute2. - "--enable-compat185")))) + ;; The compatibility mode is needed by some packages, + ;; notably iproute2. + "--enable-compat185")))) %standard-phases))) (synopsis "Berkeley database") (description -- cgit v1.3 From b86c013c68be640521b533e1dd40115e2cb72b40 Mon Sep 17 00:00:00 2001 From: Andreas Enge Date: Fri, 11 Sep 2015 22:32:32 +0200 Subject: gnu: bdb: Add configure flag to fix C++ header file. * gnu/packages/databases.scm (bdb): Build with "--enable-cxx", which causes HAVE_CXX_STDHEADERS to be defined in db_cxx.h in the output. --- gnu/packages/databases.scm | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) (limited to 'gnu/packages/databases.scm') diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm index 96bb740b4..d7e3fd91f 100644 --- a/gnu/packages/databases.scm +++ b/gnu/packages/databases.scm @@ -1,6 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2012, 2013, 2014, 2015 Ludovic Courtès -;;; Copyright © 2012, 2014 Andreas Enge +;;; Copyright © 2012, 2014, 2015 Andreas Enge ;;; Copyright © 2013 Cyril Roelandt ;;; Copyright © 2014 David Thompson ;;; Copyright © 2014, 2015 Mark H Weaver @@ -87,7 +87,12 @@ ;; The compatibility mode is needed by some packages, ;; notably iproute2. - "--enable-compat185")))) + "--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))) (synopsis "Berkeley database") (description -- cgit v1.3 From 42e666494d4594eb8aa345f84e55b0b9e5297f6e Mon Sep 17 00:00:00 2001 From: 宋文武 Date: Sat, 12 Sep 2015 11:48:17 +0800 Subject: gnu: sqlite: Update to 3.8.11.1. * gnu/packages/databases.scm (sqlite): Update to 3.8.11.1. [source](uri): Add 'http://distfiles.gentoo.org'. --- gnu/packages/databases.scm | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) (limited to 'gnu/packages/databases.scm') diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm index d7e3fd91f..98be700b8 100644 --- a/gnu/packages/databases.scm +++ b/gnu/packages/databases.scm @@ -311,7 +311,7 @@ types are supported, as is encryption.") (define-public sqlite (package (name "sqlite") - (version "3.8.10.2") + (version "3.8.11.1") (source (origin (method url-fetch) ;; TODO: Download from sqlite.org once this bug : @@ -326,12 +326,16 @@ types are supported, as is encryption.") (map (cut string-pad <> 2 #\0) other-digits)) 6 #\0)))))) - (string-append - "mirror://sourceforge/sqlite.mirror/SQLite%20" version - "/sqlite-autoconf-" numeric-version ".tar.gz"))) + (list + (string-append + "http://distfiles.gentoo.org/distfiles/" + "/sqlite-autoconf-" numeric-version ".tar.gz") + (string-append + "mirror://sourceforge/sqlite.mirror/SQLite%20" version + "/sqlite-autoconf-" numeric-version ".tar.gz")))) (sha256 (base32 - "09nnaqx50gl1vmfvdipirizr61q3s0ywlql50f9kr1bx9rdfb0l3")))) + "1dnkl4qr1dgaprbyf3jddfiynkhxnin86qabni47wjlc0fnb16gv")))) (build-system gnu-build-system) (inputs `(("readline" ,readline))) (arguments -- cgit v1.3