From patchwork Fri Oct 25 07:40:59 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nicolas Graves X-Patchwork-Id: 69440 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 CDC1227BBEA; Fri, 25 Oct 2024 08:42:01 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-6.4 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_DNSWL_BLOCKED, RCVD_IN_VALIDITY_CERTIFIED,RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE, SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham 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 BBA9927BBE2 for ; Fri, 25 Oct 2024 08:42:00 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1t4Eww-0002g8-IG; Fri, 25 Oct 2024 03:41:34 -0400 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 1t4Ewv-0002fr-9X for guix-patches@gnu.org; Fri, 25 Oct 2024 03:41:33 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1t4Ewv-0005ue-1H for guix-patches@gnu.org; Fri, 25 Oct 2024 03:41:33 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:Date:From:To:Subject; bh=1+GUdVDEnbAy7DCCQ0d0E4oNvHbJRh6T0C4uoParO/U=; b=trv1F0W2OV6vVAQPTDkIZgKS5LEYGBeE6hPNL+KKCzcHbLbQxrmg45GLtgZhs2wFOkN5QsB5O2cGTBXiY7mN7uDUjHA6pJhMB0vleJGdxMubW6D4+Yc1cf5jZCaIhWVTaP/FLzzSI950zxSb8GINT8gtH+4+BsnUMR7Ixs6J3nchZBKihe24nUKtiBhMiCpnDarhTMRqIvXeB3603dwB+NbNRSWgO4h1cCDIAEaCxBttzkm+KA3VW7sxazVp1BAqDV7uC6qro7YLNRiBQePLSAqKdd6sLkDpe5mD+rrixgVp6ZsW8Nj78C4+fo1YiPoaPhM1BetjXqYHP2dzRuPsyQ==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1t4ExQ-0004vl-L6 for guix-patches@gnu.org; Fri, 25 Oct 2024 03:42:04 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#74006] [PATCH] gnu: postgresql: Deprecate unsupported versions. Resent-From: Nicolas Graves Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 25 Oct 2024 07:42:04 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 74006 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 74006@debbugs.gnu.org Cc: Nicolas Graves X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.172984210818868 (code B ref -1); Fri, 25 Oct 2024 07:42:04 +0000 Received: (at submit) by debbugs.gnu.org; 25 Oct 2024 07:41:48 +0000 Received: from localhost ([127.0.0.1]:37132 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1t4ExA-0004uA-5A for submit@debbugs.gnu.org; Fri, 25 Oct 2024 03:41:48 -0400 Received: from lists.gnu.org ([209.51.188.17]:37616) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1t4Ex6-0004tv-Pm for submit@debbugs.gnu.org; Fri, 25 Oct 2024 03:41:45 -0400 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 1t4Ewa-0002cn-PV for guix-patches@gnu.org; Fri, 25 Oct 2024 03:41:12 -0400 Received: from 6.mo575.mail-out.ovh.net ([46.105.63.100]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1t4EwW-0005s7-1r for guix-patches@gnu.org; Fri, 25 Oct 2024 03:41:10 -0400 Received: from director8.ghost.mail-out.ovh.net (unknown [10.109.148.116]) by mo575.mail-out.ovh.net (Postfix) with ESMTP id 4XZZTX1KTbz1ng9 for ; Fri, 25 Oct 2024 07:41:03 +0000 (UTC) Received: from ghost-submission-5b5ff79f4f-spscn (unknown [10.111.174.226]) by director8.ghost.mail-out.ovh.net (Postfix) with ESMTPS id 927F61FE01; Fri, 25 Oct 2024 07:41:03 +0000 (UTC) Received: from ngraves.fr ([37.59.142.101]) by ghost-submission-5b5ff79f4f-spscn with ESMTPSA id V6HrEI9LG2ejXwAActQGHw (envelope-from ); Fri, 25 Oct 2024 07:41:03 +0000 Authentication-Results: garm.ovh; auth=pass (GARM-101G004f6673628-8ee4-4c4d-b67f-78cb7b11fff5, 5EE14B5C4448DA89B06CB3C74449DFBF0D417FAC) smtp.auth=ngraves@ngraves.fr X-OVh-ClientIp: 86.246.19.221 Date: Fri, 25 Oct 2024 09:40:59 +0200 Message-ID: <20241025074101.10166-1-ngraves@ngraves.fr> X-Mailer: git-send-email 2.46.0 MIME-Version: 1.0 X-Ovh-Tracer-Id: 5444570478344790754 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: 0 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgeeftddrvdejuddguddvvdcutefuodetggdotefrodftvfcurfhrohhfihhlvgemucfqggfjpdevjffgvefmvefgnecuuegrihhlohhuthemucehtddtnecunecujfgurhephffvvefufffkofgggfestdekredtredttdenucfhrhhomheppfhitgholhgrshcuifhrrghvvghsuceonhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrqeenucggtffrrghtthgvrhhnpeeklefhffduhfekteekteekteevvdevheffheekjeetgfefffekueegfeevvdeuheenucffohhmrghinhepphhoshhtghhrvghsqhhlrdhorhhgnecukfhppeduvdejrddtrddtrddupdekiedrvdegiedrudelrddvvddupdefjedrheelrddugedvrddutddunecuvehluhhsthgvrhfuihiivgeptdenucfrrghrrghmpehinhgvthepuddvjedrtddrtddruddpmhgrihhlfhhrohhmpehnghhrrghvvghssehnghhrrghvvghsrdhfrhdpnhgspghrtghpthhtohepuddprhgtphhtthhopehguhhigidqphgrthgthhgvshesghhnuhdrohhrghdpoffvtefjohhsthepmhhoheejhedpmhhouggvpehsmhhtphhouhht DKIM-Signature: a=rsa-sha256; bh=1+GUdVDEnbAy7DCCQ0d0E4oNvHbJRh6T0C4uoParO/U=; c=relaxed/relaxed; d=ngraves.fr; h=From; s=ovhmo4487190-selector1; t=1729842064; v=1; b=OTz0d94sc+Bnie/zvLIp1L6a5eMon1sVeNBn5/qH6IMJPV4uJ20dAyk1Vvka/wl6tapB1JsZ aLNL4u2aKI+6qY4JVKDrLRDKW6ogNfEyEXXFCvX69BH3kE2mKwisSP5avoG3i38FRPdGwF/F6VO Za89tncwlwl/N44w6t8OFEWRxutCbmT2ntH2XIlWmZPivnnycSKeclwcM3YX0GnBnLv9BTxWqrg /bZO0wny1q5wm6uboeLj4cIxESKtUaPznJMJOYrZ59c1tkOWdntezozeyYcL9xLUE9sRZ5DG5HO x0/BxOkdVFf6qlVjvnE1KMFBIoAFSISvJ6JuSKJWuHZbg== Received-SPF: pass client-ip=46.105.63.100; envelope-from=ngraves@ngraves.fr; helo=6.mo575.mail-out.ovh.net X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 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_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, RCVD_IN_VALIDITY_CERTIFIED_BLOCKED=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, 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: Nicolas Graves X-ACL-Warn: , Nicolas Graves via Guix-patches X-Patchwork-Original-From: Nicolas Graves via Guix-patches via From: Nicolas Graves 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 Versions 10 and 11 are unsupported according to https://www.postgresql.org/support/versioning/ postgresql-10 also has a CVE. * doc/guix.texi: Change default value of postgresql-service-type's postgresql field. * gnu/packages/databases.scm (postresql-10, postgresql-11): Use define-deprecated/public to warn users. * gnu/services/databases.scm (postgresql-configuration): Change the default value of postgresql-configuration-postgresql. * gnu/tests/guix.scm (%guix-data-service-os): Change the default value of postgresql. --- doc/guix.texi | 6 +++--- gnu/packages/databases.scm | 5 +++-- gnu/services/databases.scm | 2 +- gnu/tests/guix.scm | 2 +- 4 files changed, 8 insertions(+), 7 deletions(-) diff --git a/doc/guix.texi b/doc/guix.texi index ac3a7adef0..5768e195b0 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -26192,7 +26192,7 @@ configuration. @lisp (service postgresql-service-type (postgresql-configuration - (postgresql postgresql-10))) + (postgresql postgresql))) @end lisp If the services fails to start, it may be due to an incompatible @@ -26219,7 +26219,7 @@ Data type representing the configuration for the @code{postgresql-service-type}. @table @asis -@item @code{postgresql} (default: @code{postgresql-10}) +@item @code{postgresql} (default: @code{postgresql}) PostgreSQL package to use for the service. @item @code{port} (default: @code{5432}) @@ -26261,7 +26261,7 @@ configure the postgresql-service as in this example: (cons* (service postgresql-service-type (postgresql-configuration - (postgresql postgresql-10) + (postgresql postgresql) (extension-packages (list postgis)))) %base-services))) @end lisp diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm index 663ff8fd26..06158f19e7 100644 --- a/gnu/packages/databases.scm +++ b/gnu/packages/databases.scm @@ -170,6 +170,7 @@ (define-module (gnu packages databases) #:use-module (gnu packages web) #:use-module (gnu packages xdisorg) #:use-module (gnu packages xml) + #:use-module (guix deprecation) #:use-module (guix gexp) #:use-module ((guix licenses) #:prefix license:) #:use-module (guix packages) @@ -1375,7 +1376,7 @@ (define-public postgresql-13 (base32 "09f99rp5q1xp769r71if9ckb4cbm0nnx2xmy8b1bhcvd8hax9va2")))))) -(define-public postgresql-11 +(define-deprecated/public postgresql-11 #f (package (inherit postgresql-13) (name "postgresql") @@ -1391,7 +1392,7 @@ (define-public postgresql-11 (modify-inputs (package-native-inputs postgresql-13) (replace "docbook-xml" docbook-xml-4.2))))) -(define-public postgresql-10 +(define-deprecated/public postgresql-10 #f (package (inherit postgresql-11) (version "10.23") diff --git a/gnu/services/databases.scm b/gnu/services/databases.scm index fa332d7978..0933eb5e79 100644 --- a/gnu/services/databases.scm +++ b/gnu/services/databases.scm @@ -168,7 +168,7 @@ (define-record-type* postgresql-configuration make-postgresql-configuration postgresql-configuration? (postgresql postgresql-configuration-postgresql ;file-like - (default postgresql-10)) + (default postgresql)) (port postgresql-configuration-port (default 5432)) (locale postgresql-configuration-locale diff --git a/gnu/tests/guix.scm b/gnu/tests/guix.scm index 12ad1bf255..98afc4a350 100644 --- a/gnu/tests/guix.scm +++ b/gnu/tests/guix.scm @@ -158,7 +158,7 @@ (define %guix-data-service-os (service dhcp-client-service-type) (service postgresql-service-type (postgresql-configuration - (postgresql postgresql-10) + (postgresql postgresql) (config-file (postgresql-config-file (hba-file