From 30d900d4eeb203ab6766bb7dabfeba62263d1617 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 15 Apr 2018 21:36:44 +0200 Subject: gnu: sqlite: Update to 3.23.1. * gnu/packages/databases.scm (sqlite): Update to 3.23.1. --- 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 441a6977f6..bd12f4cdb1 100644 --- a/gnu/packages/databases.scm +++ b/gnu/packages/databases.scm @@ -1008,7 +1008,7 @@ for example from a shell script.") (define-public sqlite (package (name "sqlite") - (version "3.23.0") + (version "3.23.1") (source (origin (method url-fetch) (uri (let ((numeric-version @@ -1024,7 +1024,7 @@ for example from a shell script.") numeric-version ".tar.gz"))) (sha256 (base32 - "0jbf78g3cm5wq77k7sfg8fb6rz44hnp9hs7p5d66fwd000c1lwdp")))) + "09ggapjhqjb2pzk0wkfczil77plijg3d77m2bpzlwx2y7ql2p14j")))) (build-system gnu-build-system) (inputs `(("readline" ,readline))) (arguments -- cgit 1.4.1 From d30e9e61098a4fc1b0e5764a77ca15d2d63d8ae4 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 12 Jun 2018 13:06:38 +0200 Subject: gnu: sqlite: Update to 3.24.0. * gnu/packages/databases.scm (sqlite): Update to 3.24.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 94eb68486b..7690a85f1b 100644 --- a/gnu/packages/databases.scm +++ b/gnu/packages/databases.scm @@ -1008,7 +1008,7 @@ for example from a shell script.") (define-public sqlite (package (name "sqlite") - (version "3.23.1") + (version "3.24.0") (source (origin (method url-fetch) (uri (let ((numeric-version @@ -1024,7 +1024,7 @@ for example from a shell script.") numeric-version ".tar.gz"))) (sha256 (base32 - "09ggapjhqjb2pzk0wkfczil77plijg3d77m2bpzlwx2y7ql2p14j")))) + "0jmprv2vpggzhy7ma4ynmv1jzn3pfiwzkld0kkg6hvgvqs44xlfr")))) (build-system gnu-build-system) (inputs `(("readline" ,readline))) (arguments -- cgit 1.4.1 From cb9a84bd89f9d38f1177afd86e8a04080709588b Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 3 Jul 2018 10:41:02 +0300 Subject: gnu: gdbm: Update to 1.16. * gnu/packages/databases.scm (gdbm): Update to 1.16. --- 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 9cbdf616c0..bb70005064 100644 --- a/gnu/packages/databases.scm +++ b/gnu/packages/databases.scm @@ -163,14 +163,14 @@ either single machines or networked clusters.") (define-public gdbm (package (name "gdbm") - (version "1.14.1") + (version "1.16") (source (origin (method url-fetch) (uri (string-append "mirror://gnu/gdbm/gdbm-" version ".tar.gz")) (sha256 (base32 - "0pxwz3jlwvglq2mrbxvrjgr8pa0aj73p3v9sxmdlj570zw0gzknd")))) + "0bsimfb0h9vkxh6hzz66hrpxrzcqla58y0gvzvpc784x4p38p8f8")))) (arguments `(#:configure-flags '("--enable-libgdbm-compat"))) (build-system gnu-build-system) (home-page "http://www.gnu.org.ua/software/gdbm") -- cgit 1.4.1 From 9871a896aacd4daa0d57fb83aa18eaf5f85c74f5 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 21 Aug 2018 07:11:00 +0200 Subject: gnu: python-sqlalchemy: Use 'invoke'. * gnu/packages/databases.scm (python-sqlalchemy)[arguments]: Use INVOKE instead of SYSTEM*. --- gnu/packages/databases.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu/packages/databases.scm') diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm index 5820314289..0ac2905f55 100644 --- a/gnu/packages/databases.scm +++ b/gnu/packages/databases.scm @@ -2267,7 +2267,7 @@ Database API 2.0T.") `(#:phases (modify-phases %standard-phases (replace 'check - (lambda _ (zero? (system* "py.test"))))))) + (lambda _ (invoke "py.test")))))) (home-page "http://www.sqlalchemy.org") (synopsis "Database abstraction library") (description -- cgit 1.4.1 From 2be1b754ba9d460b7fd16f790922aed4b3d45037 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 21 Aug 2018 07:19:33 +0200 Subject: gnu: python-sqlalchemy: Update to 1.2.11. * gnu/packages/databases.scm (python-sqlalchemy): Update to 1.2.11. --- 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 0ac2905f55..2989881028 100644 --- a/gnu/packages/databases.scm +++ b/gnu/packages/databases.scm @@ -2249,7 +2249,7 @@ Database API 2.0T.") (define-public python-sqlalchemy (package (name "python-sqlalchemy") - (version "1.0.12") + (version "1.2.11") (source (origin (method url-fetch) @@ -2257,7 +2257,7 @@ Database API 2.0T.") "SQLAlchemy/SQLAlchemy-" version ".tar.gz")) (sha256 (base32 - "1l8qclhd0s90w3pvwhi5mjxdwr5j7gw7cjka2fx6f2vqmq7f4yb6")))) + "094mmbs4igrxplfyqd59j90jb83ixpbbzqc0w49yw81m82nnjrgg")))) (build-system python-build-system) (native-inputs `(("python-cython" ,python-cython) ;for c extensions -- cgit 1.4.1 From fdb222033c7bf4580bea0158840e9bb7905a00bc Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 21 Aug 2018 17:25:23 +0200 Subject: gnu: gdbm: Update to 1.18. * gnu/packages/databases.scm (gdbm): Update to 1.18. --- 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 2989881028..bf0484197b 100644 --- a/gnu/packages/databases.scm +++ b/gnu/packages/databases.scm @@ -163,14 +163,14 @@ either single machines or networked clusters.") (define-public gdbm (package (name "gdbm") - (version "1.16") + (version "1.18") (source (origin (method url-fetch) (uri (string-append "mirror://gnu/gdbm/gdbm-" version ".tar.gz")) (sha256 (base32 - "0bsimfb0h9vkxh6hzz66hrpxrzcqla58y0gvzvpc784x4p38p8f8")))) + "1kimnv12bzjjhaqk4c8w2j6chdj9c6bg21lchaf7abcyfss2r0mq")))) (arguments `(#:configure-flags '("--enable-libgdbm-compat"))) (build-system gnu-build-system) (home-page "http://www.gnu.org.ua/software/gdbm") -- cgit 1.4.1 From fb76ef8477f189d35c1e91bf026236f5627f3a27 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 22 Aug 2018 16:45:17 +0200 Subject: gnu: Remove GCC ICE workarounds. * gnu/packages/patches/doxygen-gcc-ice.patch, gnu/packages/patches/mariadb-gcc-ice.patch, gnu/packages/patches/perf-gcc-ice.patch: Delete files * gnu/local.mk (dist_patch_DATA): Adjust accordingly. * gnu/packages/databases.scm (mariadb)[source](patches): Likewise. * gnu/packages/linux.scm (perf)[source](patches): Likewise. * gnu/packages/documentation.scm (doxygen)[inputs, arguments]: Likewise. --- gnu/local.mk | 3 --- gnu/packages/databases.scm | 3 +-- gnu/packages/documentation.scm | 15 +-------------- gnu/packages/linux.scm | 4 +--- gnu/packages/patches/doxygen-gcc-ice.patch | 25 ------------------------- gnu/packages/patches/mariadb-gcc-ice.patch | 24 ------------------------ gnu/packages/patches/perf-gcc-ice.patch | 13 ------------- 7 files changed, 3 insertions(+), 84 deletions(-) delete mode 100644 gnu/packages/patches/doxygen-gcc-ice.patch delete mode 100644 gnu/packages/patches/mariadb-gcc-ice.patch delete mode 100644 gnu/packages/patches/perf-gcc-ice.patch (limited to 'gnu/packages/databases.scm') diff --git a/gnu/local.mk b/gnu/local.mk index 341e1c4fdf..e4a7c3d141 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -641,7 +641,6 @@ dist_patch_DATA = \ %D%/packages/patches/doc++-include-directives.patch \ %D%/packages/patches/doc++-segfault-fix.patch \ %D%/packages/patches/dovecot-trees-support-dovecot-2.3.patch \ - %D%/packages/patches/doxygen-gcc-ice.patch \ %D%/packages/patches/doxygen-test.patch \ %D%/packages/patches/dvd+rw-tools-add-include.patch \ %D%/packages/patches/eigen-arm-neon-fixes.patch \ @@ -927,7 +926,6 @@ dist_patch_DATA = \ %D%/packages/patches/mailutils-uninitialized-memory.patch \ %D%/packages/patches/make-glibc-compat.patch \ %D%/packages/patches/make-impure-dirs.patch \ - %D%/packages/patches/mariadb-gcc-ice.patch \ %D%/packages/patches/mariadb-client-test-32bit.patch \ %D%/packages/patches/mars-install.patch \ %D%/packages/patches/mars-sfml-2.3.patch \ @@ -1008,7 +1006,6 @@ dist_patch_DATA = \ %D%/packages/patches/patchelf-rework-for-arm.patch \ %D%/packages/patches/patchutils-xfail-gendiff-tests.patch \ %D%/packages/patches/patch-hurd-path-max.patch \ - %D%/packages/patches/perf-gcc-ice.patch \ %D%/packages/patches/perl-autosplit-default-time.patch \ %D%/packages/patches/perl-dbd-mysql-CVE-2017-10788.patch \ %D%/packages/patches/perl-deterministic-ordering.patch \ diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm index bf0484197b..4c0a6d4c28 100644 --- a/gnu/packages/databases.scm +++ b/gnu/packages/databases.scm @@ -636,8 +636,7 @@ Language.") (sha256 (base32 "0k9walaglwmwdwmkq48ir17g98n83vliyyg5wck22rjgxn2xk4cy")) - (patches (search-patches "mariadb-gcc-ice.patch" - "mariadb-client-test-32bit.patch")) + (patches (search-patches "mariadb-client-test-32bit.patch")) (modules '((guix build utils))) (snippet '(begin diff --git a/gnu/packages/documentation.scm b/gnu/packages/documentation.scm index f533535f03..9425df707c 100644 --- a/gnu/packages/documentation.scm +++ b/gnu/packages/documentation.scm @@ -139,23 +139,10 @@ markup) can be customized and extended by the user.") ("libxml2" ,libxml2) ; provides xmllint for the tests ("python" ,python-2))) ; for creating the documentation (inputs - `(("bash" ,bash-minimal) - ,@(if (string-prefix? "armhf-" (%current-system)) - `(("gcc-ice-patch" ,@(search-patches "doxygen-gcc-ice.patch"))) - '()))) + `(("bash" ,bash-minimal))) (arguments `(#:test-target "tests" #:phases (modify-phases %standard-phases - ;; Work around an ICE that shows up on native compiles for - ;; armhf-linux. - ,@(if (string-prefix? "armhf-" (%current-system)) - `((add-after 'unpack 'apply-gcc-patch - (lambda* (#:key inputs #:allow-other-keys) - (let ((patch (assoc-ref inputs "gcc-ice-patch"))) - (invoke "patch" "-p1" "--force" - "--input" patch))))) - '()) - (add-before 'configure 'patch-sh (lambda* (#:key inputs #:allow-other-keys) (substitute* "src/portable.cpp" diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index d7958ac470..cbb8f8f01f 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -2508,9 +2508,7 @@ in a digital read-out.") (package (name "perf") (version (package-version linux-libre)) - (source (origin - (inherit (package-source linux-libre)) - (patches (search-patches "perf-gcc-ice.patch")))) + (source (package-source linux-libre)) (build-system gnu-build-system) (arguments '(#:phases diff --git a/gnu/packages/patches/doxygen-gcc-ice.patch b/gnu/packages/patches/doxygen-gcc-ice.patch deleted file mode 100644 index fbfedcb7ab..0000000000 --- a/gnu/packages/patches/doxygen-gcc-ice.patch +++ /dev/null @@ -1,25 +0,0 @@ -Work around this GCC ICE: . It shows up -only when doing native compiles on armhf-linux. - -Yes it's a terrible patch, but it does the job. - ---- doxygen-1.8.13/qtools/qutfcodec.cpp 1970-01-01 01:00:00.000000000 +0100 -+++ doxygen-1.8.13/qtools/qutfcodec.cpp 2018-06-08 14:14:29.614009929 +0200 -@@ -189,7 +189,7 @@ int QUtf16Codec::heuristicContentMatch(c - } - - -- -+volatile const void *bomPointer = &QChar::byteOrderMark; - - class QUtf16Encoder : public QTextEncoder { - bool headerdone; -@@ -209,7 +209,7 @@ public: - headerdone = TRUE; - len_in_out = (1+uc.length())*(int)sizeof(QChar); - QCString d(len_in_out); -- memcpy(d.rawData(),&QChar::byteOrderMark,sizeof(QChar)); -+ memcpy(d.rawData(),(void *)bomPointer,sizeof(QChar)); - memcpy(d.rawData()+sizeof(QChar),uc.unicode(),uc.length()*sizeof(QChar)); - return d; - } diff --git a/gnu/packages/patches/mariadb-gcc-ice.patch b/gnu/packages/patches/mariadb-gcc-ice.patch deleted file mode 100644 index 59b188f45a..0000000000 --- a/gnu/packages/patches/mariadb-gcc-ice.patch +++ /dev/null @@ -1,24 +0,0 @@ -Work around this GCC ICE: . It shows up -only when doing native compiles on armhf-linux. - ---- mariadb-10.1.33/plugin/semisync/semisync_master.cc 2018-07-28 02:13:12.604020250 +0200 -+++ mariadb-10.1.33/plugin/semisync/semisync_master.cc 2018-07-28 02:14:11.907753417 +0200 -@@ -847,6 +847,8 @@ - return function_exit(kWho, 0); - } - -+volatile const void *kSyncHeaderPtr = &ReplSemiSyncMaster::kSyncHeader; -+ - int ReplSemiSyncMaster::reserveSyncHeader(unsigned char *header, - unsigned long size) - { -@@ -873,7 +875,7 @@ - /* Set the magic number and the sync status. By default, no sync - * is required. - */ -- memcpy(header, kSyncHeader, sizeof(kSyncHeader)); -+ memcpy(header, (void *)kSyncHeaderPtr, sizeof(kSyncHeader)); - hlen= sizeof(kSyncHeader); - } - return function_exit(kWho, hlen); - diff --git a/gnu/packages/patches/perf-gcc-ice.patch b/gnu/packages/patches/perf-gcc-ice.patch deleted file mode 100644 index 58ab5359c2..0000000000 --- a/gnu/packages/patches/perf-gcc-ice.patch +++ /dev/null @@ -1,13 +0,0 @@ -Work around this GCC ICE: . - ---- linux-4.16.13/tools/perf/util/header.c 2018-06-04 11:30:39.368146035 +0200 -+++ linux-4.16.13/tools/perf/util/header.c 2018-06-04 11:34:04.667212378 +0200 -@@ -135,7 +135,7 @@ int do_write(struct feat_fd *ff, const v - int write_padded(struct feat_fd *ff, const void *bf, - size_t count, size_t count_aligned) - { -- static const char zero_buf[NAME_ALIGN]; -+ static const char zero_buf[NAME_ALIGN] = { 0 }; - int err = do_write(ff, bf, count); - - if (!err) -- cgit 1.4.1 From 1d957c79b698241df612fc64b57a1c55cc7b55be Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 9 Sep 2018 13:19:50 +0200 Subject: gnu: mariadb: Update to 10.1.36. * gnu/packages/databases.scm (mariadb): Update to 10.1.36. [arguments]: Disable one new test. --- gnu/packages/databases.scm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'gnu/packages/databases.scm') diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm index c652f39b12..e01ab88c2c 100644 --- a/gnu/packages/databases.scm +++ b/gnu/packages/databases.scm @@ -621,7 +621,7 @@ Language.") (define-public mariadb (package (name "mariadb") - (version "10.1.35") + (version "10.1.36") (source (origin (method url-fetch) (uri (string-append "https://downloads.mariadb.org/f/" @@ -629,7 +629,7 @@ Language.") name "-" version ".tar.gz")) (sha256 (base32 - "0k9walaglwmwdwmkq48ir17g98n83vliyyg5wck22rjgxn2xk4cy")) + "0n5aj76mn9rxc21l2kjmfrg10bmsyy4cic68khjr94iby262wx5d")) (patches (search-patches "mariadb-client-test-32bit.patch")) (modules '((guix build utils))) (snippet @@ -707,6 +707,7 @@ Language.") ;; See . "main.join_cache" "main.explain_non_select" + "main.stat_tables_innodb" "roles.acl_statistics" ;; FIXME: This test fails on i686: -- cgit 1.4.1 From 4333d48a825c2327c22464de631cf81d05dd2719 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 9 Sep 2018 13:22:43 +0200 Subject: gnu: mariadb: Move unbundle substitutions to source snippet. * gnu/packages/databases.scm (mariadb)[source](snippet): Add two substitutions from ... [arguments]: The 'unbundle' phase here. Rename to 'fix-pcre-detection. --- gnu/packages/databases.scm | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-) (limited to 'gnu/packages/databases.scm') diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm index e01ab88c2c..ff33088cb4 100644 --- a/gnu/packages/databases.scm +++ b/gnu/packages/databases.scm @@ -636,6 +636,13 @@ Language.") '(begin ;; Delete bundled snappy and xz. (delete-file-recursively "storage/tokudb/PerconaFT/third_party") + (substitute* "storage/tokudb/PerconaFT/CMakeLists.txt" + ;; This file checks that the bundled sources are present and + ;; declares build procedures for them. + (("^include\\(TokuThirdParty\\)") "")) + (substitute* "storage/tokudb/PerconaFT/ft/CMakeLists.txt" + ;; Don't attempt to use the procedures we just removed. + ((" build_lzma build_snappy") "")) ;; Preserve CMakeLists.txt for these. (for-each (lambda (file) @@ -679,7 +686,7 @@ Language.") "-DINSTALL_SHAREDIR=share") #:phases (modify-phases %standard-phases - (add-after 'unpack 'unbundle + (add-after 'unpack 'fix-pcre-detection (lambda _ ;; The bundled PCRE in MariaDB has a patch that was upstreamed ;; in version 8.34. Unfortunately the upstream patch behaves @@ -688,16 +695,6 @@ Language.") ;; XXX: Consider patching PCRE instead. (substitute* "cmake/pcre.cmake" ((" OR NOT PCRE_STACK_SIZE_OK") "")) - - (substitute* "storage/tokudb/PerconaFT/ft/CMakeLists.txt" - ;; Remove dependency on these CMake targets. - ((" build_lzma build_snappy") "")) - - (substitute* "storage/tokudb/PerconaFT/CMakeLists.txt" - ;; This file checks that the bundled sources are present and - ;; declares build procedures for them. We don't need that. - (("^include\\(TokuThirdParty\\)") "")) - #t)) (add-after 'unpack 'adjust-tests (lambda _ -- cgit 1.4.1 From 702a87f2d14809ef241cd2dbb947c70ec59b9f08 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 11 Sep 2018 18:31:55 +0200 Subject: gnu: perl-dbd-mysql: Update to 4.047. * gnu/packages/databases.scm (perl-dbd-mysql): Update to 4.047. [arguments]: Add 'skip-library-detection' phase. --- gnu/packages/databases.scm | 22 ++++++++++++++++++---- 1 file changed, 18 insertions(+), 4 deletions(-) (limited to 'gnu/packages/databases.scm') diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm index ecc14c259a..9db892a0b7 100644 --- a/gnu/packages/databases.scm +++ b/gnu/packages/databases.scm @@ -1458,7 +1458,7 @@ columns, primary keys, unique constraints and relationships.") (define-public perl-dbd-mysql (package (name "perl-dbd-mysql") - (version "4.046") + (version "4.047") (source (origin (method url-fetch) @@ -1466,10 +1466,24 @@ columns, primary keys, unique constraints and relationships.") "DBD-mysql-" version ".tar.gz")) (sha256 (base32 - "1xziv9w87cl3fbl1mqkdrx28mdqly3gs6gs1ynbmpl2rr4p6arb1")))) + "0idizgr0hr7sj92fbdlb3gv6cva15jkpaq28wrdw4j4p7awx2mls")))) (build-system perl-build-system) - ;; Tests require running MySQL server - (arguments `(#:tests? #f)) + (arguments + `(#:phases + (modify-phases %standard-phases + (add-before 'configure 'skip-library-detection + ;; Avoid depencies on perl-devel-checklib, openssl, and zlib. They + ;; are really only needed for the test suite; their absence does not + ;; affect the build or the end result. + (lambda _ + (substitute* "Makefile.PL" + (("use Devel::CheckLib;" match) + (string-append "# " match)) + (("assert_lib") + "print")) + #t))) + ;; Tests require running MySQL server. + #:tests? #f)) (propagated-inputs `(("perl-dbi" ,perl-dbi) ("mysql" ,mysql))) -- cgit 1.4.1 From eeecbe09cc497b1ed9a2000283a5767903ba2fb4 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 21 Sep 2018 08:07:25 +0200 Subject: gnu: perl-dbd-mysql: Update to 4.048. * gnu/packages/databases.scm (perl-dbd-mysql): Update to 4.048. --- 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 9db892a0b7..9e8c9d8f9e 100644 --- a/gnu/packages/databases.scm +++ b/gnu/packages/databases.scm @@ -1458,15 +1458,15 @@ columns, primary keys, unique constraints and relationships.") (define-public perl-dbd-mysql (package (name "perl-dbd-mysql") - (version "4.047") + (version "4.048") (source (origin (method url-fetch) - (uri (string-append "mirror://cpan/authors/id/C/CA/CAPTTOFU/" + (uri (string-append "mirror://cpan/authors/id/M/MI/MICHIELB/" "DBD-mysql-" version ".tar.gz")) (sha256 (base32 - "0idizgr0hr7sj92fbdlb3gv6cva15jkpaq28wrdw4j4p7awx2mls")))) + "1zqmch6c9gq06z90mkmk1skajk2kaggriw19ym5w04l7wv5gydqp")))) (build-system perl-build-system) (arguments `(#:phases -- cgit 1.4.1 From a4764ff00afff0840fb7e92c73d5137281fbc4b9 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 25 Sep 2018 10:55:40 +0200 Subject: gnu: python-fakeredis: Edit description. * gnu/packages/databases.scm (python-fakeredis)[description]: Fix (upstream) typo. Get carried away. --- gnu/packages/databases.scm | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) (limited to 'gnu/packages/databases.scm') diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm index 9e8c9d8f9e..9c966494ad 100644 --- a/gnu/packages/databases.scm +++ b/gnu/packages/databases.scm @@ -2673,12 +2673,14 @@ parsing code in hiredis. It primarily speeds up parsing of multi bulk replies." `(#:tests? #f)) (home-page "https://github.com/jamesls/fakeredis") (synopsis "Fake implementation of redis API for testing purposes") - (description "Fakeredis is a pure python implementation of the redis-py -python client that simulates talking to a redis server. This was created for a -single purpose: to write unittests. Setting up redis is not hard, but many time - you want to write unittests that do not talk to an external server (such as -redis). This module now allows tests to simply use this module as a reasonable -substitute for redis.") + (description + "Fakeredis is a pure-Python implementation of the redis-py Python client +that simulates talking to a redis server. It was created for a single purpose: +to write unit tests. + +Setting up redis is not hard, but one often wants to write unit tests that don't +talk to an external server such as redis. This module can be used as a +reasonable substitute.") (license license:bsd-3))) (define-public python2-fakeredis -- cgit 1.4.1 From 944a3a8b8e36e1e1b9632a774c9ae4e63647d21c Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Wed, 3 Oct 2018 15:22:44 +0200 Subject: gnu: recutils: Adjust Gnulib to libc 2.28. Fixes . * gnu/packages/databases.scm (recutils)[modules, snippet]: New fields. --- gnu/packages/databases.scm | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) (limited to 'gnu/packages/databases.scm') diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm index b6e5012677..fecf661833 100644 --- a/gnu/packages/databases.scm +++ b/gnu/packages/databases.scm @@ -923,7 +923,23 @@ organized in a hash table or B+ tree.") version ".tar.gz")) (sha256 (base32 - "0cdwa4094x3yx7vn98xykvnlp9rngvd58d19vs3vh5hrvggccg93")))) + "0cdwa4094x3yx7vn98xykvnlp9rngvd58d19vs3vh5hrvggccg93")) + (modules '((guix build utils))) + (snippet + '(begin + ;; Adjust the bundled gnulib to work with glibc 2.28. See e.g. + ;; "m4-gnulib-libio.patch". This is a phase rather than patch + ;; or snippet to work around . + (substitute* (find-files "lib" "\\.c$") + (("#if defined _IO_ftrylockfile") + "#if defined _IO_EOF_SEEN")) + (substitute* "lib/stdio-impl.h" + (("^/\\* BSD stdio derived implementations") + (string-append "#if !defined _IO_IN_BACKUP && defined _IO_EOF_SEEN\n" + "# define _IO_IN_BACKUP 0x100\n" + "#endif\n\n" + "/* BSD stdio derived implementations"))) + #t)))) (build-system gnu-build-system) ;; Running tests in parallel leads to test failures and crashes in -- cgit 1.4.1 From f825faa502b0c149c430a08268bc972ff5e8c1cd Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 10 Oct 2018 22:44:16 +0200 Subject: gnu: python-pickleshare: Update to 0.7.5. * gnu/packages/databases.scm (python-pickleshare): Update to 0.7.5. --- 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 9c966494ad..73026c5e66 100644 --- a/gnu/packages/databases.scm +++ b/gnu/packages/databases.scm @@ -2420,13 +2420,13 @@ SQLAlchemy Database Toolkit for Python.") (define-public python-pickleshare (package (name "python-pickleshare") - (version "0.7.4") + (version "0.7.5") (source (origin (method url-fetch) (uri (pypi-uri "pickleshare" version)) (sha256 - (base32 "0yvk14dzxk7g6qpr7iw23vzqbsr0dh4ij4xynkhnzpfz4xr2bac4")))) + (base32 "1jmghg3c53yp1i8cm6pcrm280ayi8621rwyav9fac7awjr3kss47")))) (build-system python-build-system) (arguments `(#:phases (modify-phases %standard-phases -- cgit 1.4.1 From 4680fef705d9aa37737422804dc2cc1805522647 Mon Sep 17 00:00:00 2001 From: Amirouche Date: Mon, 15 Oct 2018 20:54:45 +0200 Subject: gnu: Add wiredtiger 3.1.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/databases.scm (wiredtiger-3): New variable that inherits from wiredtiger Signed-off-by: Ludovic Courtès --- gnu/packages/databases.scm | 13 +++++++++++++ 1 file changed, 13 insertions(+) (limited to 'gnu/packages/databases.scm') diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm index 73026c5e66..ee00f23717 100644 --- a/gnu/packages/databases.scm +++ b/gnu/packages/databases.scm @@ -1768,6 +1768,19 @@ trees (LSM), for sustained throughput under random insert workloads.") ;; configure.ac: WiredTiger requires a 64-bit build. (supported-systems '("x86_64-linux" "mips64el-linux" "aarch64-linux")))) +(define-public wiredtiger-3 + (package + (inherit wiredtiger) + (name "wiredtiger") + (version "3.1.0") + (source (origin + (method url-fetch) + (uri (string-append "http://source.wiredtiger.com/releases/wiredtiger-" + version ".tar.bz2")) + (sha256 + (base32 + "014awypv579ascg4jbx4pndj2wld337m79yyzrzyr7hxrff139jx")))))) + (define-public guile-wiredtiger (package (name "guile-wiredtiger") -- cgit 1.4.1 From b1e6b9380589a6cbbe903255390888b0540bfe8e Mon Sep 17 00:00:00 2001 From: Amirouche Date: Tue, 16 Oct 2018 20:45:28 +0200 Subject: gnu: guile-wiredtiger: Update to 0.7.0. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/databases.scm (guile-wiredtiger): Update to 0.7.0. [inputs]: Replace wiredtiger with wiredtiger-3 [propagated-inputs]: Remove guile-lib, add guile-bytestructures [description]: Update it. Signed-off-by: Ludovic Courtès --- gnu/packages/databases.scm | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) (limited to 'gnu/packages/databases.scm') diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm index ee00f23717..7b483a207d 100644 --- a/gnu/packages/databases.scm +++ b/gnu/packages/databases.scm @@ -1784,16 +1784,16 @@ trees (LSM), for sustained throughput under random insert workloads.") (define-public guile-wiredtiger (package (name "guile-wiredtiger") - (version "0.6.3") + (version "0.7.0") (source (origin (method git-fetch) (uri (git-reference (url "https://framagit.org/a-guile-mind/guile-wiredtiger.git") - (commit "070ed68139d99c279f058a6c293f00292d35dbd7"))) + (commit "340ad4bc2ff4dcc6216a2f5c6f9172ca320ac66b"))) (file-name (string-append name "-" version "-checkout")) (sha256 (base32 - "14rna97wsylajzxfif95wnblq85csgcfc666gh5dl0ssgd7x8llh")))) + "15j36bvxxzil7qpwlmh1rffqpva3ynvrcpqhhqbj2c9208ayz595")))) (build-system gnu-build-system) (arguments '(#:parallel-tests? #f ;; tests can't be run in parallel, yet. @@ -1801,21 +1801,19 @@ trees (LSM), for sustained throughput under random insert workloads.") (list (string-append "--with-libwiredtiger-prefix=" (assoc-ref %build-inputs "wiredtiger"))) #:make-flags '("GUILE_AUTO_COMPILE=0"))) - ;; TODO: Remove microkanren.scm when we have a separate package - ;; for it. (native-inputs `(("autoconf" ,autoconf) ("automake" ,automake) ("pkg-config" ,pkg-config))) (inputs - `(("wiredtiger" ,wiredtiger) + `(("wiredtiger" ,wiredtiger-3) ("guile" ,guile-2.2))) (propagated-inputs - `(("guile-lib" ,guile-lib))) ;for (htmlprag) + `(("guile-bytestructures" ,guile-bytestructures))) (synopsis "WiredTiger bindings for GNU Guile") (description "This package provides Guile bindings to the WiredTiger ``NoSQL'' -database. Various higher level database abstractions.") +database.") (home-page "https://framagit.org/a-guile-mind/guile-wiredtiger") (license license:gpl3+))) -- cgit 1.4.1 From d9bcdfce29b07235772657d58399e16be1022ee5 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 24 Oct 2018 01:42:37 +0200 Subject: gnu: mongodb: Use INVOKE. * gnu/packages/databases.scm (mongodb)[arguments]: Substitute INVOKE for SYSTEM*. --- gnu/packages/databases.scm | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'gnu/packages/databases.scm') diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm index 7b483a207d..6ebbc281fd 100644 --- a/gnu/packages/databases.scm +++ b/gnu/packages/databases.scm @@ -503,10 +503,9 @@ applications.") #t)) (replace 'build (lambda _ - (zero? (apply system* - `("scons" + (apply invoke `("scons" ,@common-options - "mongod" "mongo" "mongos"))))) + "mongod" "mongo" "mongos")))) (replace 'check (lambda* (#:key tests? inputs #:allow-other-keys) (setenv "TZDIR" -- cgit 1.4.1 From d28af1991ae0a99e660ad1b82ac955556d3a9382 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 21 Oct 2018 09:04:41 +0300 Subject: gnu: qt: Use system sqlite. * gnu/packages/databases.scm (sqlite-with-column-metadata): New variable. * gnu/packages/qt.scm (qt, qtbase)[source]: Remove bundled sqlite. [inputs]: Add sqlite-with-column-metadata. [arguments]: Add configure-flag to use system sqlite. --- gnu/packages/databases.scm | 12 ++++++++++++ gnu/packages/qt.scm | 15 ++++++--------- 2 files changed, 18 insertions(+), 9 deletions(-) (limited to 'gnu/packages/databases.scm') diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm index 6ebbc281fd..87fb170e5d 100644 --- a/gnu/packages/databases.scm +++ b/gnu/packages/databases.scm @@ -1211,6 +1211,18 @@ is in the public domain.") ((#:configure-flags flags) `(cons "--enable-fts5" ,flags)))))) +;; This is used by Qt. +(define-public sqlite-with-column-metadata + (package (inherit sqlite) + (name "sqlite-with-column-metadata") + (arguments + (substitute-keyword-arguments (package-arguments sqlite) + ((#:configure-flags flags) + `(list (string-append "CFLAGS=-O2 -DSQLITE_SECURE_DELETE " + "-DSQLITE_ENABLE_UNLOCK_NOTIFY " + "-DSQLITE_ENABLE_DBSTAT_VTAB " + "-DSQLITE_ENABLE_COLUMN_METADATA"))))))) + (define-public tdb (package (name "tdb") diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm index 05713e8ef1..dffa8b5cf0 100644 --- a/gnu/packages/qt.scm +++ b/gnu/packages/qt.scm @@ -135,7 +135,7 @@ system, and the core design of Django is reused in Grantlee.") (lambda (dir) (delete-file-recursively (string-append "qtbase/src/3rdparty/" dir))) (list "double-conversion" "freetype" "harfbuzz-ng" - "libpng" "libjpeg" "pcre2" "xcb" + "libpng" "libjpeg" "pcre2" "sqlite" "xcb" "xkbcommon" "zlib")) (for-each (lambda (dir) @@ -206,7 +206,7 @@ system, and the core design of Django is reused in Grantlee.") ("postgresql" ,postgresql) ("pulseaudio" ,pulseaudio) ("pcre2" ,pcre2) - ;("sqlite" ,sqlite) + ("sqlite" ,sqlite-with-column-metadata) ("udev" ,eudev) ("unixodbc" ,unixodbc) ("wayland" ,wayland) @@ -273,7 +273,7 @@ system, and the core design of Django is reused in Grantlee.") "-no-compile-examples" ;; Most "-system-..." are automatic, but some use ;; the bundled copy by default. - ;"-system-sqlite" + "-system-sqlite" "-system-harfbuzz" "-system-pcre" ;; explicitly link with openssl instead of dlopening it @@ -503,7 +503,7 @@ system, and the core design of Django is reused in Grantlee.") (lambda (dir) (delete-file-recursively (string-append "src/3rdparty/" dir))) (list "double-conversion" "freetype" "harfbuzz-ng" - "libpng" "libjpeg" "pcre2" "xcb" + "libpng" "libjpeg" "pcre2" "sqlite" "xcb" "xkbcommon" "zlib")) #t)))) (build-system gnu-build-system) @@ -545,7 +545,7 @@ system, and the core design of Django is reused in Grantlee.") ("pcre2" ,pcre2) ("postgresql" ,postgresql) ("pulseaudio" ,pulseaudio) - ;("sqlite" ,sqlite) + ("sqlite" ,sqlite-with-column-metadata) ("unixodbc" ,unixodbc) ("xcb-util" ,xcb-util) ("xcb-util-image" ,xcb-util-image) @@ -616,10 +616,7 @@ system, and the core design of Django is reused in Grantlee.") "-no-compile-examples" ;; Most "-system-..." are automatic, but some use ;; the bundled copy by default. - ;; System sqlite fails on 5.10+ - ;;.obj/qsql_sqlite.o: In function `QSQLiteResultPrivate::initColumns(bool)': - ;;qsql_sqlite.cpp:(.text+0x190c): undefined reference to `sqlite3_column_table_name16' - ;"-system-sqlite" + "-system-sqlite" "-system-harfbuzz" "-system-pcre" ;; explicitly link with openssl instead of dlopening it -- cgit 1.4.1 From 8dd36658832b405ee8c04d29b96381519920ed91 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Thu, 27 Sep 2018 17:24:33 +0200 Subject: gnu: rocksdb: Don't use unstable tarball. * gnu/packages/databases.scm (rocksdb)[source]: Use GIT-FETCH. --- gnu/packages/databases.scm | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'gnu/packages/databases.scm') diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm index e1fa6b783f..1a3781b7df 100644 --- a/gnu/packages/databases.scm +++ b/gnu/packages/databases.scm @@ -990,13 +990,14 @@ types are supported, as is encryption.") (name "rocksdb") (version "5.12.4") (source (origin - (method url-fetch) - (uri (string-append "https://github.com/facebook/rocksdb" - "/archive/v" version ".tar.gz")) - (file-name (string-append name "-" version ".tar.gz")) + (method git-fetch) + (uri (git-reference + (url "https://github.com/facebook/rocksdb") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) (sha256 (base32 - "1jcwgsjhk4hdfr2wf549blkgb89vwcdb5i2ahhqs6zf3mm20i3bf")) + "0islyg33hr52gqhcgvv58gmgzxw12w3175mhf2mli5w60lx8f8hi")) (modules '((guix build utils))) (snippet '(begin -- cgit 1.4.1 From e2568df74e46b6ab5b9d63a78dd805f8018848ab Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Thu, 27 Sep 2018 17:27:31 +0200 Subject: gnu: rocksdb: Update to 5.15.10. * gnu/packages/databases.scm (rocksdb): Update to 5.15.10. --- 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 1a3781b7df..5fc3607b76 100644 --- a/gnu/packages/databases.scm +++ b/gnu/packages/databases.scm @@ -988,7 +988,7 @@ types are supported, as is encryption.") (define-public rocksdb (package (name "rocksdb") - (version "5.12.4") + (version "5.15.10") (source (origin (method git-fetch) (uri (git-reference @@ -997,7 +997,7 @@ types are supported, as is encryption.") (file-name (git-file-name name version)) (sha256 (base32 - "0islyg33hr52gqhcgvv58gmgzxw12w3175mhf2mli5w60lx8f8hi")) + "0q26frbj9pykarcfa0yxgwncxlvsqhjkby0jrbfs1a8srja688r4")) (modules '((guix build utils))) (snippet '(begin -- cgit 1.4.1 From 41d2b7f50b82469177c0ae2429571db6a5c1c3f0 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Thu, 8 Nov 2018 13:24:35 -0500 Subject: gnu: PostgreSQL 9: Update to 9.6.11 [fixes CVE-2018-16850]. * gnu/packages/databases.scm (postgresql-9.6): Update to 9.6.11. --- 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 87fb170e5d..dc7e2aa53d 100644 --- a/gnu/packages/databases.scm +++ b/gnu/packages/databases.scm @@ -849,14 +849,14 @@ pictures, sounds, or video.") (package (inherit postgresql) (name "postgresql") - (version "9.6.9") + (version "9.6.11") (source (origin (method url-fetch) (uri (string-append "https://ftp.postgresql.org/pub/source/v" version "/postgresql-" version ".tar.bz2")) (sha256 (base32 - "0biy8j69dbvdmrag55pdszpc0702agzqhhcwdx21xp02mzim4ydr")))))) + "0c55akrkzqd6p6a8hr0338wk246hl76r9j16p4zn3s51d7f0l99q")))))) (define-public python-pymysql (package -- cgit 1.4.1 From f626b7192394b96b012d5872cc623ef6adbb8981 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sun, 11 Nov 2018 10:05:56 +0100 Subject: gnu: mdbtools: Remove custom bootstrap phase. * gnu/packages/databases.scm (mdbtools)[arguments]: Remove. --- gnu/packages/databases.scm | 6 ------ 1 file changed, 6 deletions(-) (limited to 'gnu/packages/databases.scm') diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm index dc7e2aa53d..aacf5465c1 100644 --- a/gnu/packages/databases.scm +++ b/gnu/packages/databases.scm @@ -2088,12 +2088,6 @@ for ODBC.") ("pkg-config" ,pkg-config) ("txt2man" ,txt2man) ("which" ,which))) - (arguments - `(#:phases - (modify-phases %standard-phases - (add-after 'unpack 'autoreconf - (lambda _ - (zero? (system* "autoreconf" "-vfi"))))))) (home-page "http://mdbtools.sourceforge.net/") (synopsis "Read Microsoft Access databases") (description "MDB Tools is a set of tools and applications to read the -- cgit 1.4.1 From f1f1cebdd3f2ca18d77e8f8a1f5760a65e7137fb Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sun, 11 Nov 2018 10:09:54 +0100 Subject: gnu: mdbtools: Fetch sources from git. * gnu/packages/databases.scm (mdbtools)[source]: Fetch from git. --- gnu/packages/databases.scm | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'gnu/packages/databases.scm') diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm index aacf5465c1..46bd728b1b 100644 --- a/gnu/packages/databases.scm +++ b/gnu/packages/databases.scm @@ -2071,13 +2071,14 @@ for ODBC.") (version "0.7.1") (source (origin - (method url-fetch) - (uri (string-append "https://github.com/brianb/mdbtools/archive/" - version ".tar.gz")) + (method git-fetch) + (uri (git-reference + (url "https://github.com/brianb/mdbtools.git") + (commit version))) + (file-name (git-file-name name version)) (sha256 (base32 - "05hbmxcq173kzb899gdi3bz2qcc1vi3n1qbbkwpsvrq7ggf11wyw")) - (file-name (string-append name "-" version ".tar.gz")))) + "0gwcpp9y09xhs21g7my2fs8ncb8i6ahlyixcx8jd3q97jbzj441l")))) (build-system gnu-build-system) (inputs `(("glib" ,glib))) -- cgit 1.4.1 From c92d056a8b83aa51c2223cc3d840e3d9775e64b7 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 11 Nov 2018 09:36:17 +0200 Subject: gnu: python-alembic: Update to 1.0.2. * gnu/packages/databases.scm (python-alembic, python2-alembic): Update to 1.0.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 d4a1d35d95..9e752457e9 100644 --- a/gnu/packages/databases.scm +++ b/gnu/packages/databases.scm @@ -2424,14 +2424,14 @@ You might also want to install the following optional dependencies: (define-public python-alembic (package (name "python-alembic") - (version "0.9.6") + (version "1.0.2") (source (origin (method url-fetch) (uri (pypi-uri "alembic" version)) (sha256 (base32 - "0cm73vabrqj92v7a0wwvldj8j7bc7dwv358kvkk7p87gx7mm2a04")))) + "0asqz9mwc4w8bsar1icv3ik9jslxrj3gv3yxgmhc6nc6r9qbkg04")))) (build-system python-build-system) (native-inputs `(("python-mock" ,python-mock) -- cgit 1.4.1 From 22d04ceda000b16881071094e4a1c8cddbe09dfb Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 11 Nov 2018 11:47:57 +0200 Subject: gnu: python-rq: Update to 0.12.0. * gnu/packages/databases.scm (python-rq): Update to 0.12.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 9e752457e9..1617c28b1e 100644 --- a/gnu/packages/databases.scm +++ b/gnu/packages/databases.scm @@ -2749,13 +2749,13 @@ reasonable substitute.") (define-public python-rq (package (name "python-rq") - (version "0.7.1") + (version "0.12.0") (source (origin (method url-fetch) (uri (pypi-uri "rq" version)) (sha256 - (base32 "0gaq5pnh0zy46r8jvygi0ifbvz3pq6i7xla78ijcgjw0x77qzsdh")))) + (base32 "16d8kni57xlnah2hawy4xgw21xrv3f64j5q5shyp3zxx4yd9iibs")))) (build-system python-build-system) (propagated-inputs `(("python-click" ,python-click) -- cgit 1.4.1 From ec350676315e3ec5fb4b5a9865b8cc3aa76d2681 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Thu, 8 Nov 2018 13:22:52 -0500 Subject: gnu: PostgreSQL: Update to 10.6 [fixes CVE-2018-16850]. * gnu/packages/databases.scm (postgresql): Update to 10.6. --- 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 46bd728b1b..7258622f42 100644 --- a/gnu/packages/databases.scm +++ b/gnu/packages/databases.scm @@ -804,14 +804,14 @@ as a drop-in replacement of MySQL.") (define-public postgresql (package (name "postgresql") - (version "10.5") + (version "10.6") (source (origin (method url-fetch) (uri (string-append "https://ftp.postgresql.org/pub/source/v" version "/postgresql-" version ".tar.bz2")) (sha256 (base32 - "04a07jkvc5s6zgh6jr78149kcjmsxclizsqabjw44ld4j5n633kc")))) + "0jv26y3f10svrjxzsgqxg956c86b664azyk2wppzpa5x11pjga38")))) (build-system gnu-build-system) (arguments `(#:configure-flags '("--with-uuid=e2fs") -- cgit 1.4.1 From 96272e2822046519e9d6a89bfac0d29936ef2766 Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Wed, 27 Jun 2018 22:24:08 -0400 Subject: gnu: databases: Return #t from all phases. * gnu/packages/databases.scm (4store, go-gopkg.in-mgo.v2, mongodb) (sparql-query, tdb, sqlcipher, python-sqlparse, mongo-tools): Return #t from all phases, use invoke where appropriate, and remove vestigial plumbing. --- gnu/packages/databases.scm | 137 +++++++++++++++++++++++---------------------- 1 file changed, 71 insertions(+), 66 deletions(-) (limited to 'gnu/packages/databases.scm') diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm index 05bebed6a6..393b13a314 100644 --- a/gnu/packages/databases.scm +++ b/gnu/packages/databases.scm @@ -153,7 +153,7 @@ (modify-phases %standard-phases (add-after 'unpack 'generate-configure (lambda _ - (zero? (system* "sh" "autogen.sh"))))))) + (invoke "sh" "autogen.sh")))))) ;; http://www.4store.org has been down for a while now. (home-page "https://github.com/4store/4store") (synopsis "Clustered RDF storage and query engine") @@ -207,14 +207,16 @@ and provides interfaces to the traditional file format.") (delete 'reset-gzip-timestamps) (add-before 'check 'start-mongodb (lambda* (#:key tests? #:allow-other-keys) - (or (not tests?) - (with-directory-excursion "src/gopkg.in/mgo.v2" - (invoke "make" "startdb"))))) + (when tests? + (with-directory-excursion "src/gopkg.in/mgo.v2" + (invoke "make" "startdb"))) + #t)) (add-after 'check 'stop'mongodb (lambda* (#:key tests? #:allow-other-keys) - (or (not tests?) - (with-directory-excursion "src/gopkg.in/mgo.v2" - (invoke "make" "stopdb")))))))) + (when tests? + (with-directory-excursion "src/gopkg.in/mgo.v2" + (invoke "make" "stopdb"))) + #t))))) (native-inputs `(("go-gopkg.in-check.v1" ,go-gopkg.in-check.v1) ("mongodb" ,mongodb) @@ -511,28 +513,27 @@ applications.") (setenv "TZDIR" (string-append (assoc-ref inputs "tzdata") "/share/zoneinfo")) - (or (not tests?) - ;; Note that with the tests, especially the unittests, the - ;; build can take up to ~45GB of space, as many tests are - ;; individual executable files, with some being hundreds of - ;; megabytes in size. - (begin - (apply - invoke `("scons" ,@common-options "dbtest" "unittests")) - (substitute* "build/unittests.txt" - ;; TODO: Don't run the async_stream_test, as it hangs - (("^build\\/opt\\/mongo\\/executor\\/async\\_stream\\_test\n$") - "") - ;; TODO: This test fails - ;; Expected 0UL != disks.size() (0 != 0) @src/mongo/util/procparser_test.cpp:476 - (("^build\\/opt\\/mongo\\/util\\/procparser\\_test\n$") - "")) - (invoke "python" "buildscripts/resmoke.py" - "--suites=dbtest,unittests" - (format #f "--jobs=~a" (parallel-job-count))))))) + (when tests? + ;; Note that with the tests, especially the unittests, the + ;; build can take up to ~45GB of space, as many tests are + ;; individual executable files, with some being hundreds of + ;; megabytes in size. + (apply invoke `("scons" ,@common-options "dbtest" "unittests")) + (substitute* "build/unittests.txt" + ;; TODO: Don't run the async_stream_test, as it hangs + (("^build\\/opt\\/mongo\\/executor\\/async\\_stream\\_test\n$") + "") + ;; TODO: This test fails + ;; Expected 0UL != disks.size() (0 != 0) @src/mongo/util/procparser_test.cpp:476 + (("^build\\/opt\\/mongo\\/util\\/procparser\\_test\n$") + "")) + (invoke "python" "buildscripts/resmoke.py" + "--suites=dbtest,unittests" + (format #f "--jobs=~a" (parallel-job-count)))) + #t)) (replace 'install - (lambda _ - (let ((bin (string-append (assoc-ref %outputs "out") "/bin"))) + (lambda* (#:key outputs #:allow-other-keys) + (let ((bin (string-append (assoc-ref outputs "out") "/bin"))) (install-file "mongod" bin) (install-file "mongos" bin) (install-file "mongo" bin)) @@ -1118,7 +1119,8 @@ data in a single database. RocksDB is partially based on @code{LevelDB}.") (lambda _ (substitute* "Makefile" (("^gitrev :=.*$") - (string-append "gitrev = \"v" ,version "\""))))) + (string-append "gitrev = \"v" ,version "\""))) + #t)) ;; The install phase of the Makefile assumes $PREFIX/usr/local/bin. ;; This replacement does the same thing, except for using $PREFIX/bin ;; instead. @@ -1127,14 +1129,13 @@ data in a single database. RocksDB is partially based on @code{LevelDB}.") (let* ((out (assoc-ref outputs "out")) (bin (string-append out "/bin"))) (install-file "sparql-query" bin) - (system* "ln" "--symbolic" - (string-append bin "/sparql-query") - (string-append bin "/sparql-update"))))) + (symlink (string-append bin "/sparql-query") + (string-append bin "/sparql-update"))) + #t)) (replace 'check (lambda* (#:key make-flags #:allow-other-keys) - (and - (zero? (apply system* "make" `(,@make-flags "scan-test"))) - (zero? (system "./scan-test")))))))) + (apply invoke "make" `(,@make-flags "scan-test")) + (invoke "./scan-test")))))) (home-page "https://github.com/tialaramex/sparql-query/") (synopsis "Command-line tool for accessing SPARQL endpoints over HTTP") (description "Sparql-query is a command-line tool for accessing SPARQL @@ -1259,8 +1260,8 @@ is in the public domain.") (let ((out (assoc-ref outputs "out"))) ;; The 'configure' script is a wrapper for Waf and ;; doesn't recognize things like '--enable-fast-install'. - (zero? (system* "./configure" - (string-append "--prefix=" out))))))))) + (invoke "./configure" + (string-append "--prefix=" out)))))))) (native-inputs `(;; TODO: Build the documentation. ;; ("docbook-xsl" ,docbook-xsl) @@ -2009,8 +2010,7 @@ can autogenerate peewee models using @code{pwiz}, a model generator.") (assoc-ref %standard-phases 'check)) (replace 'check (lambda _ - (zero? - (system* "./testfixture" "test/crypto.test"))))))) + (invoke "./testfixture" "test/crypto.test")))))) (home-page "https://www.zetetic.net/sqlcipher/") (synopsis "Library providing transparent encryption of SQLite database files") @@ -2805,7 +2805,7 @@ is designed to have a low barrier to entry.") `(#:phases (modify-phases %standard-phases (replace 'check - (lambda _ (zero? (system* "py.test"))))))) + (lambda _ (invoke "py.test")))))) (native-inputs `(("python-pytest" ,python-pytest))) (home-page "https://github.com/andialbrecht/sqlparse") @@ -2872,41 +2872,46 @@ transforms idiomatic python function calls to well-formed SQL queries.") (delete 'install-source) (replace 'build (lambda _ - (every (lambda (tool) - (let ((command - `("go" "build" - ;; This is where the tests expect to find the - ;; executables - "-o" ,(string-append - "src/github.com/mongodb/mongo-tools/bin/" - tool) - "-v" - "-tags=\"ssl sasl\"" - "-ldflags" - "-extldflags=-Wl,-z,now,-z,relro" - ,(string-append - "src/github.com/mongodb/mongo-tools/" - tool "/main/" tool ".go")))) - (simple-format #t "build: running ~A\n" - (string-join command)) - (apply invoke command))) - all-tools))) + (for-each (lambda (tool) + (let ((command + `("go" "build" + ;; This is where the tests expect to find the + ;; executables + "-o" ,(string-append + "src/github.com/mongodb/mongo-tools/bin/" + tool) + "-v" + "-tags=\"ssl sasl\"" + "-ldflags" + "-extldflags=-Wl,-z,now,-z,relro" + ,(string-append + "src/github.com/mongodb/mongo-tools/" + tool "/main/" tool ".go")))) + (simple-format #t "build: running ~A\n" + (string-join command)) + (apply invoke command))) + all-tools) + #t)) (replace 'check (lambda _ (with-directory-excursion "src" - (every (lambda (tool) - (invoke - "go" "test" "-v" - (string-append "github.com/mongodb/mongo-tools/" tool))) - all-tools)))) + (for-each (lambda (tool) + (invoke + "go" "test" "-v" + (string-append "github.com/mongodb/mongo-tools/" + tool))) + all-tools)) + #t)) (replace 'install (lambda* (#:key outputs #:allow-other-keys) (for-each (lambda (tool) (install-file - (string-append "src/github.com/mongodb/mongo-tools/bin/" tool) + (string-append "src/github.com/mongodb/mongo-tools/bin/" + tool) (string-append (assoc-ref outputs "out") "/bin"))) - all-tools))))))) + all-tools) + #t)))))) (native-inputs `(("go-github.com-howeyc-gopass" ,go-github.com-howeyc-gopass) ("go-github.com-jessevdk-go-flags" ,go-github.com-jessevdk-go-flags) -- cgit 1.4.1 From 52b24ba495d674946587419c58192d940f13be4a Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 23 Nov 2018 22:47:42 +0100 Subject: gnu: mariadb: Update to 10.1.37 [security fixes]. This release fixes CVE-2018-3282, CVE-2018-3174, CVE-2018-3143, CVE-2018-3156, and CVE-2018-3251. See for details. * gnu/packages/databases.scm (mariadb): Update to 10.1.37. --- 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 393b13a314..0456d4508e 100644 --- a/gnu/packages/databases.scm +++ b/gnu/packages/databases.scm @@ -621,7 +621,7 @@ Language.") (define-public mariadb (package (name "mariadb") - (version "10.1.36") + (version "10.1.37") (source (origin (method url-fetch) (uri (string-append "https://downloads.mariadb.org/f/" @@ -629,7 +629,7 @@ Language.") name "-" version ".tar.gz")) (sha256 (base32 - "0n5aj76mn9rxc21l2kjmfrg10bmsyy4cic68khjr94iby262wx5d")) + "0ijdmdn9mcciwv361zfmja6b1h6qpbdqgrnnq6kkdapplyq1dmcc")) (patches (search-patches "mariadb-client-test-32bit.patch")) (modules '((guix build utils))) (snippet -- cgit 1.4.1 From 682c2918992a5d2d716cdc6a9cc7db62cd994e1e Mon Sep 17 00:00:00 2001 From: Brett Gilio Date: Sat, 24 Nov 2018 00:12:14 -0600 Subject: gnu: sqlcipher: Update to 3.4.2. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/databases.scm (sqlcipher): Update to 3.4.2. Signed-off-by: Ludovic Courtès --- 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 7258622f42..ac1b23a327 100644 --- a/gnu/packages/databases.scm +++ b/gnu/packages/databases.scm @@ -1963,14 +1963,14 @@ can autogenerate peewee models using @code{pwiz}, a model generator.") (define-public sqlcipher (package (name "sqlcipher") - (version "3.3.1") + (version "3.4.2") (source (origin (method url-fetch) (uri (string-append "https://github.com/sqlcipher/" name "/archive/v" version ".tar.gz")) (sha256 - (base32 "1gv58dlbpzrmznly52yqbxgvii0ib88zr3aszla1bsypwjr6flff")) + (base32 "1nxarwbci8jx99f1d0y1ivxcv25s78l1p7q6qy28lkpkcx8pm2b9")) (file-name (string-append name "-" version ".tar.gz")))) (build-system gnu-build-system) (inputs -- cgit 1.4.1