From 6f96706d6f82142c5ae7391ea911aff94b49c9cf Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Tue, 8 Sep 2015 22:21:00 +0200 Subject: gnu: sqlite: Switch to alternate source URL. * gnu/packages/databases.scm (sqlite)[source]: Add fossies.org URL. --- gnu/packages/databases.scm | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) (limited to 'gnu/packages/databases.scm') diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm index cbac16eac9..53a73a208b 100644 --- a/gnu/packages/databases.scm +++ b/gnu/packages/databases.scm @@ -322,8 +322,15 @@ types are supported, as is encryption.") other-digits)) 6 #\0)))))) (string-append - "mirror://sourceforge/sqlite.mirror/SQLite%20" version - "/sqlite-autoconf-" numeric-version ".tar.gz"))) + "https://fossies.org/linux/misc/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") + )) (sha256 (base32 "09nnaqx50gl1vmfvdipirizr61q3s0ywlql50f9kr1bx9rdfb0l3")))) -- cgit v1.2.3 From 41996f22abd9a0f03893177f1fcf1a76731025bb 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 53a73a208b..e978c54ee5 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.2.3 From e4c3e2cd439f6a330fbd459097a1b79be41b4e56 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 e978c54ee5..38ff650465 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.2.3 From 51c591baa5944c3aadf53268b3713b87ada7912f Mon Sep 17 00:00:00 2001 From: Andreas Enge Date: Fri, 11 Sep 2015 22:40:15 +0200 Subject: Revert "gnu: bdb: Add configure flag to fix C++ header file." This reverts commit e4c3e2cd439f6a330fbd459097a1b79be41b4e56. --- gnu/packages/databases.scm | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) (limited to 'gnu/packages/databases.scm') diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm index 38ff650465..e978c54ee5 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, 2015 Andreas Enge +;;; Copyright © 2012, 2014 Andreas Enge ;;; Copyright © 2013 Cyril Roelandt ;;; Copyright © 2014 David Thompson ;;; Copyright © 2014, 2015 Mark H Weaver @@ -87,12 +87,7 @@ ;; 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")))) + "--enable-compat185")))) %standard-phases))) (synopsis "Berkeley database") (description -- cgit v1.2.3 From c84940ef815e4c18eaac39a7c38285b69ba31f83 Mon Sep 17 00:00:00 2001 From: Andreas Enge Date: Fri, 11 Sep 2015 22:40:22 +0200 Subject: Revert "gnu: bdb: Fix indentation." This reverts commit 41996f22abd9a0f03893177f1fcf1a76731025bb. --- 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 e978c54ee5..53a73a208b 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.2.3 From 785fb60e1fd7ed380e9b68b00e9ca89852ec5a3d Mon Sep 17 00:00:00 2001 From: David Thompson Date: Sun, 13 Sep 2015 09:04:40 -0400 Subject: gnu: redis: Update to 3.0.4 * gnu/packages/databases.scm (redis): Update to 3.0.4. --- 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 53a73a208b..c11395926a 100644 --- a/gnu/packages/databases.scm +++ b/gnu/packages/databases.scm @@ -738,14 +738,14 @@ similar to BerkeleyDB, LevelDB, etc.") (define-public redis (package (name "redis") - (version "3.0.3") + (version "3.0.4") (source (origin (method url-fetch) (uri (string-append "http://download.redis.io/releases/redis-" version".tar.gz")) (sha256 (base32 - "19cxdrk380qachw160h1x51mwj7kpkxlggfzfh19bl0nbdkgl20x")))) + "1kqjc4qrasadgnl3cg71x3g5qpw2rilyk4pwl151698rb2nr0pm3")))) (build-system gnu-build-system) (arguments '(#:tests? #f ; tests related to master/slave and replication fail -- cgit v1.2.3