From patchwork Fri Nov 11 01:57:37 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: jgart X-Patchwork-Id: 44437 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 3483827BBEA; Fri, 11 Nov 2022 01:59:21 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-3.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS, URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 1476927BBE9 for ; Fri, 11 Nov 2022 01:59:19 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1otJJw-0004QQ-F8; Thu, 10 Nov 2022 20:59:04 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1otJJu-0004QB-Qo for guix-patches@gnu.org; Thu, 10 Nov 2022 20:59:02 -0500 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1otJJu-0000V4-FU for guix-patches@gnu.org; Thu, 10 Nov 2022 20:59:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1otJJu-0004gf-5F for guix-patches@gnu.org; Thu, 10 Nov 2022 20:59:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#59187] [PATCH] gnu: timescaledb: Update to 2.8.1. Resent-From: jgart Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 11 Nov 2022 01:59:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 59187 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 59187@debbugs.gnu.org Cc: jgart X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.166813188617950 (code B ref -1); Fri, 11 Nov 2022 01:59:02 +0000 Received: (at submit) by debbugs.gnu.org; 11 Nov 2022 01:58:06 +0000 Received: from localhost ([127.0.0.1]:44748 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1otJIz-0004fR-ND for submit@debbugs.gnu.org; Thu, 10 Nov 2022 20:58:06 -0500 Received: from lists.gnu.org ([209.51.188.17]:39454) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1otJIx-0004fJ-UB for submit@debbugs.gnu.org; Thu, 10 Nov 2022 20:58:04 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1otJIx-0003bY-M4 for guix-patches@gnu.org; Thu, 10 Nov 2022 20:58:03 -0500 Received: from mx1.dismail.de ([78.46.223.134]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1otJIv-0000KM-AA for guix-patches@gnu.org; Thu, 10 Nov 2022 20:58:03 -0500 Received: from mx1.dismail.de (localhost [127.0.0.1]) by mx1.dismail.de (OpenSMTPD) with ESMTP id 79f5ad04 for ; Fri, 11 Nov 2022 02:57:51 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed; d=dismail.de; h=from:to:cc :subject:date:message-id:mime-version:content-transfer-encoding; s=20190914; bh=+6crQCRvUplXxjPGZZXFDJjchtrkTLTye0ErfYITQv8=; b= DP7qKS/DK10/SEOfeFHiv9KVz/3OG8r5bHaFdgcSJ9vNrzjYDBcpkGfagXsxU7AG 42J+Fs/g8djODTf0Mm8AKQxsC9RiaZhL+B/is/MQiE13Lh0Bljk6PbfrCOQG2DY5 u7SsjxcdW8J/r8g4fXsyupoOqkb2ujtEfVtfS7iGZcUK7XW7F7nDlhgAYaxuwvv9 oR4pWTPWuyOYd+DFcqH+RYmHW7byxabAwXpoWJwJ0KNr5RroQzEaU1d/097XJN2P dU6jo0yCl5brx8kA0u0ehPNFRd31LGtg7bGHoIExXV6gncpvk9V9K69Dv9aoThID vpGXHfcTdCEaWra82t08GQ== Received: from smtp2.dismail.de ( [10.240.26.12]) by mx1.dismail.de (OpenSMTPD) with ESMTP id 0d8f8db3 for ; Fri, 11 Nov 2022 02:57:51 +0100 (CET) Received: from smtp2.dismail.de (localhost [127.0.0.1]) by smtp2.dismail.de (OpenSMTPD) with ESMTP id 2b1247a7 for ; Fri, 11 Nov 2022 02:57:51 +0100 (CET) Received: by dismail.de (OpenSMTPD) with ESMTPSA id d701a322 (TLSv1.3:TLS_AES_256_GCM_SHA384:256:NO); Fri, 11 Nov 2022 02:57:50 +0100 (CET) Date: Thu, 10 Nov 2022 19:57:37 -0600 Message-Id: <20221111015737.5879-1-jgart@dismail.de> X-Mailer: git-send-email 2.38.1 MIME-Version: 1.0 Received-SPF: pass client-ip=78.46.223.134; envelope-from=jgart@dismail.de; helo=mx1.dismail.de X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-to: jgart X-ACL-Warn: , jgart via Guix-patches X-Patchwork-Original-From: jgart via Guix-patches via From: jgart Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/databases.scm (timescaledb): Update to 2.8.1. [source]: Remove failing patch. --- gnu/packages/databases.scm | 5 +- .../patches/timescaledb-flaky-test.patch | 107 ------------------ 2 files changed, 2 insertions(+), 110 deletions(-) delete mode 100644 gnu/packages/patches/timescaledb-flaky-test.patch diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm index e2aabc1363..1117ef6e19 100644 --- a/gnu/packages/databases.scm +++ b/gnu/packages/databases.scm @@ -1333,7 +1333,7 @@ (define-public postgresql postgresql-14) (define-public timescaledb (package (name "timescaledb") - (version "2.7.0") + (version "2.8.1") (source (origin (method git-fetch) (uri (git-reference @@ -1342,8 +1342,7 @@ (define-public timescaledb (file-name (git-file-name name version)) (sha256 (base32 - "18wszj8ia5rs4y4zkyfb0f5z4y1g7ac3jym748nbkbszhxmq7nc7")) - (patches (search-patches "timescaledb-flaky-test.patch")) + "1gbadna0ilmqad7sbrixm12wd71h43njhsbp1kh5lispb6drdb6r")) (modules '((guix build utils))) (snippet ;; Remove files carrying the proprietary TIMESCALE license. diff --git a/gnu/packages/patches/timescaledb-flaky-test.patch b/gnu/packages/patches/timescaledb-flaky-test.patch deleted file mode 100644 index 6268bcecad..0000000000 --- a/gnu/packages/patches/timescaledb-flaky-test.patch +++ /dev/null @@ -1,107 +0,0 @@ -Use fixed dates in test for consistent results. - -Taken from upstream: - - https://github.com/timescale/timescaledb/commit/1d0670e703862b284c241ab797404f851b25b5df - -diff --git a/test/expected/copy-12.out b/test/expected/copy-12.out -index 5cb28a45a2..37abf6f6ff 100644 ---- a/test/expected/copy-12.out -+++ b/test/expected/copy-12.out -@@ -324,13 +324,12 @@ INSERT INTO hyper_copy_large - SELECT time, - random() AS value - FROM --generate_series(now() - INTERVAL '1 months', now() - INTERVAL '1 day', -- INTERVAL '1 hour') AS g1(time) -+generate_series('2022-01-01', '2022-01-31', INTERVAL '1 hour') AS g1(time) - ORDER BY time; - SELECT COUNT(*) FROM hyper_copy_large; - count - ------- -- 697 -+ 721 - (1 row) - - -- Migrate data to chunks by using copy -@@ -345,7 +344,7 @@ NOTICE: migrating data to chunks - SELECT COUNT(*) FROM hyper_copy_large; - count - ------- -- 697 -+ 721 - (1 row) - - ---------------------------------------------------------------- -diff --git a/test/expected/copy-13.out b/test/expected/copy-13.out -index 02bf913eff..89e16fe8e2 100644 ---- a/test/expected/copy-13.out -+++ b/test/expected/copy-13.out -@@ -324,13 +324,12 @@ INSERT INTO hyper_copy_large - SELECT time, - random() AS value - FROM --generate_series(now() - INTERVAL '1 months', now() - INTERVAL '1 day', -- INTERVAL '1 hour') AS g1(time) -+generate_series('2022-01-01', '2022-01-31', INTERVAL '1 hour') AS g1(time) - ORDER BY time; - SELECT COUNT(*) FROM hyper_copy_large; - count - ------- -- 697 -+ 721 - (1 row) - - -- Migrate data to chunks by using copy -@@ -345,7 +344,7 @@ NOTICE: migrating data to chunks - SELECT COUNT(*) FROM hyper_copy_large; - count - ------- -- 697 -+ 721 - (1 row) - - ---------------------------------------------------------------- -diff --git a/test/expected/copy-14.out b/test/expected/copy-14.out -index 02bf913eff..89e16fe8e2 100644 ---- a/test/expected/copy-14.out -+++ b/test/expected/copy-14.out -@@ -324,13 +324,12 @@ INSERT INTO hyper_copy_large - SELECT time, - random() AS value - FROM --generate_series(now() - INTERVAL '1 months', now() - INTERVAL '1 day', -- INTERVAL '1 hour') AS g1(time) -+generate_series('2022-01-01', '2022-01-31', INTERVAL '1 hour') AS g1(time) - ORDER BY time; - SELECT COUNT(*) FROM hyper_copy_large; - count - ------- -- 697 -+ 721 - (1 row) - - -- Migrate data to chunks by using copy -@@ -345,7 +344,7 @@ NOTICE: migrating data to chunks - SELECT COUNT(*) FROM hyper_copy_large; - count - ------- -- 697 -+ 721 - (1 row) - - ---------------------------------------------------------------- -diff --git a/test/sql/copy.sql.in b/test/sql/copy.sql.in -index 91402c2ab8..bba4265064 100644 ---- a/test/sql/copy.sql.in -+++ b/test/sql/copy.sql.in -@@ -276,8 +276,7 @@ INSERT INTO hyper_copy_large - SELECT time, - random() AS value - FROM --generate_series(now() - INTERVAL '1 months', now() - INTERVAL '1 day', -- INTERVAL '1 hour') AS g1(time) -+generate_series('2022-01-01', '2022-01-31', INTERVAL '1 hour') AS g1(time) - ORDER BY time; - - SELECT COUNT(*) FROM hyper_copy_large;