GNU bug report logs -
#73692
[PATCH] gnu: timescaledb: Update to 2.16.1. [security fixes]
Previous Next
Reported by: Nicolas Graves <ngraves <at> ngraves.fr>
Date: Tue, 8 Oct 2024 06:27:02 UTC
Severity: normal
Tags: patch
Done: Zheng Junjie <zhengjunjie <at> iscas.ac.cn>
Bug is archived. No further changes may be made.
To add a comment to this bug, you must first unarchive it, by sending
a message to control AT debbugs.gnu.org, with unarchive 73692 in the body.
You can then email your comments to 73692 AT debbugs.gnu.org in the normal way.
Toggle the display of automated, internal messages from the tracker.
Report forwarded
to
guix-patches <at> gnu.org:
bug#73692; Package
guix-patches.
(Tue, 08 Oct 2024 06:27:02 GMT)
Full text and
rfc822 format available.
Acknowledgement sent
to
Nicolas Graves <ngraves <at> ngraves.fr>:
New bug report received and forwarded. Copy sent to
guix-patches <at> gnu.org.
(Tue, 08 Oct 2024 06:27:03 GMT)
Full text and
rfc822 format available.
Message #5 received at submit <at> debbugs.gnu.org (full text, mbox):
This fixes CVE-2023-25149.
* gnu/packages/databases.scm (timescaledb): Update to 2.16.1.
---
gnu/packages/databases.scm | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm
index 784e633626..7854a98431 100644
--- a/gnu/packages/databases.scm
+++ b/gnu/packages/databases.scm
@@ -1412,7 +1412,7 @@ (define-public postgresql postgresql-14)
(define-public timescaledb
(package
(name "timescaledb")
- (version "2.8.1")
+ (version "2.16.1")
(source (origin
(method git-fetch)
(uri (git-reference
@@ -1421,7 +1421,7 @@ (define-public timescaledb
(file-name (git-file-name name version))
(sha256
(base32
- "1gbadna0ilmqad7sbrixm12wd71h43njhsbp1kh5lispb6drdb6r"))
+ "1v17x00a15il4r3rbr0waqjv1nwzy6rcqxgfi2hdk1x235s5dg5h"))
(modules '((guix build utils)))
(snippet
;; Remove files carrying the proprietary TIMESCALE license.
--
2.46.0
Information forwarded
to
guix-patches <at> gnu.org:
bug#73692; Package
guix-patches.
(Wed, 16 Oct 2024 05:13:02 GMT)
Full text and
rfc822 format available.
Message #8 received at 73692 <at> debbugs.gnu.org (full text, mbox):
* gnu/packages/databases.scm (timescaledb):
[arguments]<#:phases>: Add phase 'patch-failing-tests.
---
gnu/packages/databases.scm | 15 +++++++++++++++
1 file changed, 15 insertions(+)
diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm
index 43ec0641a0..80163cfdc0 100644
--- a/gnu/packages/databases.scm
+++ b/gnu/packages/databases.scm
@@ -1502,6 +1502,21 @@ (define-public timescaledb
"-o" (string-append "-k " pg-data)
"-l" (string-append pg-data "/db.log")
"start"))))
+ #$@(if (not (target-x86-64?))
+ #~((add-after 'unpack 'patch-failing-tests
+ (lambda _
+ (substitute* "test/CMakeLists.txt"
+ (((format
+ #f "(~{~a|~})"
+ (cons*
+ "histogram_test\\.sql\\.in"
+ #$@(if (target-aarch64?)
+ #~((list "append\\.sql\\.in"
+ "chunk_adaptative\\.sql"))
+ #~((list)))))
+ all)
+ (string-append "#" all))))))
+ #~())
(add-after 'prepare-tests 'check
(assoc-ref %standard-phases 'check)))))
(inputs (list openssl postgresql))
--
2.46.0
Information forwarded
to
guix-patches <at> gnu.org:
bug#73692; Package
guix-patches.
(Wed, 16 Oct 2024 12:30:02 GMT)
Full text and
rfc822 format available.
Message #11 received at submit <at> debbugs.gnu.org (full text, mbox):
[Message part 1 (text/plain, inline)]
Nicolas Graves via Guix-patches via <guix-patches <at> gnu.org> writes:
> * gnu/packages/databases.scm (timescaledb):
> [arguments]<#:phases>: Add phase 'patch-failing-tests.
> ---
> gnu/packages/databases.scm | 15 +++++++++++++++
> 1 file changed, 15 insertions(+)
>
> diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm
> index 43ec0641a0..80163cfdc0 100644
> --- a/gnu/packages/databases.scm
> +++ b/gnu/packages/databases.scm
> @@ -1502,6 +1502,21 @@ (define-public timescaledb
> "-o" (string-append "-k " pg-data)
> "-l" (string-append pg-data "/db.log")
> "start"))))
> + #$@(if (not (target-x86-64?))
> + #~((add-after 'unpack 'patch-failing-tests
> + (lambda _
> + (substitute* "test/CMakeLists.txt"
> + (((format
> + #f "(~{~a|~})"
I think it's best to keep it simple and not use overly complex
features.
> + (cons*
> + "histogram_test\\.sql\\.in"
> + #$@(if (target-aarch64?)
> + #~((list "append\\.sql\\.in"
> + "chunk_adaptative\\.sql"))
> + #~((list)))))
> + all)
> + (string-append "#" all))))))
> + #~())
> (add-after 'prepare-tests 'check
> (assoc-ref %standard-phases 'check)))))
> (inputs (list openssl postgresql))
[signature.asc (application/pgp-signature, inline)]
Information forwarded
to
guix-patches <at> gnu.org:
bug#73692; Package
guix-patches.
(Wed, 16 Oct 2024 12:30:02 GMT)
Full text and
rfc822 format available.
Information forwarded
to
guix-patches <at> gnu.org:
bug#73692; Package
guix-patches.
(Wed, 16 Oct 2024 17:20:02 GMT)
Full text and
rfc822 format available.
Message #17 received at 73692 <at> debbugs.gnu.org (full text, mbox):
On 2024-10-16 20:28, Z572 wrote:
> Nicolas Graves via Guix-patches via <guix-patches <at> gnu.org> writes:
>
>> * gnu/packages/databases.scm (timescaledb):
>> [arguments]<#:phases>: Add phase 'patch-failing-tests.
>> ---
>> gnu/packages/databases.scm | 15 +++++++++++++++
>> 1 file changed, 15 insertions(+)
>>
>> diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm
>> index 43ec0641a0..80163cfdc0 100644
>> --- a/gnu/packages/databases.scm
>> +++ b/gnu/packages/databases.scm
>> @@ -1502,6 +1502,21 @@ (define-public timescaledb
>> "-o" (string-append "-k " pg-data)
>> "-l" (string-append pg-data "/db.log")
>> "start"))))
>> + #$@(if (not (target-x86-64?))
>> + #~((add-after 'unpack 'patch-failing-tests
>> + (lambda _
>> + (substitute* "test/CMakeLists.txt"
>> + (((format
>> + #f "(~{~a|~})"
>
> I think it's best to keep it simple and not use overly complex
> features.
I agree but this bit is indeed particularly tricky. I can move from
complex format to string-append + string-join, from cons* to append
list, and drop the not, but ultimately I feel selectively ignoring tests
by system is complex in itself. Let's see what QA says, then simplify
that, but if you have a better solution, don't hesitate to put it
forward ;)
>
>> + (cons*
>> + "histogram_test\\.sql\\.in"
>> + #$@(if (target-aarch64?)
>> + #~((list "append\\.sql\\.in"
>> + "chunk_adaptative\\.sql"))
>> + #~((list)))))
>> + all)
>> + (string-append "#" all))))))
>> + #~())
>> (add-after 'prepare-tests 'check
>> (assoc-ref %standard-phases 'check)))))
>> (inputs (list openssl postgresql))
--
Best regards,
Nicolas Graves
Information forwarded
to
guix-patches <at> gnu.org:
bug#73692; Package
guix-patches.
(Wed, 16 Oct 2024 23:25:02 GMT)
Full text and
rfc822 format available.
Message #20 received at 73692 <at> debbugs.gnu.org (full text, mbox):
This fixes CVE-2023-25149.
* gnu/packages/databases.scm (timescaledb): Update to 2.16.1.
---
gnu/packages/databases.scm | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm
index f05566becd..43ec0641a0 100644
--- a/gnu/packages/databases.scm
+++ b/gnu/packages/databases.scm
@@ -1412,7 +1412,7 @@ (define-public postgresql postgresql-14)
(define-public timescaledb
(package
(name "timescaledb")
- (version "2.8.1")
+ (version "2.16.1")
(source (origin
(method git-fetch)
(uri (git-reference
@@ -1421,7 +1421,7 @@ (define-public timescaledb
(file-name (git-file-name name version))
(sha256
(base32
- "1gbadna0ilmqad7sbrixm12wd71h43njhsbp1kh5lispb6drdb6r"))
+ "1v17x00a15il4r3rbr0waqjv1nwzy6rcqxgfi2hdk1x235s5dg5h"))
(modules '((guix build utils)))
(snippet
;; Remove files carrying the proprietary TIMESCALE license.
--
2.46.0
Information forwarded
to
guix-patches <at> gnu.org:
bug#73692; Package
guix-patches.
(Wed, 16 Oct 2024 23:25:03 GMT)
Full text and
rfc822 format available.
Message #23 received at 73692 <at> debbugs.gnu.org (full text, mbox):
* gnu/packages/databases.scm (timescaledb):
[arguments]<#:phases>: Add phase 'patch-failing-tests.
---
gnu/packages/databases.scm | 17 +++++++++++++++++
1 file changed, 17 insertions(+)
diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm
index 43ec0641a0..f5849242be 100644
--- a/gnu/packages/databases.scm
+++ b/gnu/packages/databases.scm
@@ -1502,6 +1502,23 @@ (define-public timescaledb
"-o" (string-append "-k " pg-data)
"-l" (string-append pg-data "/db.log")
"start"))))
+ #$@(if (target-x86-64?)
+ #~()
+ #~((add-after 'unpack 'skip-failing-tests
+ (lambda _
+ (substitute* "test/sql/CMakeLists.txt"
+ (((string-append
+ "("
+ (string-join
+ #$@(if (target-aarch64?)
+ #~('("append\\.sql\\.in"
+ "chunk_adaptative\\.sql"
+ "histogram_test\\.sql\\.in"))
+ #~('("histogram_test\\.sql\\.in")))
+ "|")
+ ")")
+ all)
+ (string-append "#" all)))))))
(add-after 'prepare-tests 'check
(assoc-ref %standard-phases 'check)))))
(inputs (list openssl postgresql))
--
2.46.0
Information forwarded
to
guix-patches <at> gnu.org:
bug#73692; Package
guix-patches.
(Thu, 17 Oct 2024 04:39:02 GMT)
Full text and
rfc822 format available.
Message #26 received at 73692 <at> debbugs.gnu.org (full text, mbox):
* gnu/packages/databases.scm (timescaledb):
[arguments]<#:phases>: Add phase 'patch-failing-tests.
---
gnu/packages/databases.scm | 19 +++++++++++++++++++
1 file changed, 19 insertions(+)
diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm
index 43ec0641a0..3331d9849a 100644
--- a/gnu/packages/databases.scm
+++ b/gnu/packages/databases.scm
@@ -1502,6 +1502,25 @@ (define-public timescaledb
"-o" (string-append "-k " pg-data)
"-l" (string-append pg-data "/db.log")
"start"))))
+ #$@(if (target-x86-64?)
+ #~()
+ #~((add-after 'unpack 'skip-failing-tests
+ (lambda _
+ #$@(if (target-aarch64?)
+ #~((substitute* "test/sql/CMakeLists.txt"
+ (((string-append
+ "("
+ (string-join
+ '("append\\.sql\\.in"
+ "chunk_adaptative\\.sql"
+ "histogram_test\\.sql\\.in")
+ "|")
+ ")")
+ all)
+ (string-append "#" all))))
+ #~((substitute* "test/sql/CMakeLists.txt"
+ (("histogram_test\\.sql\\.in" all)
+ (string-append "#" all)))))))))
(add-after 'prepare-tests 'check
(assoc-ref %standard-phases 'check)))))
(inputs (list openssl postgresql))
--
2.46.0
Information forwarded
to
guix-patches <at> gnu.org:
bug#73692; Package
guix-patches.
(Thu, 17 Oct 2024 04:39:02 GMT)
Full text and
rfc822 format available.
Message #29 received at 73692 <at> debbugs.gnu.org (full text, mbox):
This fixes CVE-2023-25149.
* gnu/packages/databases.scm (timescaledb): Update to 2.16.1.
---
gnu/packages/databases.scm | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm
index f05566becd..43ec0641a0 100644
--- a/gnu/packages/databases.scm
+++ b/gnu/packages/databases.scm
@@ -1412,7 +1412,7 @@ (define-public postgresql postgresql-14)
(define-public timescaledb
(package
(name "timescaledb")
- (version "2.8.1")
+ (version "2.16.1")
(source (origin
(method git-fetch)
(uri (git-reference
@@ -1421,7 +1421,7 @@ (define-public timescaledb
(file-name (git-file-name name version))
(sha256
(base32
- "1gbadna0ilmqad7sbrixm12wd71h43njhsbp1kh5lispb6drdb6r"))
+ "1v17x00a15il4r3rbr0waqjv1nwzy6rcqxgfi2hdk1x235s5dg5h"))
(modules '((guix build utils)))
(snippet
;; Remove files carrying the proprietary TIMESCALE license.
--
2.46.0
Information forwarded
to
guix-patches <at> gnu.org:
bug#73692; Package
guix-patches.
(Thu, 17 Oct 2024 05:53:01 GMT)
Full text and
rfc822 format available.
Message #32 received at 73692 <at> debbugs.gnu.org (full text, mbox):
This fixes CVE-2023-25149.
* gnu/packages/databases.scm (timescaledb): Update to 2.16.1.
---
gnu/packages/databases.scm | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm
index f05566becd..43ec0641a0 100644
--- a/gnu/packages/databases.scm
+++ b/gnu/packages/databases.scm
@@ -1412,7 +1412,7 @@ (define-public postgresql postgresql-14)
(define-public timescaledb
(package
(name "timescaledb")
- (version "2.8.1")
+ (version "2.16.1")
(source (origin
(method git-fetch)
(uri (git-reference
@@ -1421,7 +1421,7 @@ (define-public timescaledb
(file-name (git-file-name name version))
(sha256
(base32
- "1gbadna0ilmqad7sbrixm12wd71h43njhsbp1kh5lispb6drdb6r"))
+ "1v17x00a15il4r3rbr0waqjv1nwzy6rcqxgfi2hdk1x235s5dg5h"))
(modules '((guix build utils)))
(snippet
;; Remove files carrying the proprietary TIMESCALE license.
--
2.46.0
Information forwarded
to
guix-patches <at> gnu.org:
bug#73692; Package
guix-patches.
(Thu, 17 Oct 2024 05:53:02 GMT)
Full text and
rfc822 format available.
Message #35 received at 73692 <at> debbugs.gnu.org (full text, mbox):
* gnu/packages/databases.scm (timescaledb):
[arguments]<#:phases>: Add phase 'patch-failing-tests.
---
gnu/packages/databases.scm | 23 +++++++++++++++++++++++
1 file changed, 23 insertions(+)
diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm
index 43ec0641a0..9725fe37f9 100644
--- a/gnu/packages/databases.scm
+++ b/gnu/packages/databases.scm
@@ -1502,6 +1502,29 @@ (define-public timescaledb
"-o" (string-append "-k " pg-data)
"-l" (string-append pg-data "/db.log")
"start"))))
+ #$@(cond
+ ((string=? "x86-64-linux" (%current-system))
+ #~())
+ ((string=? "aarch64-linux" (%current-system))
+ #~((add-after 'unpack 'skip-failing-tests
+ (lambda _
+ (substitute* "test/sql/CMakeLists.txt"
+ (((string-append
+ "("
+ (string-join
+ '("append\\.sql\\.in"
+ "chunk_adaptative\\.sql"
+ "histogram_test\\.sql\\.in")
+ "|")
+ ")")
+ all)
+ (string-append "#" all)))))))
+ (else
+ #~((add-after 'unpack 'skip-failing-tests
+ (lambda _
+ (substitute* "test/sql/CMakeLists.txt"
+ (("histogram_test\\.sql\\.in")
+ "#histogram_test.sql.in")))))))
(add-after 'prepare-tests 'check
(assoc-ref %standard-phases 'check)))))
(inputs (list openssl postgresql))
--
2.46.0
Information forwarded
to
guix-patches <at> gnu.org:
bug#73692; Package
guix-patches.
(Sat, 19 Oct 2024 10:02:02 GMT)
Full text and
rfc822 format available.
Message #38 received at 73692 <at> debbugs.gnu.org (full text, mbox):
This fixes CVE-2023-25149.
* gnu/packages/databases.scm (timescaledb): Update to 2.16.1.
[arguments]<#:phases>: Remove comment and symlink trick in
'prepare-tests phase.
---
gnu/packages/databases.scm | 21 +++------------------
1 file changed, 3 insertions(+), 18 deletions(-)
diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm
index f05566becd..df346893b8 100644
--- a/gnu/packages/databases.scm
+++ b/gnu/packages/databases.scm
@@ -1412,7 +1412,7 @@ (define-public postgresql postgresql-14)
(define-public timescaledb
(package
(name "timescaledb")
- (version "2.8.1")
+ (version "2.16.1")
(source (origin
(method git-fetch)
(uri (git-reference
@@ -1421,7 +1421,7 @@ (define-public timescaledb
(file-name (git-file-name name version))
(sha256
(base32
- "1gbadna0ilmqad7sbrixm12wd71h43njhsbp1kh5lispb6drdb6r"))
+ "1v17x00a15il4r3rbr0waqjv1nwzy6rcqxgfi2hdk1x235s5dg5h"))
(modules '((guix build utils)))
(snippet
;; Remove files carrying the proprietary TIMESCALE license.
@@ -1476,22 +1476,7 @@ (define-public timescaledb
(pg-union (string-append (getcwd) "/../pg-union")))
(match inputs
(((names . directories) ...)
- ;; PG will only load extensions from its own $libdir,
- ;; which it calculates based on argv[0]. As of
- ;; PostgreSQL 13.6, it calls 'canonicalize_path' on
- ;; argv[0] so a merge symlink is not enough to trick
- ;; it; thus, the code below makes a full copy of PG
- ;; and friends such that 'pg_config --libdir', for
- ;; instance, points to PG-UNION, allowing it to load
- ;; the timescaledb extension.
- ;; TODO: The above comment and the #:symlink trick can
- ;; be removed in the next rebuild cycle.
- (union-build pg-union (cons #$output directories)
- #:symlink
- (lambda (old new)
- (if (file-is-directory? old)
- (copy-recursively old new)
- (copy-file old new))))))
+ (union-build pg-union (cons #$output directories))))
(setenv "PATH" (string-append pg-union "/bin:"
(getenv "PATH")))
(invoke "initdb" "-D" pg-data)
--
2.46.0
Information forwarded
to
guix-patches <at> gnu.org:
bug#73692; Package
guix-patches.
(Sat, 19 Oct 2024 10:02:02 GMT)
Full text and
rfc822 format available.
Message #41 received at 73692 <at> debbugs.gnu.org (full text, mbox):
* gnu/packages/databases.scm (timescaledb):
[arguments]<#:phases>: Add phase 'patch-failing-tests.
---
gnu/packages/databases.scm | 24 ++++++++++++++++++++++++
1 file changed, 24 insertions(+)
diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm
index df346893b8..13d20de41c 100644
--- a/gnu/packages/databases.scm
+++ b/gnu/packages/databases.scm
@@ -1487,6 +1487,30 @@ (define-public timescaledb
"-o" (string-append "-k " pg-data)
"-l" (string-append pg-data "/db.log")
"start"))))
+ #$@(cond
+ ((string=? "x86-64-linux" (%current-system))
+ #~())
+ ((member (%current-system)
+ (list "aarch64-linux" "i686-linux"))
+ #~((add-after 'unpack 'skip-failing-tests
+ (lambda _
+ (substitute* "test/sql/CMakeLists.txt"
+ (((string-append
+ "("
+ (string-join
+ '(" append\\.sql\\.in"
+ " chunk_adaptative\\.sql"
+ " histogram_test\\.sql\\.in")
+ "|")
+ ")")
+ all)
+ (string-append "#" all)))))))
+ (else
+ #~((add-after 'unpack 'skip-failing-tests
+ (lambda _
+ (substitute* "test/sql/CMakeLists.txt"
+ (("histogram_test\\.sql\\.in")
+ "#histogram_test.sql.in")))))))
(add-after 'prepare-tests 'check
(assoc-ref %standard-phases 'check)))))
(inputs (list openssl postgresql))
--
2.46.0
Information forwarded
to
guix-patches <at> gnu.org:
bug#73692; Package
guix-patches.
(Sun, 20 Oct 2024 14:06:01 GMT)
Full text and
rfc822 format available.
Message #44 received at 73692 <at> debbugs.gnu.org (full text, mbox):
This fixes CVE-2023-25149.
* gnu/packages/databases.scm (timescaledb): Update to 2.16.1.
[arguments]<#:phases>: Remove comment and symlink trick in
'prepare-tests phase.
---
gnu/packages/databases.scm | 21 +++------------------
1 file changed, 3 insertions(+), 18 deletions(-)
diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm
index f05566becd..df346893b8 100644
--- a/gnu/packages/databases.scm
+++ b/gnu/packages/databases.scm
@@ -1412,7 +1412,7 @@ (define-public postgresql postgresql-14)
(define-public timescaledb
(package
(name "timescaledb")
- (version "2.8.1")
+ (version "2.16.1")
(source (origin
(method git-fetch)
(uri (git-reference
@@ -1421,7 +1421,7 @@ (define-public timescaledb
(file-name (git-file-name name version))
(sha256
(base32
- "1gbadna0ilmqad7sbrixm12wd71h43njhsbp1kh5lispb6drdb6r"))
+ "1v17x00a15il4r3rbr0waqjv1nwzy6rcqxgfi2hdk1x235s5dg5h"))
(modules '((guix build utils)))
(snippet
;; Remove files carrying the proprietary TIMESCALE license.
@@ -1476,22 +1476,7 @@ (define-public timescaledb
(pg-union (string-append (getcwd) "/../pg-union")))
(match inputs
(((names . directories) ...)
- ;; PG will only load extensions from its own $libdir,
- ;; which it calculates based on argv[0]. As of
- ;; PostgreSQL 13.6, it calls 'canonicalize_path' on
- ;; argv[0] so a merge symlink is not enough to trick
- ;; it; thus, the code below makes a full copy of PG
- ;; and friends such that 'pg_config --libdir', for
- ;; instance, points to PG-UNION, allowing it to load
- ;; the timescaledb extension.
- ;; TODO: The above comment and the #:symlink trick can
- ;; be removed in the next rebuild cycle.
- (union-build pg-union (cons #$output directories)
- #:symlink
- (lambda (old new)
- (if (file-is-directory? old)
- (copy-recursively old new)
- (copy-file old new))))))
+ (union-build pg-union (cons #$output directories))))
(setenv "PATH" (string-append pg-union "/bin:"
(getenv "PATH")))
(invoke "initdb" "-D" pg-data)
--
2.46.0
Information forwarded
to
guix-patches <at> gnu.org:
bug#73692; Package
guix-patches.
(Sun, 20 Oct 2024 14:06:02 GMT)
Full text and
rfc822 format available.
Message #47 received at 73692 <at> debbugs.gnu.org (full text, mbox):
* gnu/packages/databases.scm (timescaledb):
[arguments]<#:phases>: Add phase 'patch-failing-tests.
---
gnu/packages/databases.scm | 23 +++++++++++++++++++++++
1 file changed, 23 insertions(+)
diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm
index df346893b8..6f30e22624 100644
--- a/gnu/packages/databases.scm
+++ b/gnu/packages/databases.scm
@@ -1487,6 +1487,29 @@ (define-public timescaledb
"-o" (string-append "-k " pg-data)
"-l" (string-append pg-data "/db.log")
"start"))))
+ #$@(cond
+ ((string=? "x86-64-linux" (%current-system))
+ #~())
+ ((string=? "i686-linux" (%current-system))
+ #~((add-after 'unpack 'skip-failing-tests
+ (lambda _
+ (substitute* "test/sql/CMakeLists.txt"
+ (((string-append
+ "("
+ (string-join
+ '(" append\\.sql\\.in"
+ " chunk_adaptive\\.sql"
+ " histogram_test\\.sql\\.in")
+ "|")
+ ")")
+ all)
+ (string-append "#" all)))))))
+ (else
+ #~((add-after 'unpack 'skip-failing-tests
+ (lambda _
+ (substitute* "test/sql/CMakeLists.txt"
+ ((" histogram_test\\.sql\\.in")
+ "# histogram_test.sql.in")))))))
(add-after 'prepare-tests 'check
(assoc-ref %standard-phases 'check)))))
(inputs (list openssl postgresql))
--
2.46.0
Information forwarded
to
guix-patches <at> gnu.org:
bug#73692; Package
guix-patches.
(Sun, 20 Oct 2024 14:35:01 GMT)
Full text and
rfc822 format available.
Message #50 received at submit <at> debbugs.gnu.org (full text, mbox):
[Message part 1 (text/plain, inline)]
Nicolas Graves via Guix-patches via <guix-patches <at> gnu.org> writes:
> * gnu/packages/databases.scm (timescaledb):
> [arguments]<#:phases>: Add phase 'patch-failing-tests.
> ---
> gnu/packages/databases.scm | 23 +++++++++++++++++++++++
> 1 file changed, 23 insertions(+)
>
> diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm
> index df346893b8..6f30e22624 100644
> --- a/gnu/packages/databases.scm
> +++ b/gnu/packages/databases.scm
> @@ -1487,6 +1487,29 @@ (define-public timescaledb
> "-o" (string-append "-k " pg-data)
> "-l" (string-append pg-data "/db.log")
> "start"))))
> + #$@(cond
> + ((string=? "x86-64-linux" (%current-system))
> + #~())
> + ((string=? "i686-linux" (%current-system))
> + #~((add-after 'unpack 'skip-failing-tests
> + (lambda _
> + (substitute* "test/sql/CMakeLists.txt"
> + (((string-append
> + "("
> + (string-join
> + '(" append\\.sql\\.in"
> + " chunk_adaptive\\.sql"
> + " histogram_test\\.sql\\.in")
> + "|")
> + ")")
> + all)
> + (string-append "#" all)))))))
> + (else
> + #~((add-after 'unpack 'skip-failing-tests
> + (lambda _
> + (substitute* "test/sql/CMakeLists.txt"
> + ((" histogram_test\\.sql\\.in")
> + "# histogram_test.sql.in")))))))
> (add-after 'prepare-tests 'check
> (assoc-ref %standard-phases 'check)))))
> (inputs (list openssl postgresql))
push, close.
[signature.asc (application/pgp-signature, inline)]
Reply sent
to
Zheng Junjie <zhengjunjie <at> iscas.ac.cn>:
You have taken responsibility.
(Sun, 20 Oct 2024 14:35:03 GMT)
Full text and
rfc822 format available.
Notification sent
to
Nicolas Graves <ngraves <at> ngraves.fr>:
bug acknowledged by developer.
(Sun, 20 Oct 2024 14:35:03 GMT)
Full text and
rfc822 format available.
bug archived.
Request was from
Debbugs Internal Request <help-debbugs <at> gnu.org>
to
internal_control <at> debbugs.gnu.org.
(Mon, 18 Nov 2024 12:24:15 GMT)
Full text and
rfc822 format available.
This bug report was last modified 291 days ago.
Previous Next
GNU bug tracking system
Copyright (C) 1999 Darren O. Benham,
1997,2003 nCipher Corporation Ltd,
1994-97 Ian Jackson.