From 831f1ff92ea561929db36bc54070fd2ba11b4a7e Mon Sep 17 00:00:00 2001 From: Michael Rohleder Date: Thu, 5 Nov 2020 02:55:49 +0100 Subject: gnu: python-peewee: Update to 3.13.3. * gnu/packages/databases.scm (python-peewee): Update to 3.13.3. [inputs]: Add sqlite. Signed-off-by: Efraim Flashner --- gnu/packages/databases.scm | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) (limited to 'gnu/packages/databases.scm') diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm index f7de8d1464..b164f8e6d9 100644 --- a/gnu/packages/databases.scm +++ b/gnu/packages/databases.scm @@ -2436,17 +2436,19 @@ on another machine, accessed via TCP/IP.") (define-public python-peewee (package (name "python-peewee") - (version "3.9.6") - (source - (origin - (method url-fetch) - (uri (pypi-uri "peewee" version)) - (sha256 - (base32 - "1j4sh946k0736m7pd54z0y6i2hjhgg3kdllx1pwq8xkzzcgrx1xw")))) + (version "3.13.3") + (source + (origin + (method url-fetch) + (uri (pypi-uri "peewee" version)) + (sha256 + (base32 + "0sc376v6rxga4b7ic9kxw2pmf28rmcx016320pa2nlb5d1rsjs8j")))) (build-system python-build-system) (arguments `(#:tests? #f)) ; Fails to import test data + (inputs + `(("sqlite" ,sqlite))) (native-inputs `(("python-cython" ,python-cython))) (home-page "https://github.com/coleifer/peewee/") -- cgit v1.2.3 From 33df476380e471cd415033c1244c1325039b54a8 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 8 Nov 2020 19:03:26 +0100 Subject: gnu: ephemeralpg: Update to 3.1. * gnu/packages/databases.scm (ephemeralpg): Update to 3.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 b164f8e6d9..93a8ebe18b 100644 --- a/gnu/packages/databases.scm +++ b/gnu/packages/databases.scm @@ -237,7 +237,7 @@ standard Go idioms.") (define-public ephemeralpg (package (name "ephemeralpg") - (version "3.0") + (version "3.1") (source (origin (method url-fetch) @@ -245,7 +245,7 @@ standard Go idioms.") "https://eradman.com/ephemeralpg/code/ephemeralpg-" version ".tar.gz")) (sha256 - (base32 "1j0g7g114ma7y7sadbng5p1ss1zsm9zpicm77qspym6565733vvh")))) + (base32 "1ap22ki8yz6agd0qybcjgs4b9izw1rwwcgpxn3jah2ccfyax34s6")))) (build-system gnu-build-system) (arguments '(#:make-flags (list "CC=gcc" -- cgit v1.2.3 From ddb418b514bda22075a4c5425693fcefbd76cdc2 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 8 Nov 2020 19:48:49 +0100 Subject: gnu: ephemeralpg: Cross-compile. * gnu/packages/databases.scm (ephemeralpg)[arguments]: Use CC-FOR-TARGET. --- 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 93a8ebe18b..b055645d86 100644 --- a/gnu/packages/databases.scm +++ b/gnu/packages/databases.scm @@ -248,7 +248,7 @@ standard Go idioms.") (base32 "1ap22ki8yz6agd0qybcjgs4b9izw1rwwcgpxn3jah2ccfyax34s6")))) (build-system gnu-build-system) (arguments - '(#:make-flags (list "CC=gcc" + `(#:make-flags (list (string-append "CC=" ,(cc-for-target)) (string-append "PREFIX=" %output)) #:phases (modify-phases %standard-phases -- cgit v1.2.3 From d8fe45547e796f665d8954b9a24fe4309ee4891e Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 8 Nov 2020 22:49:40 +0100 Subject: gnu: soci: Update to 4.0.1. * gnu/packages/databases.scm (soci): Update to 4.0.1. [arguments]: Add -DCMAKE_CXX_STANDARD=17 to #:configure-flags. --- gnu/packages/databases.scm | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'gnu/packages/databases.scm') diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm index b055645d86..d1c9abdae7 100644 --- a/gnu/packages/databases.scm +++ b/gnu/packages/databases.scm @@ -3888,7 +3888,7 @@ The drivers officially supported by @code{libdbi} are: (define-public soci (package (name "soci") - (version "4.0.0") + (version "4.0.1") (source (origin (method git-fetch) (uri (git-reference @@ -3897,7 +3897,7 @@ The drivers officially supported by @code{libdbi} are: (file-name (git-file-name name version)) (sha256 (base32 - "06faswdxd2frqr9xnx6bxc7zwarlzsbdi3bqpz7kwdxsjvq41rnb")))) + "14x2gjblkgpflv75wl144cyjp1sis5rbxnr9r2gj3yw16v2av0bp")))) (build-system cmake-build-system) (inputs `(("postgresql" ,postgresql) @@ -3907,7 +3907,10 @@ The drivers officially supported by @code{libdbi} are: ("mariadb:dev" ,mariadb "dev") ("mariadb:lib" ,mariadb "lib"))) (arguments - `(#:tests? #f ; Tests may require running database management systems. + `(#:configure-flags + ;; C++11 (-DSOCI_CXX11) is OFF by default. hyperledger-iroha needs it. + (list "-DCMAKE_CXX_STANDARD=17") + #:tests? #f ; may require running database management systems #:phases (modify-phases %standard-phases (add-after 'unpack 'fix-lib-path -- cgit v1.2.3 From 28da3c19c2f0110a479e42a38b44eb3cbb82af19 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 9 Nov 2020 09:11:12 +0100 Subject: gnu: soci: Configure LIBDIR normally. * gnu/packages/databases.scm (soci)[arguments]: Add SOCI_LIBDIR to #:configure-flags instead of patching CMakeLists.txt. --- gnu/packages/databases.scm | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) (limited to 'gnu/packages/databases.scm') diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm index d1c9abdae7..00283c48c4 100644 --- a/gnu/packages/databases.scm +++ b/gnu/packages/databases.scm @@ -3909,15 +3909,9 @@ The drivers officially supported by @code{libdbi} are: (arguments `(#:configure-flags ;; C++11 (-DSOCI_CXX11) is OFF by default. hyperledger-iroha needs it. - (list "-DCMAKE_CXX_STANDARD=17") - #:tests? #f ; may require running database management systems - #:phases - (modify-phases %standard-phases - (add-after 'unpack 'fix-lib-path - (lambda _ - (substitute* "CMakeLists.txt" - (("set\\(SOCI_LIBDIR \"lib64\"\\)") "")) - #t))))) + (list "-DCMAKE_CXX_STANDARD=17" + "-DSOCI_LIBDIR=lib") + #:tests? #f)) ; may require running database management systems (synopsis "C++ Database Access Library") (description "SOCI is an abstraction layer for several database backends, including -- cgit v1.2.3 From 691c4185de5b4718d91988df27ae8b146087dfe9 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 9 Nov 2020 09:37:49 +0100 Subject: gnu: soci: Support Firebird. * gnu/packages/databases.scm (soci)[inputs]: Add firebird. --- gnu/packages/databases.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'gnu/packages/databases.scm') diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm index 00283c48c4..302eacad47 100644 --- a/gnu/packages/databases.scm +++ b/gnu/packages/databases.scm @@ -3900,7 +3900,8 @@ The drivers officially supported by @code{libdbi} are: "14x2gjblkgpflv75wl144cyjp1sis5rbxnr9r2gj3yw16v2av0bp")))) (build-system cmake-build-system) (inputs - `(("postgresql" ,postgresql) + `(("firebird" ,firebird) + ("postgresql" ,postgresql) ("sqlite" ,sqlite) ("odbc" ,unixodbc) ("boost" ,boost) -- cgit v1.2.3 From 3881d0dc413b482ae1fd11aa09c263839ddde7a5 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 9 Nov 2020 22:59:27 +0100 Subject: gnu: mariadb-connector-c: Update to 3.1.11. * gnu/packages/databases.scm (mariadb-connector-c): Update to 3.1.11. [source]: Specify a mirror. --- gnu/packages/databases.scm | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) (limited to 'gnu/packages/databases.scm') diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm index 302eacad47..4a520f19ec 100644 --- a/gnu/packages/databases.scm +++ b/gnu/packages/databases.scm @@ -1152,16 +1152,16 @@ as a drop-in replacement of MySQL.") (define-public mariadb-connector-c (package (name "mariadb-connector-c") - (version "3.1.10") - (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 - "13v5z4w1cl890lnr2fbwbziw638lqw2aga45vdq1z0cyrc9mcgmg")))) + (version "3.1.11") + (source + (origin + (method url-fetch) + (uri (string-append + "https://downloads.mariadb.org/f/connector-c-" version + "/mariadb-connector-c-" version "-src.tar.gz" + "/from/https%3A//mirrors.ukfast.co.uk/sites/mariadb/?serve")) + (sha256 + (base32 "03svzahdf7czjlm695c11r4bfd04qdqgx8r1vkpr1zlkjhwnqvry")))) (inputs `(("openssl" ,openssl))) (build-system cmake-build-system) -- cgit v1.2.3 From 115cd74da6c00f0c3b6c7d1741e4537c22584014 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 10 Nov 2020 13:30:58 +0100 Subject: gnu: rocksdb: Build reproducibly. * gnu/packages/databases.scm (rocksdb)[arguments]: Hard code the build date. --- gnu/packages/databases.scm | 1 + 1 file changed, 1 insertion(+) (limited to 'gnu/packages/databases.scm') diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm index 4a520f19ec..8cb2a8738c 100644 --- a/gnu/packages/databases.scm +++ b/gnu/packages/databases.scm @@ -1386,6 +1386,7 @@ including field and record folding."))) `(#:make-flags (list "CC=gcc" "V=1" ;; Ceph requires that RTTI is enabled. "USE_RTTI=1" + "date=1970-01-01" ; build reproducibly (string-append "INSTALL_PATH=" (assoc-ref %outputs "out")) -- cgit v1.2.3