X-Loop: help-debbugs@HIDDEN Subject: [bug#73876] [PATCH 0/3] Add postgresql-libversion Resent-From: Nicolas Graves <ngraves@HIDDEN> Original-Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org> Resent-CC: guix-patches@HIDDEN Resent-Date: Sat, 19 Oct 2024 08:56:02 +0000 Resent-Message-ID: <handler.73876.B.172932815815078 <at> debbugs.gnu.org> Resent-Sender: help-debbugs@HIDDEN X-GNU-PR-Message: report 73876 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 73876 <at> debbugs.gnu.org Cc: Nicolas Graves <ngraves@HIDDEN> X-Debbugs-Original-To: guix-patches@HIDDEN Received: via spool by submit <at> debbugs.gnu.org id=B.172932815815078 (code B ref -1); Sat, 19 Oct 2024 08:56:02 +0000 Received: (at submit) by debbugs.gnu.org; 19 Oct 2024 08:55:58 +0000 Received: from localhost ([127.0.0.1]:41392 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>) id 1t25Fe-0003v8-FA for submit <at> debbugs.gnu.org; Sat, 19 Oct 2024 04:55:58 -0400 Received: from lists.gnu.org ([209.51.188.17]:51008) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <ngraves@HIDDEN>) id 1t25Fc-0003v0-H7 for submit <at> debbugs.gnu.org; Sat, 19 Oct 2024 04:55:57 -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 <ngraves@HIDDEN>) id 1t25FE-0003gp-Lg for guix-patches@HIDDEN; Sat, 19 Oct 2024 04:55:32 -0400 Received: from 7.mo560.mail-out.ovh.net ([188.165.48.182]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from <ngraves@HIDDEN>) id 1t25FB-0007vC-5S for guix-patches@HIDDEN; Sat, 19 Oct 2024 04:55:32 -0400 Received: from director4.ghost.mail-out.ovh.net (unknown [10.109.139.157]) by mo560.mail-out.ovh.net (Postfix) with ESMTP id 4XVwQ42lq0z1bQQ for <guix-patches@HIDDEN>; Sat, 19 Oct 2024 08:55:24 +0000 (UTC) Received: from ghost-submission-5b5ff79f4f-m6jpx (unknown [10.108.54.3]) by director4.ghost.mail-out.ovh.net (Postfix) with ESMTPS id E82141FDBB; Sat, 19 Oct 2024 08:55:23 +0000 (UTC) Received: from ngraves.fr ([37.59.142.106]) by ghost-submission-5b5ff79f4f-m6jpx with ESMTPSA id u3HEIvtzE2cI1QUAg9Vu6w (envelope-from <ngraves@HIDDEN>); Sat, 19 Oct 2024 08:55:23 +0000 Authentication-Results: garm.ovh; auth=pass (GARM-106R0068b0ceb4c-ded4-409b-8251-ee52b4e9ce53, 1C04683152D118B95F8C4B6437EEF0B0B2253C85) smtp.auth=ngraves@HIDDEN X-OVh-ClientIp: 90.110.172.34 From: Nicolas Graves <ngraves@HIDDEN> Date: Sat, 19 Oct 2024 10:49:15 +0200 Message-ID: <20241019085518.18205-1-ngraves@HIDDEN> X-Mailer: git-send-email 2.46.0 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Ovh-Tracer-Id: 8357555010533319394 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: 0 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgeeftddrvdehhedgudduucetufdoteggodetrfdotffvucfrrhhofhhilhgvmecuqfggjfdpvefjgfevmfevgfenuceurghilhhouhhtmecuhedttdenucenucfjughrpefhvfevufffkffoggfgsedtkeertdertddtnecuhfhrohhmpefpihgtohhlrghsucfirhgrvhgvshcuoehnghhrrghvvghssehnghhrrghvvghsrdhfrheqnecuggftrfgrthhtvghrnhepkeffgeetfffgffejgeejvdffgfdtvdeuueetgfefuedvjeegvdegjeejveeuueevnecukfhppeduvdejrddtrddtrddupdeltddruddutddrudejvddrfeegpdefjedrheelrddugedvrddutdeinecuvehluhhsthgvrhfuihiivgeptdenucfrrghrrghmpehinhgvthepuddvjedrtddrtddruddpmhgrihhlfhhrohhmpehnghhrrghvvghssehnghhrrghvvghsrdhfrhdpnhgspghrtghpthhtohepuddprhgtphhtthhopehguhhigidqphgrthgthhgvshesghhnuhdrohhrghdpoffvtefjohhsthepmhhoheeitddpmhhouggvpehsmhhtphhouhht DKIM-Signature: a=rsa-sha256; bh=uICxM6s04RJdoy9pCXkrK+6go6TH7l7KMm39apXzxwo=; c=relaxed/relaxed; d=ngraves.fr; h=From; s=ovhmo4487190-selector1; t=1729328124; v=1; b=TbSpHXXdWNIn1aU/ApXnskkyitCWE48N7P7309HCF5/L2LWKZolL9vQydHDgS19ibfXis1y+ nAZWbgrreIypQpLjs2G146SgM/bUJownpXMbBwZWDUfra2VfnsTX2uZUXoQ9t5YR0iJ092lSu2K YqQH0O17fY0MslQEZJUgDZ/kBo1Aa+V+nVnf87D8Y0LK5vOrDgA50ORNHn2hFCLbKH3Tf4nHnTo QaR6Rkloksz84JBmOlsMyTGfNaYYC4l5OxCp0pZ8Rsq14ykSux/LRxqV0rrhhUPX7lxN1ZznGTK 3mZlEyBT1JTlH+r4jUtlHxYiB5f76FrdBqGvGMSfK6IGg== Received-SPF: pass client-ip=188.165.48.182; envelope-from=ngraves@HIDDEN; helo=7.mo560.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_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, RCVD_IN_VALIDITY_SAFE_BLOCKED=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-Spam-Score: -1.3 (-) X-BeenThere: debbugs-submit <at> debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: <debbugs-submit.debbugs.gnu.org> List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe> List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/> List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org> List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help> List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe> Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org> X-Spam-Score: -2.3 (--) I was in the process of trying to get more useful information from repology for Guix using a database dump. I've just jumped into the postgresql-extensions rabbithole. Here's a properly constructed extension. I also wonder why: - the postgresql-service is stuck with postgresql-10 - we don't patch postgresql with a native-search-path just like python so that pg_config/psql reads from this native-search-path for extensions and falls back to its current default instead. It seems like the reasonable thing to do instead of the circumvoluted directory-union for extensions. Nicolas Graves (3): gnu: Add libversion. gnu: final-postgresql: Move to (gnu packages databases). gnu: Add postgresql-libversion. gnu/packages/databases.scm | 9 +++ gnu/packages/version-control.scm | 118 ++++++++++++++++++++++++++++++- gnu/services/databases.scm | 26 +------ 3 files changed, 128 insertions(+), 25 deletions(-) -- 2.46.0
Content-Disposition: inline Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 X-Mailer: MIME-tools 5.505 (Entity 5.505) Content-Type: text/plain; charset=utf-8 X-Loop: help-debbugs@HIDDEN From: help-debbugs@HIDDEN (GNU bug Tracking System) To: Nicolas Graves <ngraves@HIDDEN> Subject: bug#73876: Acknowledgement ([PATCH 0/3] Add postgresql-libversion) Message-ID: <handler.73876.B.172932815815078.ack <at> debbugs.gnu.org> References: <20241019085518.18205-1-ngraves@HIDDEN> X-Gnu-PR-Message: ack 73876 X-Gnu-PR-Package: guix-patches X-Gnu-PR-Keywords: patch Reply-To: 73876 <at> debbugs.gnu.org Date: Sat, 19 Oct 2024 08:56:02 +0000 Thank you for filing a new bug report with debbugs.gnu.org. This is an automatically generated reply to let you know your message has been received. Your message is being forwarded to the package maintainers and other interested parties for their attention; they will reply in due course. Your message has been sent to the package maintainer(s): guix-patches@HIDDEN If you wish to submit further information on this problem, please send it to 73876 <at> debbugs.gnu.org. Please do not send mail to help-debbugs@HIDDEN unless you wish to report a problem with the Bug-tracking system. --=20 73876: https://debbugs.gnu.org/cgi/bugreport.cgi?bug=3D73876 GNU Bug Tracking System Contact help-debbugs@HIDDEN with problems
X-Loop: help-debbugs@HIDDEN Subject: [bug#73876] [PATCH 1/3] gnu: Add libversion. References: <20241019085518.18205-1-ngraves@HIDDEN> In-Reply-To: <20241019085518.18205-1-ngraves@HIDDEN> Resent-From: Nicolas Graves <ngraves@HIDDEN> Original-Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org> Resent-CC: guix-patches@HIDDEN Resent-Date: Sat, 19 Oct 2024 09:10:02 +0000 Resent-Message-ID: <handler.73876.B73876.172932900017310 <at> debbugs.gnu.org> Resent-Sender: help-debbugs@HIDDEN X-GNU-PR-Message: followup 73876 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 73876 <at> debbugs.gnu.org Cc: Nicolas Graves <ngraves@HIDDEN> Received: via spool by 73876-submit <at> debbugs.gnu.org id=B73876.172932900017310 (code B ref 73876); Sat, 19 Oct 2024 09:10:02 +0000 Received: (at 73876) by debbugs.gnu.org; 19 Oct 2024 09:10:00 +0000 Received: from localhost ([127.0.0.1]:41418 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>) id 1t25TE-0004V5-1U for submit <at> debbugs.gnu.org; Sat, 19 Oct 2024 05:10:00 -0400 Received: from 8.mo561.mail-out.ovh.net ([87.98.172.249]:52769) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <ngraves@HIDDEN>) id 1t25T9-0004Um-9a for 73876 <at> debbugs.gnu.org; Sat, 19 Oct 2024 05:09:58 -0400 Received: from director10.ghost.mail-out.ovh.net (unknown [10.109.148.175]) by mo561.mail-out.ovh.net (Postfix) with ESMTP id 4XVwkK5z6tz1PXJ for <73876 <at> debbugs.gnu.org>; Sat, 19 Oct 2024 09:09:29 +0000 (UTC) Received: from ghost-submission-5b5ff79f4f-kqfns (unknown [10.110.101.25]) by director10.ghost.mail-out.ovh.net (Postfix) with ESMTPS id 8A0961FE7C; Sat, 19 Oct 2024 09:09:29 +0000 (UTC) Received: from ngraves.fr ([37.59.142.100]) by ghost-submission-5b5ff79f4f-kqfns with ESMTPSA id o0VMFkl3E2e81gUA/iZ45Q (envelope-from <ngraves@HIDDEN>); Sat, 19 Oct 2024 09:09:29 +0000 Authentication-Results: garm.ovh; auth=pass (GARM-100R00343a6b122-15d7-4533-a978-248d643c60cf, 1C04683152D118B95F8C4B6437EEF0B0B2253C85) smtp.auth=ngraves@HIDDEN X-OVh-ClientIp: 90.110.172.34 From: Nicolas Graves <ngraves@HIDDEN> Date: Sat, 19 Oct 2024 11:09:13 +0200 Message-ID: <20241019090928.21158-1-ngraves@HIDDEN> X-Mailer: git-send-email 2.46.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Ovh-Tracer-Id: 8595401367605142242 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: 0 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgeeftddrvdehhedgudefucetufdoteggodetrfdotffvucfrrhhofhhilhgvmecuqfggjfdpvefjgfevmfevgfenuceurghilhhouhhtmecuhedttdenucenucfjughrpefhvfevufffkffogggtgfesthekredtredtjeenucfhrhhomheppfhitgholhgrshcuifhrrghvvghsuceonhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrqeenucggtffrrghtthgvrhhnpeffjeevuedufefhfeekheeludfgkeekjeduieejteehvedugfegudffffefkeekveenucffohhmrghinhepghhithhhuhgsrdgtohhmpdhrvghpohhlohhghidrohhrghenucfkphepuddvjedrtddrtddruddpledtrdduuddtrddujedvrdefgedpfeejrdehledrudegvddruddttdenucevlhhushhtvghrufhiiigvpedtnecurfgrrhgrmhepihhnvghtpeduvdejrddtrddtrddupdhmrghilhhfrhhomhepnhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrpdhnsggprhgtphhtthhopedupdhrtghpthhtohepjeefkeejieesuggvsggsuhhgshdrghhnuhdrohhrghdpoffvtefjohhsthepmhhoheeiuddpmhhouggvpehsmhhtphhouhht DKIM-Signature: a=rsa-sha256; bh=HpnBN8+K4SUgrwCquEA1dNBzJY9PKyq4haMKpkNfdkA=; c=relaxed/relaxed; d=ngraves.fr; h=From; s=ovhmo4487190-selector1; t=1729328970; v=1; b=wpwyLbEfu4hKTUFE2Q6oe5N20exXzKaKdFJy7wjBwWWOdlQhmVkoTKYxPPg9ZesmMaL2Ki4D HN6eFP2vBqYcL4lQJb7/VSJoW0adDcrSlPx7Djl1w9wIFQdrx4wE5ntl0wbtRn3COT3GIBF1a1y 8VGvlG84MQQIJVPydcFsR/L42A6P1k5Qksu4Pfr+z5BNlXKiSl/DellKgDRH5kzDybQbtuZIjP6 kgRWb1oMWXLK8+5ND4gXSuiPbgSCVCO0z1xQrDcYFcsMQ/kAl9QS7v55XqPvoNVPPuVqoDV9ApO 624ZDCZQNVRYhs94/iZZ7imeAqWtA+hZne4ZfI1DgmdSA== X-Spam-Score: 0.0 (/) X-BeenThere: debbugs-submit <at> debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: <debbugs-submit.debbugs.gnu.org> List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe> List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/> List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org> List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help> List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe> Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org> X-Spam-Score: -1.0 (-) * gnu/packages/version-control.scm (libversion): New variable. --- gnu/packages/version-control.scm | 34 +++++++++++++++++++++++++++++++- 1 file changed, 33 insertions(+), 1 deletion(-) diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-control.scm index 6bd37fee82..b14ec77ff5 100644 --- a/gnu/packages/version-control.scm +++ b/gnu/packages/version-control.scm @@ -47,7 +47,7 @@ ;;; Copyright © 2022 Maxime Devos <maximedevos@HIDDEN> ;;; Copyright © 2022 Dhruvin Gandhi <contact@HIDDEN> ;;; Copyright © 2015, 2022 David Thompson <davet@HIDDEN> -;;; Copyright © 2023 Nicolas Graves <ngraves@HIDDEN> +;;; Copyright © 2023, 2024 Nicolas Graves <ngraves@HIDDEN> ;;; Copyright © 2023 Bruno Victal <mirai@HIDDEN> ;;; Copyright © 2023 Kjartan Oli Agustsson <kjartanoli@HIDDEN> ;;; Copyright © 2023 Steve George <steve@HIDDEN> @@ -1251,6 +1251,38 @@ (define-public libgit2-1.3 ;; Tests may be disabled if cross-compiling. (format #t "Test suite not run.~%")))))))))) +(define-public libversion + (package + (name "libversion") + (version "3.0.3") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/repology/libversion") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 "186dq3x9w8k5xp4b84ms7f5cm10si3yzs52iscgv0xs58c7rfja4")))) + (build-system cmake-build-system) + (home-page "https://github.com/repology/libversion") + (synopsis "Version string comparison library") + (description "This package provides a very advanced string comparison +library, used by the @url{https://repology.org, Repology} project, and able to +compare versions with: + +@itemize +@item insignificant components +@item leading zero +@item unusual separators +@item letter suffixes +@item alphanumeric prerelease components +@item prerelease keywords +@item patch, post and pl keywords +@item customizable handling of ambiguous p keyword +@end itemize") + (license license:expat))) + (define-public git-crypt (package (name "git-crypt") -- 2.46.0
X-Loop: help-debbugs@HIDDEN Subject: [bug#73876] [PATCH 2/3] gnu: final-postgresql: Move to (gnu packages databases). Resent-From: Nicolas Graves <ngraves@HIDDEN> Original-Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org> Resent-CC: guix-patches@HIDDEN Resent-Date: Sat, 19 Oct 2024 09:10:02 +0000 Resent-Message-ID: <handler.73876.B73876.172932900117325 <at> debbugs.gnu.org> Resent-Sender: help-debbugs@HIDDEN X-GNU-PR-Message: followup 73876 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 73876 <at> debbugs.gnu.org Cc: Nicolas Graves <ngraves@HIDDEN> Received: via spool by 73876-submit <at> debbugs.gnu.org id=B73876.172932900117325 (code B ref 73876); Sat, 19 Oct 2024 09:10:02 +0000 Received: (at 73876) by debbugs.gnu.org; 19 Oct 2024 09:10:01 +0000 Received: from localhost ([127.0.0.1]:41420 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>) id 1t25TE-0004V9-KZ for submit <at> debbugs.gnu.org; Sat, 19 Oct 2024 05:10:01 -0400 Received: from 1.mo583.mail-out.ovh.net ([188.165.57.91]:56831) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <ngraves@HIDDEN>) id 1t25TC-0004Uq-1x for 73876 <at> debbugs.gnu.org; Sat, 19 Oct 2024 05:09:59 -0400 Received: from director7.ghost.mail-out.ovh.net (unknown [10.109.139.201]) by mo583.mail-out.ovh.net (Postfix) with ESMTP id 4XVwkP118Qz1M7P for <73876 <at> debbugs.gnu.org>; Sat, 19 Oct 2024 09:09:32 +0000 (UTC) Received: from ghost-submission-5b5ff79f4f-5qnnh (unknown [10.108.54.179]) by director7.ghost.mail-out.ovh.net (Postfix) with ESMTPS id 978251FE7F; Sat, 19 Oct 2024 09:09:32 +0000 (UTC) Received: from ngraves.fr ([37.59.142.101]) by ghost-submission-5b5ff79f4f-5qnnh with ESMTPSA id Cv06CUx3E2dRggAA+t84tg (envelope-from <ngraves@HIDDEN>); Sat, 19 Oct 2024 09:09:32 +0000 Authentication-Results: garm.ovh; auth=pass (GARM-101G00427801fd4-9664-41f0-80f3-5ad11a5980ca, 1C04683152D118B95F8C4B6437EEF0B0B2253C85) smtp.auth=ngraves@HIDDEN X-OVh-ClientIp: 90.110.172.34 From: Nicolas Graves <ngraves@HIDDEN> Date: Sat, 19 Oct 2024 11:09:14 +0200 Message-ID: <20241019090928.21158-2-ngraves@HIDDEN> X-Mailer: git-send-email 2.46.0 In-Reply-To: <20241019090928.21158-1-ngraves@HIDDEN> References: <20241019090928.21158-1-ngraves@HIDDEN> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Ovh-Tracer-Id: 8596245792800498402 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: 0 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgeeftddrvdehhedgudegucetufdoteggodetrfdotffvucfrrhhofhhilhgvmecuqfggjfdpvefjgfevmfevgfenuceurghilhhouhhtmecuhedttdenucenucfjughrpefhvfevufffkffojghfgggtgfesthekredtredtjeenucfhrhhomheppfhitgholhgrshcuifhrrghvvghsuceonhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrqeenucggtffrrghtthgvrhhnpedvleelgeeffeetleekueegvdfhtedvueffiefhkedtleejkeduveelgfdufeduleenucfkphepuddvjedrtddrtddruddpledtrdduuddtrddujedvrdefgedpfeejrdehledrudegvddruddtudenucevlhhushhtvghrufhiiigvpedtnecurfgrrhgrmhepihhnvghtpeduvdejrddtrddtrddupdhmrghilhhfrhhomhepnhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrpdhnsggprhgtphhtthhopedupdhrtghpthhtohepjeefkeejieesuggvsggsuhhgshdrghhnuhdrohhrghdpoffvtefjohhsthepmhhoheekfedpmhhouggvpehsmhhtphhouhht DKIM-Signature: a=rsa-sha256; bh=6QW99RSQN5J8NurGYMYu5qcY9oZkH9KxdEhHq13ASLA=; c=relaxed/relaxed; d=ngraves.fr; h=From; s=ovhmo4487190-selector1; t=1729328973; v=1; b=E/XaVgc9Bg7V/z/cu7KVUpBBbREILaRg67/gENhaH5Tz1vnsELmUyCl+dqfqbp0yVBZG9LJg JYRtAewfUVZoIDyA7pyJJnk7RQH8uiX+W3H20EQgU8yTU9cfsq1051WQe15z1P8fPWb4dTYW1mm gNPZT/qb/uLT1kBBhKk/oQLkaXsLNFk82BqEZHB+ceVBayGlXZ5Cj/9xbvJooYgWHjJ517NtDR+ 3ok1Rix2QOU9MMELbEhG1sGb1XyYB7N0ge0xLXYL+RzxnqTwJSdElpZ6jeBjQ811i7I7BzLXjKn EvHADWvGuFrCGEE2VZjEarr2J5eFWDCVKo0m2qe5Y2npA== X-Spam-Score: 0.0 (/) X-BeenThere: debbugs-submit <at> debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: <debbugs-submit.debbugs.gnu.org> List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe> List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/> List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org> List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help> List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe> Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org> X-Spam-Score: -1.0 (-) * gnu/services/databases.scm (final-postgresql): Move from here... * gnu/packages/databases.scm (extend-postgresql): ...to here and switch to directory-union implementation. --- gnu/packages/databases.scm | 9 +++++++++ gnu/services/databases.scm | 26 ++------------------------ 2 files changed, 11 insertions(+), 24 deletions(-) diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm index f05566becd..d9dc4525aa 100644 --- a/gnu/packages/databases.scm +++ b/gnu/packages/databases.scm @@ -63,6 +63,7 @@ ;;; Copyright © 2023 Munyoki Kilyungi <me@HIDDEN> ;;; Copyright © 2023 Giacomo Leidi <goodoldpaul@HIDDEN> ;;; Copyright © 2024 Troy Figiel <troy@HIDDEN> +;;; Copyright © 2024 Nicolas Graves <ngraves@HIDDEN> ;;; ;;; This file is part of GNU Guix. ;;; @@ -1409,6 +1410,14 @@ (define-public postgresql-10 (define-public postgresql postgresql-14) +(define-public (extend-postgresql postgresql extensions) + (if (null? extensions) + postgresql + (let ((packages (cons* postgresql extensions))) + (directory-union + (string-join (map package-name packages) "+") + packages)))) + (define-public timescaledb (package (name "timescaledb") diff --git a/gnu/services/databases.scm b/gnu/services/databases.scm index fa332d7978..dc6c1720ff 100644 --- a/gnu/services/databases.scm +++ b/gnu/services/databases.scm @@ -205,27 +205,6 @@ (define (create-postgresql-account config) (home-directory "/var/empty") (shell (file-append shadow "/sbin/nologin"))))))) -(define (final-postgresql postgresql extension-packages) - (if (null? extension-packages) - postgresql - (package - (inherit postgresql) - (source #f) - (build-system trivial-build-system) - (arguments - `(#:modules ((guix build utils) (guix build union)) - #:builder - (begin - (use-modules (guix build utils) (guix build union) (srfi srfi-26)) - (union-build (assoc-ref %outputs "out") - (map (lambda (input) (cdr input)) - %build-inputs)) - #t))) - (inputs - `(("postgresql" ,postgresql) - ,@(map (lambda (extension) (list "extension" extension)) - extension-packages)))))) - (define postgresql-activation (match-lambda (($ <postgresql-configuration> postgresql port locale config-file @@ -250,8 +229,7 @@ (define postgresql-activation (unless (file-exists? #$data-directory) (let ((initdb (string-append - #$(final-postgresql postgresql - extension-packages) + #$(extend-postgresql postgresql extension-packages) "/bin/initdb")) (initdb-args (append @@ -297,7 +275,7 @@ (define postgresql-shepherd-service ((_ mode) (let ((user (getpwnam "postgres")) (pg_ctl #$(file-append - (final-postgresql postgresql + (extend-postgresql postgresql extension-packages) "/bin/pg_ctl")) (options (format #f "--config-file=~a -p ~d" -- 2.46.0
X-Loop: help-debbugs@HIDDEN Subject: [bug#73876] [PATCH 3/3] gnu: Add postgresql-libversion. Resent-From: Nicolas Graves <ngraves@HIDDEN> Original-Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org> Resent-CC: guix-patches@HIDDEN Resent-Date: Sat, 19 Oct 2024 09:11:02 +0000 Resent-Message-ID: <handler.73876.B73876.172932900617372 <at> debbugs.gnu.org> Resent-Sender: help-debbugs@HIDDEN X-GNU-PR-Message: followup 73876 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 73876 <at> debbugs.gnu.org Cc: Nicolas Graves <ngraves@HIDDEN> Received: via spool by 73876-submit <at> debbugs.gnu.org id=B73876.172932900617372 (code B ref 73876); Sat, 19 Oct 2024 09:11:02 +0000 Received: (at 73876) by debbugs.gnu.org; 19 Oct 2024 09:10:06 +0000 Received: from localhost ([127.0.0.1]:41426 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>) id 1t25TK-0004W7-3q for submit <at> debbugs.gnu.org; Sat, 19 Oct 2024 05:10:06 -0400 Received: from 6.mo583.mail-out.ovh.net ([178.32.119.138]:33547) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <ngraves@HIDDEN>) id 1t25TF-0004V7-J9 for 73876 <at> debbugs.gnu.org; Sat, 19 Oct 2024 05:10:03 -0400 Received: from director8.ghost.mail-out.ovh.net (unknown [10.108.25.152]) by mo583.mail-out.ovh.net (Postfix) with ESMTP id 4XVwkS3mYBz1L0f for <73876 <at> debbugs.gnu.org>; Sat, 19 Oct 2024 09:09:36 +0000 (UTC) Received: from ghost-submission-5b5ff79f4f-f6p9m (unknown [10.110.168.167]) by director8.ghost.mail-out.ovh.net (Postfix) with ESMTPS id 2C3521FD16; Sat, 19 Oct 2024 09:09:35 +0000 (UTC) Received: from ngraves.fr ([37.59.142.103]) by ghost-submission-5b5ff79f4f-f6p9m with ESMTPSA id J17nJ093E2di9gAAxd2dPg (envelope-from <ngraves@HIDDEN>); Sat, 19 Oct 2024 09:09:35 +0000 Authentication-Results: garm.ovh; auth=pass (GARM-103G00589f4ba22-5ddf-4d47-96c4-a86af1dda8d9, 1C04683152D118B95F8C4B6437EEF0B0B2253C85) smtp.auth=ngraves@HIDDEN X-OVh-ClientIp: 90.110.172.34 From: Nicolas Graves <ngraves@HIDDEN> Date: Sat, 19 Oct 2024 11:09:15 +0200 Message-ID: <20241019090928.21158-3-ngraves@HIDDEN> X-Mailer: git-send-email 2.46.0 In-Reply-To: <20241019090928.21158-1-ngraves@HIDDEN> References: <20241019090928.21158-1-ngraves@HIDDEN> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Ovh-Tracer-Id: 8597371689614500578 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: 0 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgeeftddrvdehhedgudegucetufdoteggodetrfdotffvucfrrhhofhhilhgvmecuqfggjfdpvefjgfevmfevgfenuceurghilhhouhhtmecuhedttdenucenucfjughrpefhvfevufffkffojghfggfgsedtkeertdertddtnecuhfhrohhmpefpihgtohhlrghsucfirhgrvhgvshcuoehnghhrrghvvghssehnghhrrghvvghsrdhfrheqnecuggftrfgrthhtvghrnheptdejfeejgefffefhtdeluefffeevjeehfffhgffghfduueejleevgffhleeviedvnecuffhomhgrihhnpehgihhthhhusgdrtghomhdprhgvphholhhoghihrdhorhhgnecukfhppeduvdejrddtrddtrddupdeltddruddutddrudejvddrfeegpdefjedrheelrddugedvrddutdefnecuvehluhhsthgvrhfuihiivgeptdenucfrrghrrghmpehinhgvthepuddvjedrtddrtddruddpmhgrihhlfhhrohhmpehnghhrrghvvghssehnghhrrghvvghsrdhfrhdpnhgspghrtghpthhtohepuddprhgtphhtthhopeejfeekjeeiseguvggssghughhsrdhgnhhurdhorhhgpdfovfetjfhoshhtpehmohehkeefpdhmohguvgepshhmthhpohhuth DKIM-Signature: a=rsa-sha256; bh=4QLaF78RAcxnNul2ex14rqqgdDeLkJsGZjbcseRUnUE=; c=relaxed/relaxed; d=ngraves.fr; h=From; s=ovhmo4487190-selector1; t=1729328976; v=1; b=mo4znYpgZhMNRRHdTQmC+69mCt1BepL++cOmSg6VAZVygC9VQTZWUB7x7FxURY8+1phXQDRy pnSVuCllYwVdn9E9MyCu06gLhxlLfKYKvDc0vvuenOnThl3+LybePwZMchYpI6St4QMtL31Q5gF IWAsxYSF3swqE3lpybhEGuJNEC6uYnOQR6neW1CJrQTLfc8ivwd4Hq5kI1iKXKa0Tp34E5GxjlG PyWxoaVn96yezm32mN7fXYdkVo3c8789S7CkwCyxz2FMLFkEQDXrtts4Vc+kAjdZSdaI6DNUzC8 3qnY6tjfSr0gwOBa3AxsrYxCcLzmP7FhS3xgLyymIoy8g== X-Spam-Score: 0.0 (/) X-BeenThere: debbugs-submit <at> debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: <debbugs-submit.debbugs.gnu.org> List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe> List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/> List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org> List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help> List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe> Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org> X-Spam-Score: -1.0 (-) * gnu/packages/version-control.scm (postgresql-libversion): New variable. --- gnu/packages/version-control.scm | 85 ++++++++++++++++++++++++++++++++ 1 file changed, 85 insertions(+) diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-control.scm index b14ec77ff5..b70db7a022 100644 --- a/gnu/packages/version-control.scm +++ b/gnu/packages/version-control.scm @@ -1570,6 +1570,91 @@ (define-public python-git-multimail repository") (license license:gpl2))) +(define postgresql-libversion-bootstrap + (package + (name "postgresql-libversion") + (version "2.0.1") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/repology/postgresql-libversion") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0g28dbj0zad62irzv051m4acby974f1ya605xfl48i8g3il9fyny")))) + (build-system gnu-build-system) + (arguments + (list + #:tests? #f + #:make-flags #~(list (string-append "DESTDIR=" (getcwd) "/tmp-out")) + #:phases + #~(modify-phases %standard-phases + (delete 'configure) + (delete 'install) + (add-after 'build 'pre-install + (lambda args + (mkdir "tmp-out") + (apply (assoc-ref %standard-phases 'install) args))) + (add-after 'pre-install 'install + (lambda _ + (let ((tmp-out (string-append (dirname (getcwd)) "/tmp-out"))) + (copy-recursively + (dirname + (dirname (car (find-files tmp-out "libversion.so")))) + #$output)))) + (add-after 'build 'start-postgresql + (lambda* (#:key tests? #:allow-other-keys) + (when tests? + (let ((dbdir (string-append (dirname (getcwd)) "/pgdir"))) + (invoke "initdb" "-D" dbdir) + (invoke "pg_ctl" "-D" dbdir + "-o" (string-append "-k " dbdir) + "-l" (string-append dbdir "/db.log") + "start") + (invoke "psql" "-h" dbdir "-d" "postgres" + "-c" "CREATE DATABASE nixbld;") + (setenv "PGHOST" dbdir))))) + (replace 'check + (lambda* (#:key tests? #:allow-other-keys) + (if tests? + (invoke "make" "installcheck") + (format #t "test suite not run~%"))))))) + (inputs (list libversion postgresql)) + (native-inputs (list pkg-config)) + (home-page "https://github.com/repology/postgresql-libversion") + (synopsis "PostgreSQL extension for version string comparison") + (description "This package provides a PostgreSQL extension with support +for version string comparison through @code{libversion}. It is used to +experiment with @url{https://repology.org, Repology} database dumps.") + (license license:expat))) + +;; A postgresql extension needs extend-postgresql with itself to test. +;; This is because CREATE EXTENSION needs the extension to be in the +;; postgresql package. +(define-public postgresql-libversion + (package + (inherit postgresql-libversion-bootstrap) + (arguments + (substitute-keyword-arguments + (package-arguments postgresql-libversion-bootstrap) + ((#:tests? _) #t) + ((#:phases phases) + #~(modify-phases #$phases + (delete 'build) + (delete 'pre-install) + (delete 'install-license-files) + (replace 'install + (lambda _ + (copy-recursively + #$(this-package-native-input "postgresql-libversion") + #$output))))))) + (native-inputs (list pkg-config + postgresql-libversion-bootstrap + (extend-postgresql + postgresql + (list postgresql-libversion-bootstrap)))))) + (define-public python-ghp-import (package (name "python-ghp-import") -- 2.46.0
Received: (at control) by debbugs.gnu.org; 19 Oct 2024 17:36:04 +0000 From debbugs-submit-bounces <at> debbugs.gnu.org Sat Oct 19 13:36:04 2024 Received: from localhost ([127.0.0.1]:44671 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>) id 1t2DMy-00039F-Ik for submit <at> debbugs.gnu.org; Sat, 19 Oct 2024 13:36:04 -0400 Received: from 2.mo560.mail-out.ovh.net ([188.165.53.149]:54333) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <ngraves@HIDDEN>) id 1t2DMu-00038n-HL for control <at> debbugs.gnu.org; Sat, 19 Oct 2024 13:36:02 -0400 Received: from director1.ghost.mail-out.ovh.net (unknown [10.108.25.52]) by mo560.mail-out.ovh.net (Postfix) with ESMTP id 4XW7yG63qlz1Ym8 for <control <at> debbugs.gnu.org>; Sat, 19 Oct 2024 17:35:34 +0000 (UTC) Received: from ghost-submission-5b5ff79f4f-v4c8f (unknown [10.110.101.126]) by director1.ghost.mail-out.ovh.net (Postfix) with ESMTPS id 1A21B1FE06 for <control <at> debbugs.gnu.org>; Sat, 19 Oct 2024 17:35:33 +0000 (UTC) Received: from ngraves.fr ([37.59.142.95]) by ghost-submission-5b5ff79f4f-v4c8f with ESMTPSA id 3TiNJ+XtE2eYSgIAjWsO9A (envelope-from <ngraves@HIDDEN>) for <control <at> debbugs.gnu.org>; Sat, 19 Oct 2024 17:35:33 +0000 Authentication-Results: garm.ovh; auth=pass (GARM-95G00195e4c475-0770-4816-b6dc-f37f52098781, 1C04683152D118B95F8C4B6437EEF0B0B2253C85) smtp.auth=ngraves@HIDDEN X-OVh-ClientIp: 90.110.172.34 From: Nicolas Graves <ngraves@HIDDEN> To: control <at> debbugs.gnu.org Subject: tag 73876 moreinfo Date: Sat, 19 Oct 2024 19:35:33 +0200 Message-ID: <87ttd8uhay.fsf@HIDDEN> MIME-Version: 1.0 Content-Type: text/plain X-Ovh-Tracer-Id: 17142389032071586405 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: 0 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgeeftddrvdehhedguddukecutefuodetggdotefrodftvfcurfhrohhfihhlvgemucfqggfjpdevjffgvefmvefgnecuuegrihhlohhuthemucehtddtnecunecujfgurhephffvufffkfggtgesthdtredttddttdenucfhrhhomheppfhitgholhgrshcuifhrrghvvghsuceonhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrqeenucggtffrrghtthgvrhhnpeeujeelieeljeffhfelteejtdeljeehveduffelvefgudefkeehgfdvvdevgeevfeenucfkphepuddvjedrtddrtddruddpledtrdduuddtrddujedvrdefgedpfeejrdehledrudegvddrleehnecuvehluhhsthgvrhfuihiivgeptdenucfrrghrrghmpehinhgvthepuddvjedrtddrtddruddpmhgrihhlfhhrohhmpehnghhrrghvvghssehnghhrrghvvghsrdhfrhdpnhgspghrtghpthhtohepuddprhgtphhtthhopegtohhnthhrohhlseguvggssghughhsrdhgnhhurdhorhhgpdfovfetjfhoshhtpehmohehiedtpdhmohguvgepshhmthhpohhuth DKIM-Signature: a=rsa-sha256; bh=Zf05OCluc5uWPtariSUnld/OjuAbhJXbYRrBsYbqGbo=; c=relaxed/relaxed; d=ngraves.fr; h=From; s=ovhmo4487190-selector1; t=1729359334; v=1; b=vwxejs8os7QfAPdQUj8B0SLa0V8x4JLsICfkzzTZQ4jgc/L5JZe+5arfTU71w+Nj+BF+74rz hFaRLKSmwxdHDgoiz3fxmnHnXYsqalZJyBSGor7n/94ckFIxtcpq3fklwzE3qfLmzt+Dk2Mhtb1 /7H7qDKs6cYVO1aZkwP5EdJlfw31vMk9tPX6jwHiMzU4Pu62hXSzVx/tElY7Si5eLcgyYHzm8/D K6Bu/wk7WNL4asHxooQXDNkY7Z6RRFuHmltEh91Ca4mBzpUEIaqAG0DYErV63zshT2alrcjgwz+ fYyDbIjRUXgdfEion+uUo3W8mXHUaQjUgxGFy+pADO+qg== X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: control X-BeenThere: debbugs-submit <at> debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: <debbugs-submit.debbugs.gnu.org> List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe> List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/> List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org> List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help> List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe> Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org> X-Spam-Score: -1.0 (-) tags 73876 + moreinfo quit The approach in timescaledb seems to be better. I'll resubmit a version. My questions are still relevant though ;) -- Best regards, Nicolas Graves
Received: (at control) by debbugs.gnu.org; 20 Oct 2024 09:06:14 +0000 From debbugs-submit-bounces <at> debbugs.gnu.org Sun Oct 20 05:06:14 2024 Received: from localhost ([127.0.0.1]:45779 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>) id 1t2Rt8-0003tN-IR for submit <at> debbugs.gnu.org; Sun, 20 Oct 2024 05:06:14 -0400 Received: from 2.mo550.mail-out.ovh.net ([178.32.119.250]:57817) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <ngraves@HIDDEN>) id 1t2Rt5-0003tA-JK for control <at> debbugs.gnu.org; Sun, 20 Oct 2024 05:06:12 -0400 Received: from director7.ghost.mail-out.ovh.net (unknown [10.108.17.59]) by mo550.mail-out.ovh.net (Postfix) with ESMTP id 4XWXbY1jZgz1THC for <control <at> debbugs.gnu.org>; Sun, 20 Oct 2024 09:05:45 +0000 (UTC) Received: from ghost-submission-5b5ff79f4f-bg2mk (unknown [10.110.101.173]) by director7.ghost.mail-out.ovh.net (Postfix) with ESMTPS id 02F371FDE0 for <control <at> debbugs.gnu.org>; Sun, 20 Oct 2024 09:05:44 +0000 (UTC) Received: from ngraves.fr ([37.59.142.96]) by ghost-submission-5b5ff79f4f-bg2mk with ESMTPSA id pwrDL+jHFGd2AgAAFTvu1A (envelope-from <ngraves@HIDDEN>) for <control <at> debbugs.gnu.org>; Sun, 20 Oct 2024 09:05:44 +0000 Authentication-Results: garm.ovh; auth=pass (GARM-96R001ddab1d3e-f261-4a07-8fcd-a38756b0273f, FA5DCE6FD238C77E776584D68A2B59A15A69FDEC) smtp.auth=ngraves@HIDDEN X-OVh-ClientIp: 86.246.19.221 From: Nicolas Graves <ngraves@HIDDEN> To: control <at> debbugs.gnu.org Subject: Re: tag 73876 moreinfo In-Reply-To: <87ttd8uhay.fsf@HIDDEN> References: <87ttd8uhay.fsf@HIDDEN> Date: Sun, 20 Oct 2024 11:05:43 +0200 Message-ID: <875xpncffc.fsf@HIDDEN> MIME-Version: 1.0 Content-Type: text/plain X-Ovh-Tracer-Id: 14405044885023744613 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: 0 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgeeftddrvdehjedgudduucetufdoteggodetrfdotffvucfrrhhofhhilhgvmecuqfggjfdpvefjgfevmfevgfenuceurghilhhouhhtmecuhedttdenucenucfjughrpefhvffujghffffkgggtsehttdertddttddtnecuhfhrohhmpefpihgtohhlrghsucfirhgrvhgvshcuoehnghhrrghvvghssehnghhrrghvvghsrdhfrheqnecuggftrfgrthhtvghrnhepieejgfffffduieevgfduiefhtdfgleejhfdvvefhgeekjeevtdfhtdefleejhefgnecukfhppeduvdejrddtrddtrddupdekiedrvdegiedrudelrddvvddupdefjedrheelrddugedvrdelieenucevlhhushhtvghrufhiiigvpedtnecurfgrrhgrmhepihhnvghtpeduvdejrddtrddtrddupdhmrghilhhfrhhomhepnhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrpdhnsggprhgtphhtthhopedupdhrtghpthhtoheptghonhhtrhholhesuggvsggsuhhgshdrghhnuhdrohhrghdpoffvtefjohhsthepmhhoheehtddpmhhouggvpehsmhhtphhouhht DKIM-Signature: a=rsa-sha256; bh=Py5FavBq7Kkg1tVfZncNJuEJdBsWsg1ZQwBRQxTewO8=; c=relaxed/relaxed; d=ngraves.fr; h=From; s=ovhmo4487190-selector1; t=1729415145; v=1; b=HUvIenhPjGORhuJuWJh9Pff4V9s/6ts/6sLTW1gSEQeWh76C5+D7mJT9Rpdw9nI6pTszc+Mt KKOSLzFklw8x+2thyUatrXL611z/QLhnPME6hrBA1Z9iFz+CJoXVWtzbGqTtWfgnBrh9J2SYR1k EiiokZB+ysrmn3UoDX4eDaNxn3S8ab6YxocSgRjhNe5ViYAx+QfZBiDYMP5u7nkDL8iRv57abco 1BjeBw3sYMdM3G6tB6nQTx1Qttjd+zVjyvK6Cfl3wBmvxWKLCw/SGGQumv/keuJ7jaL5ghxHFmq JjwJZWDCWsYnKgFIgItD3xICOoLmxMWLigJlnQDAgvmwQ== X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: control X-BeenThere: debbugs-submit <at> debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: <debbugs-submit.debbugs.gnu.org> List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe> List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/> List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org> List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help> List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe> Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org> X-Spam-Score: -1.0 (-) tags 73876 - moreinfo quit -- Best regards, Nicolas Graves
X-Loop: help-debbugs@HIDDEN Subject: [bug#73876] [PATCH v2 1/3] gnu: Add libversion. References: <20241019085518.18205-1-ngraves@HIDDEN> In-Reply-To: <20241019085518.18205-1-ngraves@HIDDEN> Resent-From: Nicolas Graves <ngraves@HIDDEN> Original-Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org> Resent-CC: guix-patches@HIDDEN Resent-Date: Sun, 20 Oct 2024 14:23:03 +0000 Resent-Message-ID: <handler.73876.B73876.17294341519583 <at> debbugs.gnu.org> Resent-Sender: help-debbugs@HIDDEN X-GNU-PR-Message: followup 73876 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 73876 <at> debbugs.gnu.org Cc: Nicolas Graves <ngraves@HIDDEN> Received: via spool by 73876-submit <at> debbugs.gnu.org id=B73876.17294341519583 (code B ref 73876); Sun, 20 Oct 2024 14:23:03 +0000 Received: (at 73876) by debbugs.gnu.org; 20 Oct 2024 14:22:31 +0000 Received: from localhost ([127.0.0.1]:47959 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>) id 1t2WpC-0002UU-Ps for submit <at> debbugs.gnu.org; Sun, 20 Oct 2024 10:22:31 -0400 Received: from 4.mo575.mail-out.ovh.net ([46.105.59.63]:60921) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <ngraves@HIDDEN>) id 1t2Wp3-0002Tk-Oz for 73876 <at> debbugs.gnu.org; Sun, 20 Oct 2024 10:22:26 -0400 Received: from director3.ghost.mail-out.ovh.net (unknown [10.109.148.12]) by mo575.mail-out.ovh.net (Postfix) with ESMTP id 4XWgcL6M1lz1jtZ for <73876 <at> debbugs.gnu.org>; Sun, 20 Oct 2024 14:21:54 +0000 (UTC) Received: from ghost-submission-5b5ff79f4f-4nxk9 (unknown [10.111.182.49]) by director3.ghost.mail-out.ovh.net (Postfix) with ESMTPS id 458DF1FDFA; Sun, 20 Oct 2024 14:21:54 +0000 (UTC) Received: from ngraves.fr ([37.59.142.109]) by ghost-submission-5b5ff79f4f-4nxk9 with ESMTPSA id X6NnNQESFWdFKwUA89OydA (envelope-from <ngraves@HIDDEN>); Sun, 20 Oct 2024 14:21:54 +0000 Authentication-Results: garm.ovh; auth=pass (GARM-109S0034860a13c-3c28-44f5-82e2-6ecb39000e70, FA5DCE6FD238C77E776584D68A2B59A15A69FDEC) smtp.auth=ngraves@HIDDEN X-OVh-ClientIp: 86.246.19.221 From: Nicolas Graves <ngraves@HIDDEN> Date: Sun, 20 Oct 2024 16:21:33 +0200 Message-ID: <20241020142144.22877-1-ngraves@HIDDEN> X-Mailer: git-send-email 2.46.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Ovh-Tracer-Id: 1297599644683723490 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: 0 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgeeftddrvdehjedgjeehucetufdoteggodetrfdotffvucfrrhhofhhilhgvmecuqfggjfdpvefjgfevmfevgfenuceurghilhhouhhtmecuhedttdenucenucfjughrpefhvfevufffkffogggtgfesthekredtredtjeenucfhrhhomheppfhitgholhgrshcuifhrrghvvghsuceonhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrqeenucggtffrrghtthgvrhhnpeffjeevuedufefhfeekheeludfgkeekjeduieejteehvedugfegudffffefkeekveenucffohhmrghinhepghhithhhuhgsrdgtohhmpdhrvghpohhlohhghidrohhrghenucfkphepuddvjedrtddrtddruddpkeeirddvgeeirdduledrvddvuddpfeejrdehledrudegvddruddtleenucevlhhushhtvghrufhiiigvpedtnecurfgrrhgrmhepihhnvghtpeduvdejrddtrddtrddupdhmrghilhhfrhhomhepnhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrpdhnsggprhgtphhtthhopedupdhrtghpthhtohepjeefkeejieesuggvsggsuhhgshdrghhnuhdrohhrghdpoffvtefjohhsthepmhhoheejhedpmhhouggvpehsmhhtphhouhht DKIM-Signature: a=rsa-sha256; bh=HpnBN8+K4SUgrwCquEA1dNBzJY9PKyq4haMKpkNfdkA=; c=relaxed/relaxed; d=ngraves.fr; h=From; s=ovhmo4487190-selector1; t=1729434115; v=1; b=TXInKXA01ZnBPcqqo9WGQ3YQSSWIGBhxXaC57hEhS+4n8onjPfPT0K7AhO0c44hbbMYECAWe BDKD3JiXmmpMGnvZNJ2kirV0ZVsdhKxiEqAacicCiNDUlDcjUEn8sTLYjyK7HXB7hrru99MomIx Pn0pxkU8bfuVTgAaNM1W/eI7rOjB7juIXMTtKvGAigK7gy+udNVfQPXoGMocnoqEKihilHQycM7 suerOU8YOWGrCEmAWG7W0P8wxqcBBH6BP1qAgl8m+42Dgigx/ZDPzCGVBOnvdxF5LgIQHkfrwfB 1QRpMkYfG0H5NKYx9gNwEg0vnggNQICW3nsMvvxyFzK0A== X-Spam-Score: 0.0 (/) X-BeenThere: debbugs-submit <at> debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: <debbugs-submit.debbugs.gnu.org> List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe> List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/> List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org> List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help> List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe> Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org> X-Spam-Score: -1.0 (-) * gnu/packages/version-control.scm (libversion): New variable. --- gnu/packages/version-control.scm | 34 +++++++++++++++++++++++++++++++- 1 file changed, 33 insertions(+), 1 deletion(-) diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-control.scm index 6bd37fee82..b14ec77ff5 100644 --- a/gnu/packages/version-control.scm +++ b/gnu/packages/version-control.scm @@ -47,7 +47,7 @@ ;;; Copyright © 2022 Maxime Devos <maximedevos@HIDDEN> ;;; Copyright © 2022 Dhruvin Gandhi <contact@HIDDEN> ;;; Copyright © 2015, 2022 David Thompson <davet@HIDDEN> -;;; Copyright © 2023 Nicolas Graves <ngraves@HIDDEN> +;;; Copyright © 2023, 2024 Nicolas Graves <ngraves@HIDDEN> ;;; Copyright © 2023 Bruno Victal <mirai@HIDDEN> ;;; Copyright © 2023 Kjartan Oli Agustsson <kjartanoli@HIDDEN> ;;; Copyright © 2023 Steve George <steve@HIDDEN> @@ -1251,6 +1251,38 @@ (define-public libgit2-1.3 ;; Tests may be disabled if cross-compiling. (format #t "Test suite not run.~%")))))))))) +(define-public libversion + (package + (name "libversion") + (version "3.0.3") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/repology/libversion") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 "186dq3x9w8k5xp4b84ms7f5cm10si3yzs52iscgv0xs58c7rfja4")))) + (build-system cmake-build-system) + (home-page "https://github.com/repology/libversion") + (synopsis "Version string comparison library") + (description "This package provides a very advanced string comparison +library, used by the @url{https://repology.org, Repology} project, and able to +compare versions with: + +@itemize +@item insignificant components +@item leading zero +@item unusual separators +@item letter suffixes +@item alphanumeric prerelease components +@item prerelease keywords +@item patch, post and pl keywords +@item customizable handling of ambiguous p keyword +@end itemize") + (license license:expat))) + (define-public git-crypt (package (name "git-crypt") -- 2.46.0
X-Loop: help-debbugs@HIDDEN Subject: [bug#73876] [PATCH v2 2/3] gnu: Add postgresql-libversion. Resent-From: Nicolas Graves <ngraves@HIDDEN> Original-Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org> Resent-CC: guix-patches@HIDDEN Resent-Date: Sun, 20 Oct 2024 14:23:04 +0000 Resent-Message-ID: <handler.73876.B73876.17294341539598 <at> debbugs.gnu.org> Resent-Sender: help-debbugs@HIDDEN X-GNU-PR-Message: followup 73876 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 73876 <at> debbugs.gnu.org Cc: Nicolas Graves <ngraves@HIDDEN> Received: via spool by 73876-submit <at> debbugs.gnu.org id=B73876.17294341539598 (code B ref 73876); Sun, 20 Oct 2024 14:23:04 +0000 Received: (at 73876) by debbugs.gnu.org; 20 Oct 2024 14:22:33 +0000 Received: from localhost ([127.0.0.1]:47961 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>) id 1t2WpE-0002Uf-8z for submit <at> debbugs.gnu.org; Sun, 20 Oct 2024 10:22:32 -0400 Received: from 7.mo581.mail-out.ovh.net ([46.105.43.131]:57529) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <ngraves@HIDDEN>) id 1t2Wp4-0002Tp-OX for 73876 <at> debbugs.gnu.org; Sun, 20 Oct 2024 10:22:26 -0400 Received: from director1.ghost.mail-out.ovh.net (unknown [10.109.148.29]) by mo581.mail-out.ovh.net (Postfix) with ESMTP id 4XWgcN0x5Kz1J3P for <73876 <at> debbugs.gnu.org>; Sun, 20 Oct 2024 14:21:56 +0000 (UTC) Received: from ghost-submission-5b5ff79f4f-rdg64 (unknown [10.110.188.72]) by director1.ghost.mail-out.ovh.net (Postfix) with ESMTPS id D5D531FD0F; Sun, 20 Oct 2024 14:21:55 +0000 (UTC) Received: from ngraves.fr ([37.59.142.108]) by ghost-submission-5b5ff79f4f-rdg64 with ESMTPSA id a5nvKwMSFWeB+AkAGFRN/A (envelope-from <ngraves@HIDDEN>); Sun, 20 Oct 2024 14:21:55 +0000 Authentication-Results: garm.ovh; auth=pass (GARM-108S002b2e3d1fd-a708-42ce-b701-d99ea5257500, FA5DCE6FD238C77E776584D68A2B59A15A69FDEC) smtp.auth=ngraves@HIDDEN X-OVh-ClientIp: 86.246.19.221 From: Nicolas Graves <ngraves@HIDDEN> Date: Sun, 20 Oct 2024 16:21:34 +0200 Message-ID: <20241020142144.22877-2-ngraves@HIDDEN> X-Mailer: git-send-email 2.46.0 In-Reply-To: <20241020142144.22877-1-ngraves@HIDDEN> References: <20241020142144.22877-1-ngraves@HIDDEN> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Ovh-Tracer-Id: 1298162594489557730 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: 0 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgeeftddrvdehjedgjeehucetufdoteggodetrfdotffvucfrrhhofhhilhgvmecuqfggjfdpvefjgfevmfevgfenuceurghilhhouhhtmecuhedttdenucenucfjughrpefhvfevufffkffojghfggfgsedtkeertdertddtnecuhfhrohhmpefpihgtohhlrghsucfirhgrvhgvshcuoehnghhrrghvvghssehnghhrrghvvghsrdhfrheqnecuggftrfgrthhtvghrnheptdejfeejgefffefhtdeluefffeevjeehfffhgffghfduueejleevgffhleeviedvnecuffhomhgrihhnpehgihhthhhusgdrtghomhdprhgvphholhhoghihrdhorhhgnecukfhppeduvdejrddtrddtrddupdekiedrvdegiedrudelrddvvddupdefjedrheelrddugedvrddutdeknecuvehluhhsthgvrhfuihiivgeptdenucfrrghrrghmpehinhgvthepuddvjedrtddrtddruddpmhgrihhlfhhrohhmpehnghhrrghvvghssehnghhrrghvvghsrdhfrhdpnhgspghrtghpthhtohepuddprhgtphhtthhopeejfeekjeeiseguvggssghughhsrdhgnhhurdhorhhgpdfovfetjfhoshhtpehmohehkedupdhmohguvgepshhmthhpohhuth DKIM-Signature: a=rsa-sha256; bh=y2ON4LOsbbJttkIkgJZT03LNr9Z9TOasflBKboVENac=; c=relaxed/relaxed; d=ngraves.fr; h=From; s=ovhmo4487190-selector1; t=1729434116; v=1; b=AWcVsns1dhLcQ/Owjq4NUP67iNkYUr3T6z15U7I72lJSqD5YQfWkXvqjlr21RRj+B2pU6Zq1 XQS6TStgeTuhbsMsa+xxFsuKe7V7fdm3ENfNMGCO3UbgmtGKjPI/vT22xy4vFZehNCifVH3dFXt RTc5305hxOXXnhM8iVr4ZO5m9oXum6obWPDpLPnp/icAiv0q1PB+xbgD/0b91F1BMxqdRlqBKYw nYwZQioRScdQa73DcwNiCEpLeBRQOAZmkhshohYVD69xuf4VJMevbiRp4OIedhjrjkgul3AiyvY r5MT4Gok47JJur2NNS1mVVkW84mnOF5jEEWxuR3o03KOg== X-Spam-Score: 0.0 (/) X-BeenThere: debbugs-submit <at> debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: <debbugs-submit.debbugs.gnu.org> List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe> List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/> List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org> List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help> List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe> Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org> X-Spam-Score: -1.0 (-) * gnu/packages/version-control.scm (postgresql-libversion): New variable. --- gnu/packages/version-control.scm | 68 ++++++++++++++++++++++++++++++++ 1 file changed, 68 insertions(+) diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-control.scm index b14ec77ff5..00e50a9182 100644 --- a/gnu/packages/version-control.scm +++ b/gnu/packages/version-control.scm @@ -1570,6 +1570,74 @@ (define-public python-git-multimail repository") (license license:gpl2))) +(define-public postgresql-libversion + (package + (name "postgresql-libversion") + (version "2.0.1") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/repology/postgresql-libversion") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0g28dbj0zad62irzv051m4acby974f1ya605xfl48i8g3il9fyny")))) + (build-system gnu-build-system) + (arguments + (list + #:make-flags #~(list (string-append "DESTDIR=" (getcwd) "/tmp-out")) + #:imported-modules `((guix build union) + ,@%default-gnu-imported-modules) + #:modules `(,@%default-gnu-imported-modules + (guix build union) + (ice-9 match)) + #:phases + #~(modify-phases %standard-phases + (delete 'configure) + (delete 'install) + (add-after 'build 'pre-install + (lambda args + (mkdir "tmp-out") + (apply (assoc-ref %standard-phases 'install) args))) + (add-after 'pre-install 'install + (lambda _ + (let ((tmp-out (string-append (dirname (getcwd)) "/tmp-out"))) + (copy-recursively + (dirname + (dirname (car (find-files tmp-out "libversion.so")))) + #$output)))) + (add-after 'install 'prepare-tests + (lambda* (#:key inputs tests? #:allow-other-keys) + (if tests? + (let ((pg-data (string-append (getcwd) "/../pg-data")) + (pg-union (string-append (getcwd) "/../pg-union"))) + (match inputs + (((names . directories) ...) + (union-build pg-union (cons #$output directories)))) + (setenv "PATH" (string-append pg-union "/bin:" + (getenv "PATH"))) + (invoke "initdb" "-D" pg-data) + (invoke "pg_ctl" "-D" pg-data + "-o" (string-append "-k " pg-data) + "-l" (string-append pg-data "/db.log") + "start") + (setenv "PGHOST" pg-data)) + (format #t "prepare-tests phase not run~%")))) + (replace 'check + (lambda* (#:key tests? #:allow-other-keys) + (if tests? + (invoke "make" "installcheck") + (format #t "test suite not run~%"))))))) + (inputs (list libversion postgresql)) + (native-inputs (list pkg-config)) + (home-page "https://github.com/repology/postgresql-libversion") + (synopsis "PostgreSQL extension for version string comparison") + (description "This package provides a PostgreSQL extension with support +for version string comparison through @code{libversion}. It is used to +experiment with @url{https://repology.org, Repology} database dumps.") + (license license:expat))) + (define-public python-ghp-import (package (name "python-ghp-import") -- 2.46.0
X-Loop: help-debbugs@HIDDEN Subject: [bug#73876] [PATCH v2 3/3] gnu: databases: Rewrite final-postgresql for postgresql-service. Resent-From: Nicolas Graves <ngraves@HIDDEN> Original-Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org> Resent-CC: guix-patches@HIDDEN Resent-Date: Sun, 20 Oct 2024 14:23:04 +0000 Resent-Message-ID: <handler.73876.B73876.17294341539605 <at> debbugs.gnu.org> Resent-Sender: help-debbugs@HIDDEN X-GNU-PR-Message: followup 73876 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 73876 <at> debbugs.gnu.org Cc: Nicolas Graves <ngraves@HIDDEN> Received: via spool by 73876-submit <at> debbugs.gnu.org id=B73876.17294341539605 (code B ref 73876); Sun, 20 Oct 2024 14:23:04 +0000 Received: (at 73876) by debbugs.gnu.org; 20 Oct 2024 14:22:33 +0000 Received: from localhost ([127.0.0.1]:47963 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>) id 1t2WpF-0002Ul-0d for submit <at> debbugs.gnu.org; Sun, 20 Oct 2024 10:22:33 -0400 Received: from 8.mo575.mail-out.ovh.net ([46.105.74.219]:40975) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <ngraves@HIDDEN>) id 1t2Wp9-0002UD-P5 for 73876 <at> debbugs.gnu.org; Sun, 20 Oct 2024 10:22:29 -0400 Received: from director4.ghost.mail-out.ovh.net (unknown [10.108.2.72]) by mo575.mail-out.ovh.net (Postfix) with ESMTP id 4XWgcR6QSJz1jvG for <73876 <at> debbugs.gnu.org>; Sun, 20 Oct 2024 14:21:59 +0000 (UTC) Received: from ghost-submission-5b5ff79f4f-pbhl4 (unknown [10.110.118.3]) by director4.ghost.mail-out.ovh.net (Postfix) with ESMTPS id 748341FE5A; Sun, 20 Oct 2024 14:21:59 +0000 (UTC) Received: from ngraves.fr ([37.59.142.109]) by ghost-submission-5b5ff79f4f-pbhl4 with ESMTPSA id 7fWEAAcSFWehwQUASxT0LQ (envelope-from <ngraves@HIDDEN>); Sun, 20 Oct 2024 14:21:59 +0000 Authentication-Results: garm.ovh; auth=pass (GARM-109S0032ad8543f-7939-4c4a-aa31-c42ffd512bb6, FA5DCE6FD238C77E776584D68A2B59A15A69FDEC) smtp.auth=ngraves@HIDDEN X-OVh-ClientIp: 86.246.19.221 From: Nicolas Graves <ngraves@HIDDEN> Date: Sun, 20 Oct 2024 16:21:35 +0200 Message-ID: <20241020142144.22877-3-ngraves@HIDDEN> X-Mailer: git-send-email 2.46.0 In-Reply-To: <20241020142144.22877-1-ngraves@HIDDEN> References: <20241020142144.22877-1-ngraves@HIDDEN> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Ovh-Tracer-Id: 1299007018261406434 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: 0 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgeeftddrvdehjedgjeehucetufdoteggodetrfdotffvucfrrhhofhhilhgvmecuqfggjfdpvefjgfevmfevgfenuceurghilhhouhhtmecuhedttdenucenucfjughrpefhvfevufffkffojghfggfgsedtkeertdertddtnecuhfhrohhmpefpihgtohhlrghsucfirhgrvhgvshcuoehnghhrrghvvghssehnghhrrghvvghsrdhfrheqnecuggftrfgrthhtvghrnhepleffjeetueethfefkeffffefvddukeejkefgleduiedthfekvefhiedvhfffgeegnecukfhppeduvdejrddtrddtrddupdekiedrvdegiedrudelrddvvddupdefjedrheelrddugedvrddutdelnecuvehluhhsthgvrhfuihiivgeptdenucfrrghrrghmpehinhgvthepuddvjedrtddrtddruddpmhgrihhlfhhrohhmpehnghhrrghvvghssehnghhrrghvvghsrdhfrhdpnhgspghrtghpthhtohepuddprhgtphhtthhopeejfeekjeeiseguvggssghughhsrdhgnhhurdhorhhgpdfovfetjfhoshhtpehmohehjeehpdhmohguvgepshhmthhpohhuth DKIM-Signature: a=rsa-sha256; bh=InBe3WFPgqayB1/jDYjJi/YU/tQ+/2dZ4GXnzegxeOw=; c=relaxed/relaxed; d=ngraves.fr; h=From; s=ovhmo4487190-selector1; t=1729434120; v=1; b=0ynV9WnhRFTgUAFiAhV0k2dYeVVMLtMRARS2SizJXV372rDEidxQRq2Sqzo8itkePeFxnxEI 4BxaoRD+aM9o3/CeFbXWeDhcc/zuAmVaVyhCJ6L0KFg5F5F8sWY9VgD8LEn5pwo6cw90tEhooPV hut94BjqG6MVNIBQfKdS9MJxyWyBkzopuFGyX9b/DQw8OkGtd/0fJ66LKcbpHQ5tqKyC2zwxGmD fyABzxjJmho4oM5GCayObxWgUCoY0Ul7Uxh2DOSYi8HMJ8tW+HT66POpYHQTQD1cY/UyPBM6hFu mLa5H4TcdK5A1cW5QJMhH9Dwudd9WEHo0P5m/p9WFpB3Q== X-Spam-Score: 0.0 (/) X-BeenThere: debbugs-submit <at> debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: <debbugs-submit.debbugs.gnu.org> List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe> List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/> List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org> List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help> List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe> Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org> X-Spam-Score: -1.0 (-) * gnu/services/databases.scm (final-postgresql): Rewrite using a directory-union and rename to extend-postgresql. --- gnu/services/databases.scm | 31 +++++++++---------------------- 1 file changed, 9 insertions(+), 22 deletions(-) diff --git a/gnu/services/databases.scm b/gnu/services/databases.scm index fa332d7978..aed0f414ab 100644 --- a/gnu/services/databases.scm +++ b/gnu/services/databases.scm @@ -205,26 +205,13 @@ (define (create-postgresql-account config) (home-directory "/var/empty") (shell (file-append shadow "/sbin/nologin"))))))) -(define (final-postgresql postgresql extension-packages) - (if (null? extension-packages) - postgresql - (package - (inherit postgresql) - (source #f) - (build-system trivial-build-system) - (arguments - `(#:modules ((guix build utils) (guix build union)) - #:builder - (begin - (use-modules (guix build utils) (guix build union) (srfi srfi-26)) - (union-build (assoc-ref %outputs "out") - (map (lambda (input) (cdr input)) - %build-inputs)) - #t))) - (inputs - `(("postgresql" ,postgresql) - ,@(map (lambda (extension) (list "extension" extension)) - extension-packages)))))) +(define-public (extend-postgresql postgresql extensions) + (if (null? extensions) + postgresql + (let ((packages (cons* postgresql extensions))) + (directory-union + (string-join (map package-name packages) "+") + packages)))) (define postgresql-activation (match-lambda @@ -250,7 +237,7 @@ (define postgresql-activation (unless (file-exists? #$data-directory) (let ((initdb (string-append - #$(final-postgresql postgresql + #$(extend-postgresql postgresql extension-packages) "/bin/initdb")) (initdb-args @@ -297,7 +284,7 @@ (define postgresql-shepherd-service ((_ mode) (let ((user (getpwnam "postgres")) (pg_ctl #$(file-append - (final-postgresql postgresql + (extend-postgresql postgresql extension-packages) "/bin/pg_ctl")) (options (format #f "--config-file=~a -p ~d" -- 2.46.0
GNU bug tracking system
Copyright (C) 1999 Darren O. Benham,
1997 nCipher Corporation Ltd,
1994-97 Ian Jackson.