From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp10.migadu.com ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms5.migadu.com with LMTPS id iPW2DJKubWO2IgEAbAwnHQ (envelope-from ) for ; Fri, 11 Nov 2022 03:08:18 +0100 Received: from aspmx1.migadu.com ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp10.migadu.com with LMTPS id OKfnC5KubWP5pgAAG6o9tA (envelope-from ) for ; Fri, 11 Nov 2022 03:08:18 +0100 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id A562B16002 for ; Fri, 11 Nov 2022 03:08:17 +0100 (CET) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1otJSe-0006DQ-TZ; Thu, 10 Nov 2022 21:08: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 1otJSc-0006DB-V6 for guix-patches@gnu.org; Thu, 10 Nov 2022 21:08: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 1otJSc-0004by-Mp for guix-patches@gnu.org; Thu, 10 Nov 2022 21:08:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1otJSc-0004vh-AE for guix-patches@gnu.org; Thu, 10 Nov 2022 21:08:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#59187] [PATCH v2] gnu: timescaledb: Update to 2.8.1. References: <20221111015737.5879-1-jgart@dismail.de> In-Reply-To: <20221111015737.5879-1-jgart@dismail.de> Resent-From: jgart Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 11 Nov 2022 02:08:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 59187 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 59187@debbugs.gnu.org Cc: jgart Received: via spool by 59187-submit@debbugs.gnu.org id=B59187.166813247918940 (code B ref 59187); Fri, 11 Nov 2022 02:08:02 +0000 Received: (at 59187) by debbugs.gnu.org; 11 Nov 2022 02:07:59 +0000 Received: from localhost ([127.0.0.1]:44755 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1otJSZ-0004vP-1j for submit@debbugs.gnu.org; Thu, 10 Nov 2022 21:07:59 -0500 Received: from mx2.dismail.de ([159.69.191.136]:9166) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1otJST-0004v8-Rv for 59187@debbugs.gnu.org; Thu, 10 Nov 2022 21:07:57 -0500 Received: from mx2.dismail.de (localhost [127.0.0.1]) by mx2.dismail.de (OpenSMTPD) with ESMTP id 34c7f557 for <59187@debbugs.gnu.org>; Fri, 11 Nov 2022 03:07:46 +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-type :content-transfer-encoding; s=20190914; bh=7xyB4A9xSI50q8/4FrlvC sYMfj7WuXDWdtqrkO2vcWU=; b=WhhcjV7LWXIDAkeJdrYYNcQrXLssJ6PbApYX3 /YFZVMHygBqjDYfDjITaTIujxg3NpBoy4K22gFk4G8zJYdYGl1viHuC3eQgSMNXh hU+hzNNmYpaLl8Zt5XkmHF517f7Bd/5BIuJT6P3796lWu8+mgNUM9dArgUkcR8ab 5Y/7KdJIru+XAtOgxtjOjGII9yfE/vaxQ8Ingc7eOa+b1qfAGovLn3RuyxhwKH2c IRyLgXSp/LaBrtiGax6vVh6LUzqQi4uw5hjJhn+9Qd/WYkF4uWVVNO2wB/gOsXdH 41RbU00IPr3D29+2fpiyfaUg+b/uzePZnMdwyQ3FjzYvWrW+A== Received: from smtp2.dismail.de ( [10.240.26.12]) by mx2.dismail.de (OpenSMTPD) with ESMTP id c0a2bc49 for <59187@debbugs.gnu.org>; Fri, 11 Nov 2022 03:07:46 +0100 (CET) Received: from smtp2.dismail.de (localhost [127.0.0.1]) by smtp2.dismail.de (OpenSMTPD) with ESMTP id 565f8b2f for <59187@debbugs.gnu.org>; Fri, 11 Nov 2022 03:07:46 +0100 (CET) Received: by dismail.de (OpenSMTPD) with ESMTPSA id 09552f0f (TLSv1.3:TLS_AES_256_GCM_SHA384:256:NO); Fri, 11 Nov 2022 03:07:44 +0100 (CET) Date: Thu, 10 Nov 2022 20:06:24 -0600 Message-Id: <20221111020623.6384-1-jgart@dismail.de> X-Mailer: git-send-email 2.38.1 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 From: jgart via Guix-patches via Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: guix-patches-bounces+larch=yhetil.org@gnu.org X-Migadu-Flow: FLOW_IN X-Migadu-Country: US ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1668132497; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding:resent-cc: resent-from:resent-sender:resent-message-id:in-reply-to:in-reply-to: references:references:list-id:list-help:list-unsubscribe: list-subscribe:list-post:dkim-signature; bh=kCfu+G7i/wFEup58sWMA6ahs37DWSdJ0D4weipWqOAs=; b=Yo0yEi9aQGtROI1E0bybM0sZEVvSXEb1xzO/lQmJMv3R/jCOSGAc0RBCm5mr7D1T01F1n6 kq/rKy+il2xIcgbn5eOk3QRGliqLrcD9U4/Y28/ESgHdf5gDOWRrsSUYcCLxQhdvUJoQb2 DIvJvtDMJS3H5VZhdlLiaKU061mmD4dBrrMKdtZwiZg2hJzJ2J+cjApU9QIzXV/hGdFdmu UTTHJ0RwOtF0LleWuB+5sXX8HOSfxK7825A6tnOCji/QCISORque5HgP2d80CuzwiUv+ZB inDPvpvdp5JwXvnQ4MgCLKZDhW0vGECAoZgndI4G1hBVTcVGyRa+UWlUv3k1rQ== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1668132497; a=rsa-sha256; cv=none; b=IDVwKiQIt0r4Sc7NZZquufnzqz2+pgoFU2LQAN++gL8l2bUZjJCj/KoIASkCyngngS1dBr FA+JGOhI19Vj6wF28vRTskS+8nC2qEjSKizM+At7JSZO1l5CDq1HfNlrWWbrkVGCDqKPTK G/7qSluJpZb/4BaoYX7ifKLkKUWji4jm7f2pOIdgNF6oZw84KVWmtbDjuz7S5U8LAJy7IJ 4zLHja5aCMUSmybbxE7cK8+lieIZpj7vm9PQjQRVBDiR2rMuuxnaSS5P3gB6fJ7g1eKA30 y7JTNrV+aF+nx2GTAeBuCVcsmX4YYlVVA7pcqSaIQ4HqsIIy3s0bYy+4ZoVWmQ== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=dismail.de header.s=20190914 header.b=WhhcjV7L; dmarc=pass (policy=none) header.from=gnu.org; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" X-Migadu-Spam-Score: -5.12 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=dismail.de header.s=20190914 header.b=WhhcjV7L; dmarc=pass (policy=none) header.from=gnu.org; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" X-Migadu-Queue-Id: A562B16002 X-Spam-Score: -5.12 X-Migadu-Scanner: scn0.migadu.com X-TUID: uknzjH4I6uyo * gnu/local.mk (timescaledb-flaky-test): Remove it. * gnu/packages/patches/timescaledb-flaky-test.patch: Remove it. * gnu/packages/databases.scm (timescaledb): Update to 2.8.1. [source]: Remove failing patch. Version 2 updates the commit message, removes the patch references from local.mk, and adds my copyright statement. all best jgart --- gnu/local.mk | 2 +- gnu/packages/databases.scm | 7 +- .../patches/timescaledb-flaky-test.patch | 107 ------------------ 3 files changed, 4 insertions(+), 112 deletions(-) delete mode 100644 gnu/packages/patches/timescaledb-flaky-test.patch diff --git a/gnu/local.mk b/gnu/local.mk index 27b31ea27f..f27b49243a 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -55,6 +55,7 @@ # Copyright © 2022 Hilton Chain # Copyright © 2022 Alex Griffin # Copyright © 2022 ( +# Copyright © 2022 jgart # # This file is part of GNU Guix. # @@ -1888,7 +1889,6 @@ dist_patch_DATA = \ %D%/packages/patches/texlive-hyph-utf8-no-byebug.patch \ %D%/packages/patches/thefuck-test-environ.patch \ %D%/packages/patches/tidy-CVE-2015-5522+5523.patch \ - %D%/packages/patches/timescaledb-flaky-test.patch \ %D%/packages/patches/tinyxml-use-stl.patch \ %D%/packages/patches/tipp10-disable-downloader.patch \ %D%/packages/patches/tipp10-fix-compiling.patch \ diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm index e2aabc1363..a5716af636 100644 --- a/gnu/packages/databases.scm +++ b/gnu/packages/databases.scm @@ -53,12 +53,12 @@ ;;; Copyright © 2021 Simon Streit ;;; Copyright © 2021 Alexandre Hannud Abdo ;;; Copyright © 2021 Simon Tournier -;;; Copyright © 2021 jgart ;;; Copyright © 2021 Foo Chuan Wei ;;; Copyright © 2022 Zhu Zihao ;;; Copyright © 2021 Brice Waegeneire ;;; Copyright © 2022 muradm ;;; Copyright © 2022 Thomas Albers Raviola +;;; Copyright © 2021, 2022 jgart ;;; ;;; This file is part of GNU Guix. ;;; @@ -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; -- 2.38.1