From 641f5c599e68f191fc94f458abae727d7f4028cb Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 28 May 2022 12:18:57 +0200 Subject: gnu: apache-arrow: Update to 8.0.0. * gnu/packages/databases.scm (apache-arrow): Update to 8.0.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 2161340ef9..2d72c78233 100644 --- a/gnu/packages/databases.scm +++ b/gnu/packages/databases.scm @@ -4207,7 +4207,7 @@ the SQL language using a syntax that reflects the resulting query.") (define-public apache-arrow (package (name "apache-arrow") - (version "7.0.0") + (version "8.0.0") (source (origin (method git-fetch) @@ -4217,7 +4217,7 @@ the SQL language using a syntax that reflects the resulting query.") (file-name (git-file-name name version)) (sha256 (base32 - "19xx6mlddca79q6d3wga574m4y32ixmxx2rmk6j3f22i5c37mjzw")))) + "1gwiflk72pq1krc0sjzabypmh7slfyf7ak71fiypy3xgzw8a777c")))) (build-system cmake-build-system) (arguments `(#:tests? #f -- cgit v1.2.3 From 48efbde7a944acfe4fc944bf27bfa9ff82592024 Mon Sep 17 00:00:00 2001 From: Roel Janssen Date: Mon, 30 May 2022 09:03:02 +0200 Subject: gnu: virtuoso-ose: Update to 7.2.7. * gnu/packages/databases.scm (virtuoso-ose): Update to 7.2.7; Run autogen after applying the patch below. * gnu/packages/patches/virtuoso-ose-remove-pre-built-jar-files.patch: New file. --- gnu/packages/databases.scm | 26 ++++- .../virtuoso-ose-remove-pre-built-jar-files.patch | 117 +++++++++++++++++++++ 2 files changed, 141 insertions(+), 2 deletions(-) create mode 100644 gnu/packages/patches/virtuoso-ose-remove-pre-built-jar-files.patch (limited to 'gnu/packages/databases.scm') diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm index 2d72c78233..a161e29907 100644 --- a/gnu/packages/databases.scm +++ b/gnu/packages/databases.scm @@ -100,6 +100,7 @@ #:use-module (gnu packages gnome) #:use-module (gnu packages gnupg) #:use-module (gnu packages golang) + #:use-module (gnu packages gperf) #:use-module (gnu packages gtk) #:use-module (gnu packages guile) #:use-module (gnu packages icu4c) @@ -3229,14 +3230,30 @@ Memory-Mapped Database} (LMDB), a high-performance key-value store.") (define-public virtuoso-ose (package (name "virtuoso-ose") - (version "7.2.6") + (version "7.2.7") (source (origin (method url-fetch) (uri (string-append "mirror://sourceforge/virtuoso/virtuoso/" version "/" "virtuoso-opensource-" version ".tar.gz")) (sha256 - (base32 "0ly7s7a3w2a2zhhi9rq9k2qlnzapqbbc1rcdqb3zqqpgg81krz9q")))) + (base32 "1853ln0smiilf3pni70gq6nmi9ps039cy44g6b5i9d2z1n9hnj02")) + (patches (search-patches "virtuoso-ose-remove-pre-built-jar-files.patch")) + (modules '((guix build utils))) + ;; This snippet removes pre-built Java archives. + (snippet + '(for-each delete-file-recursively + (list "binsrc/hibernate" + "binsrc/jena" + "binsrc/jena2" + "binsrc/jena3" + "binsrc/jena4" + "binsrc/rdf4j" + "binsrc/sesame" + "binsrc/sesame2" + "binsrc/sesame3" + "binsrc/sesame4" + "libsrc/JDBCDriverType4"))))) (build-system gnu-build-system) (arguments `(#:tests? #f ; Tests require a network connection. @@ -3247,6 +3264,9 @@ Memory-Mapped Database} (LMDB), a high-performance key-value store.") "--enable-static=no") #:phases (modify-phases %standard-phases + (replace 'bootstrap + (lambda _ + (invoke "sh" "autogen.sh"))) ;; Even with "--enable-static=no", "libvirtuoso-t.a" is left in ;; the build output. The following phase removes it. (add-after 'install 'remove-static-libs @@ -3256,6 +3276,8 @@ Memory-Mapped Database} (LMDB), a high-performance key-value store.") (delete-file (string-append lib "/" file))) '("libvirtuoso-t.a" "libvirtuoso-t.la")))))))) + (native-inputs + (list autoconf automake bison flex gperf libtool)) (inputs (list openssl net-tools readline zlib)) (home-page "http://vos.openlinksw.com/owiki/wiki/VOS/") diff --git a/gnu/packages/patches/virtuoso-ose-remove-pre-built-jar-files.patch b/gnu/packages/patches/virtuoso-ose-remove-pre-built-jar-files.patch new file mode 100644 index 0000000000..17413c71ae --- /dev/null +++ b/gnu/packages/patches/virtuoso-ose-remove-pre-built-jar-files.patch @@ -0,0 +1,117 @@ +This patch disables build targets that contain pre-built Java archives that +would be copied to the build's output. + +Patch by Roel Janssen +*** a-virtuoso-opensource-7.2.7/binsrc/Makefile.am 1970-01-01 01:00:01.000000000 +0100 +--- b-virtuoso-opensource-7.2.7/binsrc/Makefile.am 2022-05-27 12:20:52.909135774 +0200 +*************** +*** 19,25 **** + # + # + +! SUBDIRS = dav mono virtuoso tests rdf_mappers driver maildrop sqldoc hosting bpel fct tutorial conductor samples vsp ws sync vspx vad cached_resources virtodbc virtoledb virtuoso_sink xddl VirtuosoClient.Net oat isparql jena jena2 jena3 jena4 sesame sesame2 sesame3 sesame4 redland hibernate dbpedia rdb2rdf rdf4j + + + # ---------------------------------------------------------------------- +--- 19,25 ---- + # + # + +! SUBDIRS = dav mono virtuoso tests rdf_mappers driver maildrop sqldoc hosting bpel fct tutorial conductor samples vsp ws sync vspx vad cached_resources virtodbc virtoledb virtuoso_sink xddl VirtuosoClient.Net oat isparql redland dbpedia rdb2rdf + + + # ---------------------------------------------------------------------- +*** a-virtuoso-opensource-7.2.7/configure.ac 1970-01-01 01:00:01.000000000 +0100 +--- b-virtuoso-opensource-7.2.7/configure.ac 2022-05-27 12:27:51.879208018 +0200 +*************** +*** 57,64 **** + dnl AM_INIT_AUTOMAKE([1.8]) + dnl AM_INIT_AUTOMAKE([1.9 tar-ustar]) + dnl +! AM_INIT_AUTOMAKE([1.9 tar-ustar]) +! + AM_MAINTAINER_MODE + + +--- 57,63 ---- + dnl AM_INIT_AUTOMAKE([1.8]) + dnl AM_INIT_AUTOMAKE([1.9 tar-ustar]) + dnl +! AM_INIT_AUTOMAKE([1.9 tar-ustar subdir-objects]) + AM_MAINTAINER_MODE + + +*************** +*** 3157,3163 **** + binsrc/dbpedia/Makefile + binsrc/driver/Makefile + binsrc/fct/Makefile +- binsrc/hibernate/Makefile + binsrc/hosting/Makefile + binsrc/hosting/mono/Makefile + binsrc/hosting/mono/tests/Makefile +--- 3156,3161 ---- +*************** +*** 3169,3184 **** + binsrc/hosting/ruby/Makefile + binsrc/hosting/shapefileio/Makefile + binsrc/isparql/Makefile +- binsrc/jena/Makefile +- binsrc/jena2/Makefile +- binsrc/jena3/Makefile +- binsrc/jena4/Makefile + binsrc/maildrop/Makefile + binsrc/mono/Makefile + binsrc/oat/Makefile + binsrc/rdf_mappers/Makefile + binsrc/rdb2rdf/Makefile +- binsrc/rdf4j/Makefile + binsrc/redland/Makefile + binsrc/samples/demo/Makefile + binsrc/samples/hslookup/Makefile +--- 3167,3177 ---- +*************** +*** 3191,3200 **** + binsrc/samples/webapp/Makefile + binsrc/samples/xpath/Makefile + binsrc/samples/xquery/Makefile +- binsrc/sesame/Makefile +- binsrc/sesame2/Makefile +- binsrc/sesame3/Makefile +- binsrc/sesame4/Makefile + binsrc/sqldoc/Makefile + binsrc/sync/Makefile + binsrc/tests/biftest/Makefile +--- 3184,3189 ---- +*************** +*** 3236,3245 **** + docsrc/stylesheets/Makefile + docsrc/xmlsource/Makefile + libsrc/Dk/Makefile +- libsrc/JDBCDriverType4/Makefile +- libsrc/JDBCDriverType4/testsuite_4.0/Makefile +- libsrc/JDBCDriverType4/virtuoso/jdbc/Makefile +- libsrc/JDBCDriverType4/virtuoso/Makefile + libsrc/langfunc/Makefile + libsrc/odbcsdk/Makefile + libsrc/plugin/Makefile +--- 3225,3230 ---- +*** a-virtuoso-opensource-7.2.7/libsrc/Makefile.am 1970-01-01 01:00:01.000000000 +0100 +--- b-virtuoso-opensource-7.2.7/libsrc/Makefile.am 2022-05-27 12:30:12.658593011 +0200 +*************** +*** 19,25 **** + # + # + +! SUBDIRS = util zlib odbcsdk Dk Thread langfunc Wi plugin Tidy Xml.new JDBCDriverType4 + + noinst_HEADERS = Dk.h libutil.h + +--- 19,25 ---- + # + # + +! SUBDIRS = util zlib odbcsdk Dk Thread langfunc Wi plugin Tidy Xml.new + + noinst_HEADERS = Dk.h libutil.h + -- cgit v1.2.3 From 466d81aae4386ed4601fc44bd408268dca4859e5 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Fri, 29 Apr 2022 13:42:29 -0400 Subject: gnu: Remove python2-neo4j-driver. * gnu/packages/databases.scm (python2-neo4j-driver): Delete variable. --- gnu/packages/databases.scm | 21 --------------------- 1 file changed, 21 deletions(-) (limited to 'gnu/packages/databases.scm') diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm index a161e29907..7e3b9f110a 100644 --- a/gnu/packages/databases.scm +++ b/gnu/packages/databases.scm @@ -3674,27 +3674,6 @@ managers for automatically closing connections.") (description "This package implements async database support for Python.") (license license:bsd-3))) -(define-public python2-neo4j-driver - (package - (name "python2-neo4j-driver") - ;; NOTE: When upgrading to 1.5.0, please add a python3 variant. - (version "1.4.0") - (source (origin - (method url-fetch) - (uri (pypi-uri "neo4j-driver" version)) - (sha256 - (base32 - "011r1vh182p8mm83d8dz9rfnc3l7rf7fd00cyrbyfzi71jmc4g98")))) - (build-system python-build-system) - (arguments - `(#:python ,python-2)) - (home-page "https://neo4j.com/developer/python/") - (synopsis "Neo4j driver code written in Python") - (description "This package provides the Neo4j Python driver that connects -to the database using Neo4j's binary protocol. It aims to be minimal, while -being idiomatic to Python.") - (license license:asl2.0))) - (define-public python2-py2neo (package (name "python2-py2neo") -- cgit v1.2.3 From 1aab8a5114a57fc131fe22ad8d62a6426b7792fc Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Fri, 29 Apr 2022 13:42:33 -0400 Subject: gnu: Remove python2-redis. * gnu/packages/databases.scm (python2-redis): Delete variable. --- gnu/packages/databases.scm | 3 --- 1 file changed, 3 deletions(-) (limited to 'gnu/packages/databases.scm') diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm index 7e3b9f110a..e485b95b9c 100644 --- a/gnu/packages/databases.scm +++ b/gnu/packages/databases.scm @@ -4020,9 +4020,6 @@ reasonable substitute.") "This package provides a Python interface to the Redis key-value store.") (license license:expat))) -(define-public python2-redis - (package-with-python2 python-redis)) - (define-public python-rq (package (name "python-rq") -- cgit v1.2.3 From 5ed4cfb924518a83a7e02f27fb77b8a295d15ae3 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Fri, 29 Apr 2022 13:42:37 -0400 Subject: gnu: Remove python2-trollius-redis. * gnu/packages/databases.scm (python2-trollius-redis): Delete variable. --- gnu/packages/databases.scm | 3 --- 1 file changed, 3 deletions(-) (limited to 'gnu/packages/databases.scm') diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm index e485b95b9c..7592572be9 100644 --- a/gnu/packages/databases.scm +++ b/gnu/packages/databases.scm @@ -4117,9 +4117,6 @@ is designed to have a low barrier to entry.") Redis protocol.") (license license:bsd-2))) -(define-public python2-trollius-redis - (package-with-python2 python-trollius-redis)) - (define-public python-sqlparse (package (name "python-sqlparse") -- cgit v1.2.3 From 80963d9b0f95d03bddc4f55174e80b9f11c04abc Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Fri, 29 Apr 2022 13:42:40 -0400 Subject: gnu: Remove python2-peewee. * gnu/packages/databases.scm (python2-peewee): Delete variable. --- gnu/packages/databases.scm | 3 --- 1 file changed, 3 deletions(-) (limited to 'gnu/packages/databases.scm') diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm index 7592572be9..4ff18ce628 100644 --- a/gnu/packages/databases.scm +++ b/gnu/packages/databases.scm @@ -2877,9 +2877,6 @@ support for sqlite, mysql and postgresql. If you already have a database, you can autogenerate peewee models using @code{pwiz}, a model generator.") (license license:expat))) -(define-public python2-peewee - (package-with-python2 python-peewee)) - (define-public python-pypika-tortoise (package (name "python-pypika-tortoise") -- cgit v1.2.3 From f503181ffbd30629c28398328e3c724d7a5e40b4 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Fri, 29 Apr 2022 13:42:44 -0400 Subject: gnu: Remove python2-ccm. * gnu/packages/databases.scm (python2-ccm): Delete variable. --- gnu/packages/databases.scm | 3 --- 1 file changed, 3 deletions(-) (limited to 'gnu/packages/databases.scm') diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm index 4ff18ce628..f6b0c60ae4 100644 --- a/gnu/packages/databases.scm +++ b/gnu/packages/databases.scm @@ -3311,9 +3311,6 @@ local Cassandra clusters. It creates, launches and removes Cassandra clusters on localhost.") (license license:asl2.0))) -(define-public python2-ccm - (package-with-python2 python-ccm)) - (define-public python2-pysqlite (package (name "python2-pysqlite") -- cgit v1.2.3 From 3ad04860d58d703a220e62651c09d90e4e1a363d Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Fri, 29 Apr 2022 13:42:47 -0400 Subject: gnu: Remove python2-apsw. * gnu/packages/databases.scm (python2-apsw): Delete variable. --- gnu/packages/databases.scm | 3 --- 1 file changed, 3 deletions(-) (limited to 'gnu/packages/databases.scm') diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm index f6b0c60ae4..64ca0db19d 100644 --- a/gnu/packages/databases.scm +++ b/gnu/packages/databases.scm @@ -3609,9 +3609,6 @@ pysqlite it focuses on being a minimal layer over SQLite attempting just to translate the complete SQLite API into Python.") (license license:zlib))) -(define-public python2-apsw - (package-with-python2 python-apsw)) - (define-public python-aiosqlite (package (name "python-aiosqlite") -- cgit v1.2.3 From 25e4ddd84911d8ec16a22fc0ec6f4c66523c9af7 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Fri, 29 Apr 2022 13:42:58 -0400 Subject: gnu: Remove python2-py2neo. * gnu/packages/databases.scm (python2-py2neo): Delete variable. --- gnu/packages/databases.scm | 21 --------------------- 1 file changed, 21 deletions(-) (limited to 'gnu/packages/databases.scm') diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm index 64ca0db19d..4f7e2d92ec 100644 --- a/gnu/packages/databases.scm +++ b/gnu/packages/databases.scm @@ -3665,27 +3665,6 @@ managers for automatically closing connections.") (description "This package implements async database support for Python.") (license license:bsd-3))) -(define-public python2-py2neo - (package - (name "python2-py2neo") - (version "3.1.2") - (source (origin - (method url-fetch) - (uri (pypi-uri "py2neo" version)) - (sha256 - (base32 - "1f1q95vqcvlc3nsc33p841swnjdcjazddlq2dzi3qfnjqjrajxw1")))) - (build-system python-build-system) - (arguments - `(#:python ,python-2)) - (home-page "https://py2neo.org") - (synopsis "Library and toolkit for working with Neo4j in Python") - (description "This package provides a client library and toolkit for -working with Neo4j from within Python applications and from the command -line. The core library has no external dependencies and has been carefully -designed to be easy and intuitive to use.") - (license license:asl2.0))) - (define-public python-psycopg2 (package (name "python-psycopg2") -- cgit v1.2.3 From e9121c2dda090fcb4f2ba5948ca10c8bafd85e7f Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Fri, 29 Apr 2022 13:43:01 -0400 Subject: gnu: Remove python2-pyodbc-c. * gnu/packages/databases.scm (python2-pyodbc-c): Delete variable. --- gnu/packages/databases.scm | 3 --- 1 file changed, 3 deletions(-) (limited to 'gnu/packages/databases.scm') diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm index 4f7e2d92ec..f720938e7e 100644 --- a/gnu/packages/databases.scm +++ b/gnu/packages/databases.scm @@ -3092,9 +3092,6 @@ development.") for ODBC.") (license (license:x11-style "file://LICENSE.TXT")))) -(define-public python2-pyodbc-c - (package-with-python2 python-pyodbc-c)) - (define-public python-pyodbc (package (name "python-pyodbc") -- cgit v1.2.3 From bef8185d0880c79fc245e672497bd1e7e0c197b0 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Fri, 29 Apr 2022 13:43:05 -0400 Subject: gnu: Remove python2-pymysql. * gnu/packages/databases.scm (python2-pymysql): Delete variable. --- gnu/packages/databases.scm | 3 --- 1 file changed, 3 deletions(-) (limited to 'gnu/packages/databases.scm') diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm index f720938e7e..d1ea99fe84 100644 --- a/gnu/packages/databases.scm +++ b/gnu/packages/databases.scm @@ -1526,9 +1526,6 @@ CSV, DB3, iXF, SQLite, MS-SQL or MySQL to PostgreSQL.") Most public APIs are compatible with @command{mysqlclient} and MySQLdb.") (license license:expat))) -(define-public python2-pymysql - (package-with-python2 python-pymysql)) - (define-public qdbm (package (name "qdbm") -- cgit v1.2.3 From 716b5bd9d94d7e0f62c1345d16cbc2f008ad279f Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Fri, 29 Apr 2022 13:43:08 -0400 Subject: gnu: Remove python2-hiredis. * gnu/packages/databases.scm (python2-hiredis): Delete variable. --- gnu/packages/databases.scm | 3 --- 1 file changed, 3 deletions(-) (limited to 'gnu/packages/databases.scm') diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm index d1ea99fe84..9c46a5a9d2 100644 --- a/gnu/packages/databases.scm +++ b/gnu/packages/databases.scm @@ -3895,9 +3895,6 @@ for Python. The design goals are: parsing code in hiredis. It primarily speeds up parsing of multi bulk replies.") (license license:bsd-3))) -(define-public python2-hiredis - (package-with-python2 python-hiredis)) - (define-public python-aioredis (package (name "python-aioredis") -- cgit v1.2.3 From d76de71dd6c451cef19a9477b8a8b417bf916f49 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Fri, 29 Apr 2022 17:33:11 -0400 Subject: gnu: Remove python2-pyodbc. * gnu/packages/databases.scm (python2-pyodbc): Delete variable. --- gnu/packages/databases.scm | 3 --- 1 file changed, 3 deletions(-) (limited to 'gnu/packages/databases.scm') diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm index 9c46a5a9d2..c548041955 100644 --- a/gnu/packages/databases.scm +++ b/gnu/packages/databases.scm @@ -3111,9 +3111,6 @@ for ODBC.") for ODBC.") (license (license:x11-style "file:///LICENSE.TXT")))) -(define-public python2-pyodbc - (package-with-python2 python-pyodbc)) - (define-public mdbtools (package (name "mdbtools") -- cgit v1.2.3 From 9384d5de3c72d7d362c272b229ec951845160552 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Fri, 29 Apr 2022 17:33:15 -0400 Subject: gnu: Remove python2-pickleshare. * gnu/packages/databases.scm (python2-pickleshare): Delete variable. --- gnu/packages/databases.scm | 9 --------- 1 file changed, 9 deletions(-) (limited to 'gnu/packages/databases.scm') diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm index c548041955..f90a1b6c74 100644 --- a/gnu/packages/databases.scm +++ b/gnu/packages/databases.scm @@ -3546,17 +3546,8 @@ value in database is immediately visible to other processes accessing the same database. Concurrency is possible because the values are stored in separate files. Hence the “database” is a directory where all files are governed by PickleShare.") - (properties `((python2-variant . ,(delay python2-pickleshare)))) (license license:expat))) -(define-public python2-pickleshare - (let ((pickleshare (package-with-python2 - (strip-python2-variant python-pickleshare)))) - (package (inherit pickleshare) - (propagated-inputs (modify-inputs (package-propagated-inputs - pickleshare) - (prepend python2-pathlib2)))))) - (define-public python-apsw (package (name "python-apsw") -- cgit v1.2.3 From 9f917c945eb4fd2478823d3c73f4a2db30be1b07 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Fri, 29 Apr 2022 21:18:33 -0400 Subject: gnu: Remove python2-sqlalchemy. * gnu/packages/databases.scm (python2-sqlalchemy): Delete variable. --- gnu/packages/databases.scm | 24 ------------------------ 1 file changed, 24 deletions(-) (limited to 'gnu/packages/databases.scm') diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm index f90a1b6c74..7be109a6bc 100644 --- a/gnu/packages/databases.scm +++ b/gnu/packages/databases.scm @@ -3364,30 +3364,6 @@ designed for efficient and high-performing database access, adapted into a simple and Pythonic domain language.") (license license:x11))) -(define-public python2-sqlalchemy - (let ((base (package-with-python2 python-sqlalchemy))) - (package - (inherit base) - (arguments - (substitute-keyword-arguments (package-arguments base) - ((#:phases phases) - #~(modify-phases #$phases - (replace 'check - (lambda* (#:key tests? #:allow-other-keys) - (when tests? - (invoke "pytest" "-vv" - ;; The memory usage tests are very expensive and run in - ;; sequence; skip them. - "-k" - (string-append - "not test_memusage.py" - ;; This test fails with "AssertionError: Warnings - ;; were not seen [...]". - " and not test_fixture_five"))))))))) - ;; Do not use pytest-xdist, which is broken for Python 2. - (native-inputs (modify-inputs (package-native-inputs base) - (delete "python-pytest-xdist")))))) - (define-public python-sqlalchemy-stubs (package (name "python-sqlalchemy-stubs") -- cgit v1.2.3 From 7cd3a88f27b4d90b18cba1dd1fd1e1b9cc4c8f8e Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Thu, 12 May 2022 17:01:08 -0400 Subject: gnu: Remove python2-pysqlite. * gnu/packages/databases.scm (python2-pysqlite): Delete variable. --- gnu/packages/databases.scm | 24 ------------------------ 1 file changed, 24 deletions(-) (limited to 'gnu/packages/databases.scm') diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm index 7be109a6bc..cd5045ed12 100644 --- a/gnu/packages/databases.scm +++ b/gnu/packages/databases.scm @@ -3302,30 +3302,6 @@ local Cassandra clusters. It creates, launches and removes Cassandra clusters on localhost.") (license license:asl2.0))) -(define-public python2-pysqlite - (package - (name "python2-pysqlite") - (version "2.8.3") - (source - (origin - (method url-fetch) - (uri (pypi-uri "pysqlite" version)) - (sha256 - (base32 - "1424gwq9sil2ffmnizk60q36vydkv8rxs6m7xs987kz8cdc37lqp")))) - (build-system python-build-system) - (inputs - (list sqlite)) - (arguments - `(#:python ,python-2 ; incompatible with Python 3 - #:tests? #f)) ; no test target - (home-page "https://github.com/ghaering/pysqlite") - (synopsis "SQLite bindings for Python") - (description - "Pysqlite provides SQLite bindings for Python that comply to the -Database API 2.0T.") - (license license:zlib))) - (define-public python-sqlalchemy (package (name "python-sqlalchemy") -- cgit v1.2.3 From e7ccfbed19ed385c7687414beb3279d8649d9a97 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Fri, 13 May 2022 14:41:54 -0400 Subject: gnu: libpqxx: Update to 7.7.3. * gnu/packages/databases.scm (libpqxx): Update to 7.7.3. [source]: Use git. [native-inputs]: Replace python-2 with python-wrapper. Add gcc-11. [tests?]: Expound comment. [phases]: Delete argument. --- gnu/packages/databases.scm | 27 +++++++++------------------ 1 file changed, 9 insertions(+), 18 deletions(-) (limited to 'gnu/packages/databases.scm') diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm index cd5045ed12..56f6b92b4c 100644 --- a/gnu/packages/databases.scm +++ b/gnu/packages/databases.scm @@ -2788,29 +2788,20 @@ semantics.") (define-public libpqxx (package (name "libpqxx") - (version "4.0.1") + (version "7.7.3") (source (origin - (method url-fetch) - (uri (string-append - "http://pqxx.org/download/software/libpqxx/" - name "-" version ".tar.gz")) + (method git-fetch) + (uri (git-reference + (url "https://github.com/jtv/libpqxx") + (commit version))) + (file-name (git-file-name name version)) (sha256 (base32 - "0f6wxspp6rx12fkasanb0z2g2gc8dhcfwnxagx8wwqbpg6ifsz09")))) + "1mrhsih5bhiin0l3c4vp22l9p7c5035m0vvqpx18c0407fkzc7hp")))) (build-system gnu-build-system) - (native-inputs - `(("python" ,python-2))) + (native-inputs (list gcc-11 python-wrapper)) (inputs (list postgresql)) - (arguments - `(#:tests? #f ; # FAIL: 1 - #:phases - (modify-phases %standard-phases - (add-before 'configure 'fix-sed-command - (lambda _ - ;; Newer sed versions error out if double brackets are not used. - (substitute* "configure" - (("\\[:space:\\]") "[[:space:]]")) - #t))))) + (arguments '(#:tests? #f)) ;tests require a running PostgreSQL server (synopsis "C++ connector for PostgreSQL") (description "Libpqxx is a C++ library to enable user programs to communicate with the -- cgit v1.2.3 From b0193c649fa70b31c2c63f82abb7cf9309066b6c Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Fri, 13 May 2022 14:56:29 -0400 Subject: gnu: Remove 4store. * gnu/packages/databases.scm (4store): Delete variable. * gnu/packages/patches/4store-fix-buildsystem.patch: Delete file. * gnu/packages/patches/4store-unset-preprocessor-directive.patch: Likewise. * gnu/local.mk (dist_patch_DATA): De-register them. --- gnu/local.mk | 2 - gnu/packages/databases.scm | 41 ---------------- gnu/packages/patches/4store-fix-buildsystem.patch | 56 ---------------------- .../4store-unset-preprocessor-directive.patch | 16 ------- 4 files changed, 115 deletions(-) delete mode 100644 gnu/packages/patches/4store-fix-buildsystem.patch delete mode 100644 gnu/packages/patches/4store-unset-preprocessor-directive.patch (limited to 'gnu/packages/databases.scm') diff --git a/gnu/local.mk b/gnu/local.mk index 947669459e..06cf32b916 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -825,8 +825,6 @@ MODULES_NOT_COMPILED += \ patchdir = $(guilemoduledir)/%D%/packages/patches dist_patch_DATA = \ - %D%/packages/patches/4store-fix-buildsystem.patch \ - %D%/packages/patches/4store-unset-preprocessor-directive.patch \ %D%/packages/patches/a2ps-CVE-2001-1593.patch \ %D%/packages/patches/a2ps-CVE-2014-0466.patch \ %D%/packages/patches/a2ps-CVE-2015-8107.patch \ diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm index 56f6b92b4c..09d825af3e 100644 --- a/gnu/packages/databases.scm +++ b/gnu/packages/databases.scm @@ -177,47 +177,6 @@ #:use-module (srfi srfi-26) #:use-module (ice-9 match)) -(define-public 4store - (package - (name "4store") - (version "1.1.6") - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/4store/4store") - (commit (string-append "v" version)))) - (file-name (git-file-name name version)) - (sha256 - (base32 "1kzdfmwpzy64cgqlkcz5v4klwx99w0jk7afckyf7yqbqb4rydmpk")) - (patches (search-patches "4store-unset-preprocessor-directive.patch" - "4store-fix-buildsystem.patch")))) - (build-system gnu-build-system) - (native-inputs - (list perl - python-2 - autoconf - automake - gettext-minimal - libtool - `(,pcre "bin") ;for 'pcre-config' - pkg-config)) - (inputs - (list glib - rasqal - libxml2 - raptor2 - readline - avahi - cyrus-sasl - openssl - `(,util-linux "lib"))) - ;; 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") - (description "4store is a RDF/SPARQL store written in C, supporting -either single machines or networked clusters.") - (license license:gpl3+))) - (define-public ephemeralpg (package (name "ephemeralpg") diff --git a/gnu/packages/patches/4store-fix-buildsystem.patch b/gnu/packages/patches/4store-fix-buildsystem.patch deleted file mode 100644 index 383baa9461..0000000000 --- a/gnu/packages/patches/4store-fix-buildsystem.patch +++ /dev/null @@ -1,56 +0,0 @@ -This patch sets a fixed version to avoid needing Git and the .git/ folder. -It also removes the creation of "/var/lib/4store", which is not available -during the install phase in GNU Guix. - -Patch by Roel Janssen -*** a/configure.ac Wed Feb 4 19:05:24 2015 ---- b/configure.ac Wed Mar 23 11:20:38 2016 -*************** -*** 2,13 **** - # Process this file with autoconf to produce a configure script. - - AC_PREREQ([2.50]) -! AC_INIT([4store], m4_esyscmd([./version.sh .version]), [http://4store.org/support/], [4store]) - AC_CONFIG_SRCDIR([src/backend/backend-intl.h]) -! AM_INIT_AUTOMAKE([1.7 std-options -Wall]) - AC_CONFIG_HEADERS(4store-config.h) - - # Checks for programs. - AC_PROG_LIBTOOL - AC_PROG_AWK - AC_PROG_CC ---- 2,14 ---- - # Process this file with autoconf to produce a configure script. - - AC_PREREQ([2.50]) -! AC_INIT([4store], [1.1.6], [http://4store.org/support/], [4store]) - AC_CONFIG_SRCDIR([src/backend/backend-intl.h]) -! AM_INIT_AUTOMAKE([1.7 std-options foreign -Wall]) - AC_CONFIG_HEADERS(4store-config.h) - - # Checks for programs. -+ AM_PROG_AR - AC_PROG_LIBTOOL - AC_PROG_AWK - AC_PROG_CC - -*** a/src/utilities/Makefile.am Wed Feb 4 19:05:24 2015 ---- b/src/utilities/Makefile.am Wed Mar 23 14:05:56 2016 -*************** -*** 13,20 **** - noinst_PROGRAMS = lex-file-verify 4s-rid - - install-data-local: -! mkdir -p $(DESTDIR)@FS_STORE_ROOT@ -! chmod 1777 $(DESTDIR)@FS_STORE_ROOT@ - - 4s_backend_destroy_SOURCES = backend-destroy.c - 4s_backend_destroy_LDADD = ../common/lib4sintl.a ---- 13,19 ---- - noinst_PROGRAMS = lex-file-verify 4s-rid - - install-data-local: -! echo "Please create the following directory: " $(DESTDIR)@FS_STORE_ROOT@ - - 4s_backend_destroy_SOURCES = backend-destroy.c - 4s_backend_destroy_LDADD = ../common/lib4sintl.a diff --git a/gnu/packages/patches/4store-unset-preprocessor-directive.patch b/gnu/packages/patches/4store-unset-preprocessor-directive.patch deleted file mode 100644 index c4b1d6eda4..0000000000 --- a/gnu/packages/patches/4store-unset-preprocessor-directive.patch +++ /dev/null @@ -1,16 +0,0 @@ -This patch removes the _XOPEN_SOURCE preprocessor directive as it does not seem to be needed. -Setting it removes the definition of strdup, which is used in filter-datatypes.c. - -Patch by Roel Janssen -*** a/src/frontend/filter-datatypes.c 1970-01-01 01:00:00.000000000 +0100 ---- b/src/frontend/filter-datatypes.c 2018-04-03 17:39:23.177905592 +0200 -*************** -*** 18,24 **** - * Copyright (C) 2006 Steve Harris for Garlik - */ - -- #define _XOPEN_SOURCE - #include - #include - #include ---- 18,23 ---- -- cgit v1.2.3