From bf5f75856eba170728b5fc6325a890334b033692 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 19 Apr 2021 12:45:01 +0200 Subject: gnu: freetds: Update to 1.2.20. * gnu/packages/databases.scm (freetds): Update to 1.2.20. --- 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 5c00e4c7d1..b23ef04d36 100644 --- a/gnu/packages/databases.scm +++ b/gnu/packages/databases.scm @@ -3836,14 +3836,14 @@ (define-public soci (define-public freetds (package (name "freetds") - (version "1.2.19") + (version "1.2.20") (source (origin (method url-fetch) (uri (string-append "https://www.freetds.org/files/stable/" "freetds-" version ".tar.gz")) (sha256 - (base32 "11xf2w8gh2p9cq4i38jfvdiwgig8wqbg098xjc08kx4iii8lxy3m")))) + (base32 "11fzwcahc1bc8npxbif0448v9cwyf7k04167i7fcspmfw7a0hj0d")))) (build-system gnu-build-system) (arguments ;; NOTE: (Sharlatan-20210110213908+0000) some tests require DB connection, -- cgit v1.2.3 From 2be32ecc7479bc714395e13380462c7a0928881a Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Tue, 20 Apr 2021 16:34:43 +0200 Subject: gnu: Add nanodbc. * gnu/packages/databases.scm (nanodbc): New variable. --- gnu/packages/databases.scm | 31 ++++++++++++++++++++++++++++++- 1 file changed, 30 insertions(+), 1 deletion(-) (limited to 'gnu/packages/databases.scm') diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm index b23ef04d36..2353e3b731 100644 --- a/gnu/packages/databases.scm +++ b/gnu/packages/databases.scm @@ -28,7 +28,7 @@ ;;; Copyright © 2017, 2018 Ben Woodcroft ;;; Copyright © 2017 Rutger Helling ;;; Copyright © 2017, 2018 Pierre Langlois -;;; Copyright © 2015, 2017, 2018, 2019 Ricardo Wurmus +;;; Copyright © 2015, 2017, 2018, 2019, 2021 Ricardo Wurmus ;;; Copyright © 2017 Kristofer Buffington ;;; Copyright © 2018 Amirouche Boubekki ;;; Copyright © 2018 Joshua Sierles, Nextjournal @@ -2073,6 +2073,35 @@ (define-public unixodbc ;; COPYING contains copy of lgpl2.1 - but copyright notices just say "LGPL" (home-page "http://www.unixodbc.org"))) +(define-public nanodbc + (package + (name "nanodbc") + (version "2.13.0") + (source (origin + (method git-fetch) + (uri + (git-reference + (url "https://github.com/nanodbc/nanodbc") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1q80p7yv9mcl4hyvnvcjdr70y8nc940ypf368lp97vpqn5yckkgm")))) + (build-system cmake-build-system) + (arguments + `(#:configure-flags + ;; The tests require ODBC backends to be installed. + (list "-DNANODBC_DISABLE_TESTS=ON") + #:tests? #false)) + (inputs + `(("unixodbc" ,unixodbc))) + (home-page "https://nanodbc.io/") + (synopsis "C++ wrapper for the native C ODBC API") + (description "The goal for nanodbc is to make developers happy by providing +a simpler and less verbose API for working with ODBC. Common tasks should be +easy, requiring concise and simple code.") + (license license:expat))) + (define-public unqlite (package (name "unqlite") -- cgit v1.2.3 From 34928cc43c1d5707506a371c43593a3415f04d04 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 22 Apr 2021 15:47:32 +0200 Subject: gnu: nanodbc: Build shared libraries. * gnu/packages/databases.scm (nanodbc)[arguments]: Build shared libraries. --- 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 2353e3b731..b956833557 100644 --- a/gnu/packages/databases.scm +++ b/gnu/packages/databases.scm @@ -2091,7 +2091,8 @@ (define-public nanodbc (arguments `(#:configure-flags ;; The tests require ODBC backends to be installed. - (list "-DNANODBC_DISABLE_TESTS=ON") + (list "-DNANODBC_DISABLE_TESTS=ON" + "-DBUILD_SHARED_LIBS=ON") #:tests? #false)) (inputs `(("unixodbc" ,unixodbc))) -- cgit v1.2.3 From 04ab609b13c7a94d938bbd015dcb6f4165296cc6 Mon Sep 17 00:00:00 2001 From: Pjotr Prins Date: Mon, 26 Apr 2021 12:45:05 +0300 Subject: gnu: Add ruby-redis. * gnu/packages/databases.scm (ruby-redis): New variable. Signed-off-by: Efraim Flashner --- gnu/packages/databases.scm | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) (limited to 'gnu/packages/databases.scm') diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm index b956833557..f9e63f3722 100644 --- a/gnu/packages/databases.scm +++ b/gnu/packages/databases.scm @@ -49,6 +49,7 @@ ;;; Copyright © 2021 Sharlatan Hellseher ;;; Copyright © 2021 Greg Hogan ;;; Copyright © 2021 David Larsson +;;; Copyright © 2021 Pjotr Prins ;;; ;;; This file is part of GNU Guix. ;;; @@ -2181,6 +2182,27 @@ (define-public redis (home-page "https://redis.io/") (license license:bsd-3))) +(define-public ruby-redis + (package + (name "ruby-redis") + (version "4.2.5") + (source + (origin + (method url-fetch) + (uri (rubygems-uri "redis" version)) + (sha256 + (base32 + "15x2sr6h094rjbvg8pkq6m3lcd5abpyx93aifvfdz3wv6x55xa48")))) + (build-system ruby-build-system) + (arguments + `(#:tests? #f)) ; Tests require a running redis server. + (synopsis "Ruby client for Redis' API") + (description + "This package provides a Ruby client that tries to match Redis' API +one-to-one, while still providing an idiomatic interface.") + (home-page "https://github.com/redis/redis-rb") + (license license:expat))) + (define-public kyotocabinet (package (name "kyotocabinet") -- cgit v1.2.3 From 1ba3df18726b21feec95e180f89d4c64e8d194e9 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 1 May 2021 05:36:43 +0200 Subject: gnu: soci: Update to 4.0.2. * gnu/packages/databases.scm (soci): Update to 4.0.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 f9e63f3722..2cd7435f7e 100644 --- a/gnu/packages/databases.scm +++ b/gnu/packages/databases.scm @@ -3853,16 +3853,16 @@ (define-public libdbi-drivers (define-public soci (package (name "soci") - (version "4.0.1") + (version "4.0.2") (source (origin (method git-fetch) (uri (git-reference (url "https://github.com/SOCI/soci/") - (commit version))) + (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 (base32 - "14x2gjblkgpflv75wl144cyjp1sis5rbxnr9r2gj3yw16v2av0bp")))) + "0qc6d71lyrfh5zb7pmfihd1hjyazlkgq6p0g06ans77wnnjh0k9l")))) (build-system cmake-build-system) (propagated-inputs ;; Headers of soci has include-references to headers of these inputs. -- cgit v1.2.3 From 314f96421e842a42e39f240848a7ecab4fa7376c Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 5 May 2021 18:20:17 +0200 Subject: gnu: python-sqlparse: Update to 0.4.1. * gnu/packages/databases.scm (python-sqlparse): Update to 0.4.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 2cd7435f7e..dd7f5102ad 100644 --- a/gnu/packages/databases.scm +++ b/gnu/packages/databases.scm @@ -3508,13 +3508,13 @@ (define-public python2-trollius-redis (define-public python-sqlparse (package (name "python-sqlparse") - (version "0.3.1") + (version "0.4.1") (source (origin (method url-fetch) (uri (pypi-uri "sqlparse" version)) (sha256 (base32 - "0j652a6z7bdf6c77aczfn8m8b2nsr1bcqq48wzghf8vi6wvj0qp1")))) + "1s2l0jgi1v7rk7smzb99iamasaz22apfkczsphn3ci4wh8pgv48g")))) (build-system python-build-system) (arguments `(#:phases -- cgit v1.2.3 From 151f1720e3400e2b1463917f8e0917eef9904dca Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 5 May 2021 21:19:27 +0200 Subject: gnu: python-sqlparse: Remove unnecessary runtime dependencies. * gnu/packages/databases.scm (python-sqlparse)[arguments]: Override 'wrap' phase. --- gnu/packages/databases.scm | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) (limited to 'gnu/packages/databases.scm') diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm index dd7f5102ad..2777293200 100644 --- a/gnu/packages/databases.scm +++ b/gnu/packages/databases.scm @@ -17,7 +17,7 @@ ;;; Copyright © 2016 Jan Nieuwenhuizen ;;; Copyright © 2016 Andy Patterson ;;; Copyright © 2016 Danny Milosavljevic -;;; Copyright © 2016, 2017, 2018, 2019, 2020 Marius Bakke +;;; Copyright © 2016, 2017, 2018, 2019, 2020, 2021 Marius Bakke ;;; Copyright © 2017, 2018 Julien Lepiller ;;; Copyright © 2017, 2020 Thomas Danckaert ;;; Copyright © 2017 Jelle Licht @@ -3520,7 +3520,22 @@ (define-public python-sqlparse `(#:phases (modify-phases %standard-phases (replace 'check - (lambda _ (invoke "py.test")))))) + (lambda _ + (invoke "py.test"))) + ;; XXX: The regular wrap phase ends up storing pytest as a runtime + ;; dependency. See . + (replace 'wrap + (lambda* (#:key native-inputs inputs outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (python (assoc-ref (or native-inputs inputs) "python")) + (sitedir (string-append "/lib/python" + (python-version python) + "/site-packages"))) + (wrap-program (string-append out "/bin/sqlformat") + `("PYTHONPATH" ":" prefix + ,(map (lambda (output) + (string-append output sitedir)) + (list python out)))))))))) (native-inputs `(("python-pytest" ,python-pytest))) (home-page "https://github.com/andialbrecht/sqlparse") -- cgit v1.2.3