From patchwork Mon Oct 7 20:12:27 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nicolas Graves X-Patchwork-Id: 31808 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 48C3327BBE2; Mon, 7 Oct 2024 21:18:25 +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 DED2C27BBEA for ; Mon, 7 Oct 2024 21:18:24 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sxuBK-00011w-NT; Mon, 07 Oct 2024 16:18:14 -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 1sxuB1-0000qq-2x for guix-patches@gnu.org; Mon, 07 Oct 2024 16:17:55 -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 1sxuB0-0002Vq-Qt for guix-patches@gnu.org; Mon, 07 Oct 2024 16:17:54 -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:References:In-Reply-To:Date:From:To:Subject; bh=dXnehk0K/8bLe64vbRPShra9D5sIeot0lff2glKc7WQ=; b=KJQ+2d5duWlDS+rGE+u6UcuFJHP+nD+o08PPKdlkYPApKWZw5wB6wPYdWhncUstp5rls/bS9Hwv3uQ5SkcS7HuhDbhzmydDUu16nmUJwy8G0nvJTpmMP1jI6RpV8UQ7iFjKNVxFAEppNIXuR0MrrTT7nu4jmQAY93n7/cOJurpJ9YJM8i6mykuAgOLnOm+RhGSmEx/1QzRqez46JOSilKe4A3tX0ehUugtuEKMM4kUu+6J6c4TjNlERkVUGQyrFihMzGoE1yEyLjCeiBJHLKDh67Lito/I2PcYwz5Sb1/MLH2j05+yc8V3TQ36l8gAv6Lyj+CYOYmcyTvmiSrwvGrA==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1sxuB8-0001jb-EI for guix-patches@gnu.org; Mon, 07 Oct 2024 16:18:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#71327] [PATCH v2 1/7] gnu: libbytesize: Update to 2.10. Resent-From: Nicolas Graves Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 07 Oct 2024 20:18:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 71327 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 71327@debbugs.gnu.org Cc: iskarian@mgsn.dev, maxim.cournoyer@gmail.com Received: via spool by 71327-submit@debbugs.gnu.org id=B71327.17283322396525 (code B ref 71327); Mon, 07 Oct 2024 20:18:02 +0000 Received: (at 71327) by debbugs.gnu.org; 7 Oct 2024 20:17:19 +0000 Received: from localhost ([127.0.0.1]:48366 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sxuAR-0001hB-E7 for submit@debbugs.gnu.org; Mon, 07 Oct 2024 16:17:19 -0400 Received: from 1.mo560.mail-out.ovh.net ([46.105.63.121]:58235) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sxuAP-0001gq-Ni for 71327@debbugs.gnu.org; Mon, 07 Oct 2024 16:17:18 -0400 Received: from director4.ghost.mail-out.ovh.net (unknown [10.108.17.3]) by mo560.mail-out.ovh.net (Postfix) with ESMTP id 4XMr6C74hpz1f23 for <71327@debbugs.gnu.org>; Mon, 7 Oct 2024 20:17:07 +0000 (UTC) Received: from ghost-submission-55b549bf7b-gg5fb (unknown [10.110.118.183]) by director4.ghost.mail-out.ovh.net (Postfix) with ESMTPS id 833D71FE7E; Mon, 7 Oct 2024 20:17:07 +0000 (UTC) Received: from ngraves.fr ([37.59.142.110]) by ghost-submission-55b549bf7b-gg5fb with ESMTPSA id szdVBsNBBGfkCAAAXSYGQA (envelope-from ); Mon, 07 Oct 2024 20:17:07 +0000 Authentication-Results: garm.ovh; auth=pass (GARM-110S004aff16af9-243b-43aa-a415-d0cff74ba0d8, A12302D5D8CF0E033BA678025A323BF4FAD59D46) smtp.auth=ngraves@ngraves.fr X-OVh-ClientIp: 86.246.19.221 Date: Mon, 7 Oct 2024 22:12:27 +0200 Message-ID: <20241007201652.15133-2-ngraves@ngraves.fr> X-Mailer: git-send-email 2.46.0 In-Reply-To: <20241007201652.15133-1-ngraves@ngraves.fr> References: <20241007201652.15133-1-ngraves@ngraves.fr> MIME-Version: 1.0 X-Ovh-Tracer-Id: 4738631234559599313 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: 0 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgeeftddrvddvledgudeglecutefuodetggdotefrodftvfcurfhrohhfihhlvgemucfqggfjpdevjffgvefmvefgnecuuegrihhlohhuthemucehtddtnecunecujfgurhephffvvefufffkofgjfhgggfestdekredtredttdenucfhrhhomheppfhitgholhgrshcuifhrrghvvghsuceonhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrqeenucggtffrrghtthgvrhhnpeelffejteeutefhfeekfffffedvudekjeekgfeludeitdfhkeevhfeivdfhffeggeenucfkphepuddvjedrtddrtddruddpkeeirddvgeeirdduledrvddvuddpfeejrdehledrudegvddruddutdenucevlhhushhtvghrufhiiigvpedtnecurfgrrhgrmhepihhnvghtpeduvdejrddtrddtrddupdhmrghilhhfrhhomhepnhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrpdhnsggprhgtphhtthhopedupdhrtghpthhtohepjedufedvjeesuggvsggsuhhgshdrghhnuhdrohhrghdpoffvtefjohhsthepmhhoheeitddpmhhouggvpehsmhhtphhouhht DKIM-Signature: a=rsa-sha256; bh=dXnehk0K/8bLe64vbRPShra9D5sIeot0lff2glKc7WQ=; c=relaxed/relaxed; d=ngraves.fr; h=From; s=ovhmo4487190-selector1; t=1728332228; v=1; b=yzZR/vJw2AIolkXU8mpk026OrY0p8Q+zwkW7w4F9g3knnAAsw6bOfLjqQV80UiR/wYi5H0cT mNawyljV3jT40qyA5D/tP4t8IxQQK51VZdLyeKEz+3Qi876BQKDbv8ypoE8a1BY/RoS0xCbnmfu K/4+NkbNqkMuohBhRUtAIy1w3MvfUcWkv153/LYrhna0LGV+zj/Uk4Gc2WqqpBwtIKPxcad4Kbi /mCnHNo8P8cHN4wsOm4/mqpmqzqJToGPxdl1HiLRGEFhdr+IJiu2qMNjH+mzlOnH8DK/pW0E+8b vJgALTKAqiJ/CtCQYvpC5bdDiI4mNuMi22kcWgCYzFpXg== 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 From: Maxim Cournoyer * gnu/packages/c.scm (libbytesize): Update to 2.10. Change-Id: Id0640e9c118fcf3ced3f6c6aa145a0f15e4f07d8 --- gnu/packages/c.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/c.scm b/gnu/packages/c.scm index 7c93676f0c..9a9691a81a 100644 --- a/gnu/packages/c.scm +++ b/gnu/packages/c.scm @@ -436,7 +436,7 @@ (define-public aml (define-public libbytesize (package (name "libbytesize") - (version "2.6") + (version "2.10") (source (origin (method url-fetch) (uri (string-append @@ -444,7 +444,7 @@ (define-public libbytesize "download/" version "/libbytesize-" version ".tar.gz")) (sha256 (base32 - "0h87ryi0mp8msq43h1cna453cqaw5knx1xaggfzm4fxvn8sjpapg")))) + "1lfa02ac96p12xxq75ilx3qk7kym4xrlqyfh26axb7y5iazf670x")))) (build-system gnu-build-system) (arguments `(#:tests? #f)) From patchwork Mon Oct 7 20:12:28 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Nicolas Graves X-Patchwork-Id: 31810 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 A338627BBEA; Mon, 7 Oct 2024 21:18:45 +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 24FF227BBE2 for ; Mon, 7 Oct 2024 21:18:45 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sxuBL-00015a-95; Mon, 07 Oct 2024 16:18:15 -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 1sxuB1-0000sX-L9 for guix-patches@gnu.org; Mon, 07 Oct 2024 16:17:55 -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 1sxuB1-0002Vw-CK for guix-patches@gnu.org; Mon, 07 Oct 2024 16:17:55 -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:References:In-Reply-To:Date:From:To:Subject; bh=H1rZmWRd5J4XIY8AJdZrFIxbBHA1MgQelc9AaJOA2X4=; b=rkJYC+EblLWA9FVSyYrkT3LHLHftw2vktBZssNd/VhlZ6SRbfkFXnUqM04glDpzesJyQeTelUazGRyzMn7YdFYs4ZYWCMarPagA21VAw3FcofBubkdzwkc1n4Q8Bzz+C95Zcf20+pQdtbPg2n3EBUbICM+GtV6ClVXjR+adEmaJ7PbpkE7mk25ije0re/6KF8OIi/NoEXLVwULNazT2ZOwWr3D7i3oxpZFWhZWAJf2YOS5cIfcnyrrOdOQvyWucY3T0g9jLPuYJYRtivTdvbTEXpBdhfnYVp/LW9bYFOL48sejCZFyNa01kgFEGrLpYwPaDek56bmb1JVs8zD6FzMg==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1sxuB8-0001jj-VF for guix-patches@gnu.org; Mon, 07 Oct 2024 16:18:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#71327] [PATCH v2 2/7] gnu: libblockdev: Embed executable paths. Resent-From: Nicolas Graves Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 07 Oct 2024 20:18:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 71327 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 71327@debbugs.gnu.org Cc: iskarian@mgsn.dev, maxim.cournoyer@gmail.com Received: via spool by 71327-submit@debbugs.gnu.org id=B71327.17283322466549 (code B ref 71327); Mon, 07 Oct 2024 20:18:02 +0000 Received: (at 71327) by debbugs.gnu.org; 7 Oct 2024 20:17:26 +0000 Received: from localhost ([127.0.0.1]:48372 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sxuAX-0001hX-P2 for submit@debbugs.gnu.org; Mon, 07 Oct 2024 16:17:26 -0400 Received: from 9.mo576.mail-out.ovh.net ([46.105.56.78]:33585) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sxuAV-0001hN-IN for 71327@debbugs.gnu.org; Mon, 07 Oct 2024 16:17:24 -0400 Received: from director2.ghost.mail-out.ovh.net (unknown [10.108.2.78]) by mo576.mail-out.ovh.net (Postfix) with ESMTP id 4XMr6L35q4z1w87 for <71327@debbugs.gnu.org>; Mon, 7 Oct 2024 20:17:14 +0000 (UTC) Received: from ghost-submission-55b549bf7b-ddblc (unknown [10.111.182.244]) by director2.ghost.mail-out.ovh.net (Postfix) with ESMTPS id 7C84D1FD3A; Mon, 7 Oct 2024 20:17:13 +0000 (UTC) Received: from ngraves.fr ([37.59.142.97]) by ghost-submission-55b549bf7b-ddblc with ESMTPSA id +BAWBslBBGcVIAoAYVQw9Q (envelope-from ); Mon, 07 Oct 2024 20:17:13 +0000 Authentication-Results: garm.ovh; auth=pass (GARM-97G002f406af6e-d540-4949-aa88-af6b9a32b671, A12302D5D8CF0E033BA678025A323BF4FAD59D46) smtp.auth=ngraves@ngraves.fr X-OVh-ClientIp: 86.246.19.221 Date: Mon, 7 Oct 2024 22:12:28 +0200 Message-ID: <20241007201652.15133-3-ngraves@ngraves.fr> X-Mailer: git-send-email 2.46.0 In-Reply-To: <20241007201652.15133-1-ngraves@ngraves.fr> References: <20241007201652.15133-1-ngraves@ngraves.fr> MIME-Version: 1.0 X-Ovh-Tracer-Id: 4740601559927612113 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: 0 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgeeftddrvddvledgudegkecutefuodetggdotefrodftvfcurfhrohhfihhlvgemucfqggfjpdevjffgvefmvefgnecuuegrihhlohhuthemucehtddtnecunecujfgurhephffvvefufffkofgjfhggtgfgsehtkeertdertdejnecuhfhrohhmpefpihgtohhlrghsucfirhgrvhgvshcuoehnghhrrghvvghssehnghhrrghvvghsrdhfrheqnecuggftrfgrthhtvghrnhepudegleefkeehudegvdeiffelkeegffeihfekjeduleevueeuhfehveetgfehtdehnecuffhomhgrihhnpehgnhhurdhorhhgnecukfhppeduvdejrddtrddtrddupdekiedrvdegiedrudelrddvvddupdefjedrheelrddugedvrdeljeenucevlhhushhtvghrufhiiigvpedtnecurfgrrhgrmhepihhnvghtpeduvdejrddtrddtrddupdhmrghilhhfrhhomhepnhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrpdhnsggprhgtphhtthhopedupdhrtghpthhtohepjedufedvjeesuggvsggsuhhgshdrghhnuhdrohhrghdpoffvtefjohhsthepmhhoheejiedpmhhouggvpehsmhhtphhouhht DKIM-Signature: a=rsa-sha256; bh=H1rZmWRd5J4XIY8AJdZrFIxbBHA1MgQelc9AaJOA2X4=; c=relaxed/relaxed; d=ngraves.fr; h=From; s=ovhmo4487190-selector1; t=1728332234; v=1; b=acZbBcBCBwY1tqLU6LWCu7exAGHLHj2c6emMM2Df2ztSVb1hE5AgY4mfW0fzavbkb2PCZmp/ 6qvjuUQ5HHuXuLuh+2IqAeCNizEhznanup4zB5XL/3+mFzud8ggbe7FS2Q7bfycr1JvEh3fukAH WVcaLwg0NkkDevM07uJ71YEwk+Jwf16zA2AbHokHqxKaKty+IvYQYxw1t0Df95U4NnUCEnVUwxP La823YANCXhPSMCUbBfPk3A8WynqcxIOIZz8xImCbM6IHgxFBTiiCJDlqAqRKXfTaJtSu4A19rS tSQDq6ooqN0gs+TKLq7lOe3Tyf2wgCgQ3QQuwaKIDFEtw== 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 From: Sarah Morgensen * gnu/packages/disk.scm (libblockdev)[arguments]<#:phases>: Add 'patch-plugin-paths' phase. Fixes: . Signed-off-by: Maxim Cournoyer Change-Id: I96f9e2f03650b22ffef5a7fe091159450e4c5b67 --- gnu/packages/disk.scm | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/gnu/packages/disk.scm b/gnu/packages/disk.scm index 0f3bf10ffa..fa1b87127b 100644 --- a/gnu/packages/disk.scm +++ b/gnu/packages/disk.scm @@ -22,6 +22,7 @@ ;;; Copyright © 2021 Mathieu Othacehe ;;; Copyright © 2021 Brice Waegeneire ;;; Copyright © 2021 Justin Veilleux +;;; Copyright © 2021 Sarah Morgensen ;;; Copyright © 2014, 2022 Ludovic Courtès ;;; Copyright © 2022 Maxim Cournoyer ;;; Copyright © 2022 Disseminate Dissent @@ -29,6 +30,7 @@ ;;; Copyright © 2023 Morgan Smith ;;; Copyright © 2023 Zheng Junjie <873216071@qq.com> ;;; Copyright © 2024 Sharlatan Hellseher + ;;; ;;; This file is part of GNU Guix. ;;; @@ -1195,7 +1197,13 @@ (define-public libblockdev (lambda* (#:key outputs #:allow-other-keys) (let ((out (assoc-ref outputs "out"))) (substitute* "src/lib/blockdev.c" - (("/etc/libblockdev/conf.d/" path) (string-append out path))))))))) + (("/etc/libblockdev/conf.d/" path) (string-append out path)))))) + (add-after 'unpack 'patch-plugin-paths + (lambda* (#:key inputs #:allow-other-keys) + (substitute* (find-files "src/plugins" "\\.c$") + (("(gchar \\*arg.+\\{\")([^\"]+)" all start program) + ;; XXX: Use 'search-input-file' when available. + (string-append start (or (which program) program))))))))) (native-inputs (list gobject-introspection pkg-config From patchwork Mon Oct 7 20:12:29 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nicolas Graves X-Patchwork-Id: 31809 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 236E427BBEA; Mon, 7 Oct 2024 21:18:36 +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 D68AD27BBE2 for ; Mon, 7 Oct 2024 21:18:35 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sxuBL-00018k-Vp; Mon, 07 Oct 2024 16:18:16 -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 1sxuB2-0000tc-HZ for guix-patches@gnu.org; Mon, 07 Oct 2024 16:17:56 -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 1sxuB1-0002W4-Tq for guix-patches@gnu.org; Mon, 07 Oct 2024 16:17:56 -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:References:In-Reply-To:Date:From:To:Subject; bh=A6F5iSDEaobm/WJz8YJ9YETOE/LpCz4fZL+umAgDKJA=; b=n7GqjO2A+pp27QgKHHFTmlauO1vxn5iMhND9sa6MowlGA/g1G1G1kWOGjbhyApU4xzvhADSKiaCyyHHoKMB2E7UDY6NUu26E8H+ZdwZlM6golcM1jEpPURMXSqMoWzoRgH/L/U0uDNfN5G33qtNQj8HPfGRWCPZ5K4deMCK4J33JDFXJfhv2+lSfKkg0YSh3OdEbLYjR6Lyq25h7+IcWf9M8uouydGkau4GKpZ7FRhO2sGCoXUc3ql8E5iqWUPNdXfMAEx9LvA52Mg7KCdxUPq5nPdaQkNuxS0qATrrB+FTcMQzhwd8YRNr/Ydai2hmx8QDjdqfZHTHuzhHaWlhWdw==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1sxuB9-0001jq-Hj for guix-patches@gnu.org; Mon, 07 Oct 2024 16:18:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#71327] [PATCH v2 3/7] gnu: libblockdev: Fix inputs. Resent-From: Nicolas Graves Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 07 Oct 2024 20:18:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 71327 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 71327@debbugs.gnu.org Cc: iskarian@mgsn.dev, maxim.cournoyer@gmail.com Received: via spool by 71327-submit@debbugs.gnu.org id=B71327.17283322486568 (code B ref 71327); Mon, 07 Oct 2024 20:18:03 +0000 Received: (at 71327) by debbugs.gnu.org; 7 Oct 2024 20:17:28 +0000 Received: from localhost ([127.0.0.1]:48376 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sxuAa-0001hs-D1 for submit@debbugs.gnu.org; Mon, 07 Oct 2024 16:17:28 -0400 Received: from 10.mo583.mail-out.ovh.net ([46.105.52.148]:47049) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sxuAX-0001hQ-E5 for 71327@debbugs.gnu.org; Mon, 07 Oct 2024 16:17:26 -0400 Received: from director10.ghost.mail-out.ovh.net (unknown [10.109.148.34]) by mo583.mail-out.ovh.net (Postfix) with ESMTP id 4XMr6N321Vz1X1X for <71327@debbugs.gnu.org>; Mon, 7 Oct 2024 20:17:16 +0000 (UTC) Received: from ghost-submission-55b549bf7b-zd9hm (unknown [10.110.164.191]) by director10.ghost.mail-out.ovh.net (Postfix) with ESMTPS id 909451FD28; Mon, 7 Oct 2024 20:17:15 +0000 (UTC) Received: from ngraves.fr ([37.59.142.96]) by ghost-submission-55b549bf7b-zd9hm with ESMTPSA id oH7ZCMtBBGcoIR0ACvZv3Q (envelope-from ); Mon, 07 Oct 2024 20:17:15 +0000 Authentication-Results: garm.ovh; auth=pass (GARM-96R00195dabd84-c13f-4625-b9b9-dbbcbd1c40c1, A12302D5D8CF0E033BA678025A323BF4FAD59D46) smtp.auth=ngraves@ngraves.fr X-OVh-ClientIp: 86.246.19.221 Date: Mon, 7 Oct 2024 22:12:29 +0200 Message-ID: <20241007201652.15133-4-ngraves@ngraves.fr> X-Mailer: git-send-email 2.46.0 In-Reply-To: <20241007201652.15133-1-ngraves@ngraves.fr> References: <20241007201652.15133-1-ngraves@ngraves.fr> MIME-Version: 1.0 X-Ovh-Tracer-Id: 4741164510892778193 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: 0 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgeeftddrvddvledgudeglecutefuodetggdotefrodftvfcurfhrohhfihhlvgemucfqggfjpdevjffgvefmvefgnecuuegrihhlohhuthemucehtddtnecunecujfgurhephffvvefufffkofgjfhgggfestdekredtredttdenucfhrhhomheppfhitgholhgrshcuifhrrghvvghsuceonhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrqeenucggtffrrghtthgvrhhnpedvheelieffheetvdelhfffffejfefgudfhteekveehieetudeiudfgkeeutdehjeenucffohhmrghinhepghhithhhuhgsrdgtohhmnecukfhppeduvdejrddtrddtrddupdekiedrvdegiedrudelrddvvddupdefjedrheelrddugedvrdelieenucevlhhushhtvghrufhiiigvpedtnecurfgrrhgrmhepihhnvghtpeduvdejrddtrddtrddupdhmrghilhhfrhhomhepnhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrpdhnsggprhgtphhtthhopedupdhrtghpthhtohepjedufedvjeesuggvsggsuhhgshdrghhnuhdrohhrghdpoffvtefjohhsthepmhhoheekfedpmhhouggvpehsmhhtphhouhht DKIM-Signature: a=rsa-sha256; bh=A6F5iSDEaobm/WJz8YJ9YETOE/LpCz4fZL+umAgDKJA=; c=relaxed/relaxed; d=ngraves.fr; h=From; s=ovhmo4487190-selector1; t=1728332236; v=1; b=meX4e3NesTPCPYwJ1AUBlgF8XSMbLu7P5lra+ltMiYnDJ0lmo0ZgVJHkgjsf3dFEWx84xg9S 65+FnetEg4uBxZ0tmoms0LdWitKK/FnkgHT5b4VIuHmGBEp4NoQqqARqrMm1KKxUFxLvW1II5ft 3GKG1lk633jx2ss/tGYxsAjqDt6QijiWesmGS6LB115m4qDWYXUf+Qmy0KcCatG8zig4z6HQE2O lI+HRXLArCjWArLLHSfsg5ozAL2jUZ1P6z2jqphA+JQZ3ExFFPZvtRMKh3CpO8ZlGW2KfhZ+6eE cFpcORgG1ZVWhEQy83H6jiQWS6PuQOPz1lwaWF5u1JCbQ== 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 From: Sarah Morgensen Add missing inputs; make util-linux a regular input since libblockdev retains references to it. * gnu/packages/disk.scm (libblockdev): [native-inputs]: Move util-linux... [inputs]: ... here. Add bcache-tools, e2fsprogs, gptfdisk, multipath-tools, and ntfs-3g. --- gnu/packages/disk.scm | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/gnu/packages/disk.scm b/gnu/packages/disk.scm index fa1b87127b..7197af0d99 100644 --- a/gnu/packages/disk.scm +++ b/gnu/packages/disk.scm @@ -1207,24 +1207,29 @@ (define-public libblockdev (native-inputs (list gobject-introspection pkg-config - python-wrapper - util-linux)) + python-wrapper)) (inputs (append (cons cryptsetup (libcryptsetup-propagated-inputs)) - (list btrfs-progs + (list bcache-tools + btrfs-progs dosfstools dmraid + e2fsprogs eudev glib + gptfdisk kmod libbytesize libyaml lvm2 mdadm + multipath-tools ndctl nss + ntfs-3g parted + util-linux volume-key xfsprogs))) (home-page "https://github.com/storaged-project/libblockdev") From patchwork Mon Oct 7 20:12:30 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nicolas Graves X-Patchwork-Id: 31813 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 9BE4527BBEA; Mon, 7 Oct 2024 21:18:51 +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 5DEA427BBE2 for ; Mon, 7 Oct 2024 21:18:51 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sxuBN-0001Le-VI; Mon, 07 Oct 2024 16:18:18 -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 1sxuB2-0000tk-LL for guix-patches@gnu.org; Mon, 07 Oct 2024 16:17:56 -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 1sxuB2-0002W8-D6 for guix-patches@gnu.org; Mon, 07 Oct 2024 16:17:56 -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:References:In-Reply-To:Date:From:To:Subject; bh=84iqfRvV4K42o6U7peUWrvfI4Abl1mz8Aj856cUCvYc=; b=Y1OC3b5RyJIUa8ALsK6tgSTaciSOQPDHDXH7uE0wAHnAdp2s/3V0T+ksXy42KH8+fk/rHJoDbLbLIAqBfoHHk9jrfb+2b+fr14WtVH2zmAXOJHAv6qDBWyar33Q/ADFJX7rQIKNP+FRU4tgH7rvQ5XxTaZ8x4+G0b+rlfnuNl8RtmL9cmlw9Mh78famkewfSKBtPyv2X9OOmGp4/YO1148n8NHgJ9wX1yotX5ap7E+gZGmPbUZ1swAwua5CSdue53ZyDp0s/+1mWBnR5Wn8Y6BXNJwqEOUaE/5dSiPdLMPUsmcbnyXRMWoEFl5/nQjkHUwWLsxry6Z5g+k9wrh+IGg==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1sxuBA-0001jy-0I for guix-patches@gnu.org; Mon, 07 Oct 2024 16:18:04 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#71327] [PATCH v2 4/7] gnu: libblockdev: Update to 3.1.1. Resent-From: Nicolas Graves Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 07 Oct 2024 20:18:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 71327 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 71327@debbugs.gnu.org Cc: iskarian@mgsn.dev, maxim.cournoyer@gmail.com Received: via spool by 71327-submit@debbugs.gnu.org id=B71327.17283322516579 (code B ref 71327); Mon, 07 Oct 2024 20:18:03 +0000 Received: (at 71327) by debbugs.gnu.org; 7 Oct 2024 20:17:31 +0000 Received: from localhost ([127.0.0.1]:48380 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sxuAc-0001i3-O5 for submit@debbugs.gnu.org; Mon, 07 Oct 2024 16:17:31 -0400 Received: from 19.mo583.mail-out.ovh.net ([46.105.35.78]:46649) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sxuAY-0001hZ-W5 for 71327@debbugs.gnu.org; Mon, 07 Oct 2024 16:17:27 -0400 Received: from director3.ghost.mail-out.ovh.net (unknown [10.108.9.73]) by mo583.mail-out.ovh.net (Postfix) with ESMTP id 4XMr6Q1KM5z1X20 for <71327@debbugs.gnu.org>; Mon, 7 Oct 2024 20:17:18 +0000 (UTC) Received: from ghost-submission-55b549bf7b-v7vv8 (unknown [10.110.118.5]) by director3.ghost.mail-out.ovh.net (Postfix) with ESMTPS id CB34F1FE50; Mon, 7 Oct 2024 20:17:17 +0000 (UTC) Received: from ngraves.fr ([37.59.142.99]) by ghost-submission-55b549bf7b-v7vv8 with ESMTPSA id sKf5Fs1BBGc6CQAAKTLe9Q (envelope-from ); Mon, 07 Oct 2024 20:17:17 +0000 Authentication-Results: garm.ovh; auth=pass (GARM-99G0034219a27f-d255-4eda-9552-d8487d63f548, A12302D5D8CF0E033BA678025A323BF4FAD59D46) smtp.auth=ngraves@ngraves.fr X-OVh-ClientIp: 86.246.19.221 Date: Mon, 7 Oct 2024 22:12:30 +0200 Message-ID: <20241007201652.15133-5-ngraves@ngraves.fr> X-Mailer: git-send-email 2.46.0 In-Reply-To: <20241007201652.15133-1-ngraves@ngraves.fr> References: <20241007201652.15133-1-ngraves@ngraves.fr> MIME-Version: 1.0 X-Ovh-Tracer-Id: 4741727458121147089 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: 0 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgeeftddrvddvledgudeglecutefuodetggdotefrodftvfcurfhrohhfihhlvgemucfqggfjpdevjffgvefmvefgnecuuegrihhlohhuthemucehtddtnecunecujfgurhephffvvefufffkofgjfhgggfestdekredtredttdenucfhrhhomheppfhitgholhgrshcuifhrrghvvghsuceonhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrqeenucggtffrrghtthgvrhhnpedvheelieffheetvdelhfffffejfefgudfhteekveehieetudeiudfgkeeutdehjeenucffohhmrghinhepghhithhhuhgsrdgtohhmnecukfhppeduvdejrddtrddtrddupdekiedrvdegiedrudelrddvvddupdefjedrheelrddugedvrdelleenucevlhhushhtvghrufhiiigvpedunecurfgrrhgrmhepihhnvghtpeduvdejrddtrddtrddupdhmrghilhhfrhhomhepnhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrpdhnsggprhgtphhtthhopedupdhrtghpthhtohepjedufedvjeesuggvsggsuhhgshdrghhnuhdrohhrghdpoffvtefjohhsthepmhhoheekfedpmhhouggvpehsmhhtphhouhht DKIM-Signature: a=rsa-sha256; bh=84iqfRvV4K42o6U7peUWrvfI4Abl1mz8Aj856cUCvYc=; c=relaxed/relaxed; d=ngraves.fr; h=From; s=ovhmo4487190-selector1; t=1728332238; v=1; b=qZFJhJTFpXiQgirqDmArFKbnYYJcZGRzXm6R+Bexaq0essZ8ShCpyAuUVJi65WWvZypkoDwW cfsaBOqNgksPPB6R+gm567Pt2H3uY85xWj1m+OBRReza6MKQZbvwQGmkMZq0rC8mlZ4CiMrhkX/ LioDRwNR8OmQFlZAGusLHGGAPCnEuneNFlS5hlbe5gBvCEWFKIp+aHw1TtHNJdqCkmutrY5VgwB MBkSeM+kpCWubc8N7Mk8wxW10FIHN/EDG+bM8EMuDZLyS4/8L5piXxpmunjDg1xH2qmhQfwlyao /kbcoauWJ/ZTL2qoXSwrin65N/z44bTZ/7IYt02TbLm8g== 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 From: Sarah Morgensen * gnu/packages/disk.scm (libblockdev): Update to 3.1.1. [inputs]: Add keyutils and libnvme. --- gnu/packages/disk.scm | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/gnu/packages/disk.scm b/gnu/packages/disk.scm index 7197af0d99..1278eb2aca 100644 --- a/gnu/packages/disk.scm +++ b/gnu/packages/disk.scm @@ -1180,7 +1180,7 @@ (define-public dmraid (define-public libblockdev (package (name "libblockdev") - (version "2.28") + (version "3.1.1") (source (origin (method url-fetch) (uri (string-append "https://github.com/storaged-project/" @@ -1188,7 +1188,7 @@ (define-public libblockdev version "-1/libblockdev-" version ".tar.gz")) (sha256 (base32 - "1x3xbgd2dyjhcqvyalpnrp727xidfxmaxgyyvv5gwx4aw90wijc2")))) + "1ny2glwmb5dcdv2x0giinbyma9fhk59z8117k1kr15pm7yjk7jx5")))) (build-system gnu-build-system) (arguments `(#:phases @@ -1219,8 +1219,10 @@ (define-public libblockdev eudev glib gptfdisk + keyutils kmod libbytesize + libnvme libyaml lvm2 mdadm From patchwork Mon Oct 7 20:12:31 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nicolas Graves X-Patchwork-Id: 31812 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 3985327BBE2; Mon, 7 Oct 2024 21:18:50 +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 4170127BBE9 for ; Mon, 7 Oct 2024 21:18:49 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sxuBN-0001Fp-Fx; Mon, 07 Oct 2024 16:18:17 -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 1sxuB3-0000u5-5p for guix-patches@gnu.org; Mon, 07 Oct 2024 16:17:57 -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 1sxuB2-0002WG-T9 for guix-patches@gnu.org; Mon, 07 Oct 2024 16:17:56 -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:References:In-Reply-To:Date:From:To:Subject; bh=avW/Wa9y0v6xUdBCgVlkJOETSKKTx7LqMYiBf2tr5p0=; b=uOu4B43FrPlVeRdaG+1YwJ2Ctzpjy2NLtSH9CqAiV430aJHHBW7mp5QLFJJNbwhf0XHmk/EHe1OLHkJ+ACcJhriPQdCugLhmvJCVH95udgHq0OQhzZO+zLItUnlOYY/7AMrzN2Hlg15kQyLig6j9IQPqdp6m32ZDComooY1hcgv8xJiwwoK2NjjZKFP7YcXEehocxNFI3Y8e6MlN+YDwSTm9IadqPZCjHGwlV/nhao+6kv9gZDrPzmnsL/l4uHk6KvrDaoh71cj505AbWA2gFmyiwORj238PiXIBeRi5ulX4eyMEqUnPJ+IEWeO0yiwWnbH3vF7U05ABo7Vu6bhv+w==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1sxuBA-0001k5-GI for guix-patches@gnu.org; Mon, 07 Oct 2024 16:18:04 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#71327] [PATCH v2 5/7] gnu: libblockdev: Use gexps. Resent-From: Nicolas Graves Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 07 Oct 2024 20:18:04 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 71327 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 71327@debbugs.gnu.org Cc: iskarian@mgsn.dev, maxim.cournoyer@gmail.com Received: via spool by 71327-submit@debbugs.gnu.org id=B71327.17283322536601 (code B ref 71327); Mon, 07 Oct 2024 20:18:04 +0000 Received: (at 71327) by debbugs.gnu.org; 7 Oct 2024 20:17:33 +0000 Received: from localhost ([127.0.0.1]:48386 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sxuAf-0001iN-4A for submit@debbugs.gnu.org; Mon, 07 Oct 2024 16:17:33 -0400 Received: from 3.mo550.mail-out.ovh.net ([46.105.60.232]:54345) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sxuAb-0001hz-Ql for 71327@debbugs.gnu.org; Mon, 07 Oct 2024 16:17:31 -0400 Received: from director8.ghost.mail-out.ovh.net (unknown [10.108.25.152]) by mo550.mail-out.ovh.net (Postfix) with ESMTP id 4XMr6S5zS0z1WkT for <71327@debbugs.gnu.org>; Mon, 7 Oct 2024 20:17:20 +0000 (UTC) Received: from ghost-submission-55b549bf7b-crf8t (unknown [10.108.54.32]) by director8.ghost.mail-out.ovh.net (Postfix) with ESMTPS id C89BE1FD1D; Mon, 7 Oct 2024 20:17:19 +0000 (UTC) Received: from ngraves.fr ([37.59.142.100]) by ghost-submission-55b549bf7b-crf8t with ESMTPSA id 3HGDGM9BBGdVdQUAx9YrFw (envelope-from ); Mon, 07 Oct 2024 20:17:19 +0000 Authentication-Results: garm.ovh; auth=pass (GARM-100R0032c623ef8-488e-4a94-bf63-dc84caf6bc8e, A12302D5D8CF0E033BA678025A323BF4FAD59D46) smtp.auth=ngraves@ngraves.fr X-OVh-ClientIp: 86.246.19.221 Date: Mon, 7 Oct 2024 22:12:31 +0200 Message-ID: <20241007201652.15133-6-ngraves@ngraves.fr> X-Mailer: git-send-email 2.46.0 In-Reply-To: <20241007201652.15133-1-ngraves@ngraves.fr> References: <20241007201652.15133-1-ngraves@ngraves.fr> MIME-Version: 1.0 X-Ovh-Tracer-Id: 4742290408007328465 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: 0 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgeeftddrvddvledgudeglecutefuodetggdotefrodftvfcurfhrohhfihhlvgemucfqggfjpdevjffgvefmvefgnecuuegrihhlohhuthemucehtddtnecunecujfgurhephffvvefufffkofgjfhgggfestdekredtredttdenucfhrhhomheppfhitgholhgrshcuifhrrghvvghsuceonhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrqeenucggtffrrghtthgvrhhnpeelffejteeutefhfeekfffffedvudekjeekgfeludeitdfhkeevhfeivdfhffeggeenucfkphepuddvjedrtddrtddruddpkeeirddvgeeirdduledrvddvuddpfeejrdehledrudegvddruddttdenucevlhhushhtvghrufhiiigvpedtnecurfgrrhgrmhepihhnvghtpeduvdejrddtrddtrddupdhmrghilhhfrhhomhepnhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrpdhnsggprhgtphhtthhopedupdhrtghpthhtohepjedufedvjeesuggvsggsuhhgshdrghhnuhdrohhrghdpoffvtefjohhsthepmhhoheehtddpmhhouggvpehsmhhtphhouhht DKIM-Signature: a=rsa-sha256; bh=avW/Wa9y0v6xUdBCgVlkJOETSKKTx7LqMYiBf2tr5p0=; c=relaxed/relaxed; d=ngraves.fr; h=From; s=ovhmo4487190-selector1; t=1728332240; v=1; b=XR80VAQP3VKqlAJ5tzN7B3FxrYDlaELTQQogGcY8GLPf4LogYLi34VGMlq1qfXQ9Ku86H4Zn WJxUaRrNGYTZQtzgyD6vgUQRK9JYym7aukZif2INYHOPKYXQueJ1MHO+DqNnSXnWeB8oZ344Fwg MxoP213X6Gbku+NVijjzUHfMYQSGZOqVaq4jxWeOLB/bnsfO7dE4OpiR1JFrmSI7uTKP0FDyxTf Mzle1P+/iTQQhxdxyBxow5r41CgdY805KXlCp79gxCw3EisN3+Qt7w6d4TdZcnmWy3yyf1IzUFI kwiY9U0PvO/zcufF5TDwJHBDd4A8RNniSriz69ofdBw+w== 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 From: Maxim Cournoyer * gnu/packages/disk.scm (libblockdev) [phases]: Use gexps. {patch-plugin-paths}: Use search-input-file. Change-Id: I61f9b3dfdd4dc249fb0f59abb99826a8e759bb42 --- gnu/packages/disk.scm | 31 +++++++++++++++++++------------ 1 file changed, 19 insertions(+), 12 deletions(-) diff --git a/gnu/packages/disk.scm b/gnu/packages/disk.scm index 1278eb2aca..e9b21763e1 100644 --- a/gnu/packages/disk.scm +++ b/gnu/packages/disk.scm @@ -1191,19 +1191,26 @@ (define-public libblockdev "1ny2glwmb5dcdv2x0giinbyma9fhk59z8117k1kr15pm7yjk7jx5")))) (build-system gnu-build-system) (arguments - `(#:phases - (modify-phases %standard-phases - (add-after 'unpack 'patch-configuration-directory - (lambda* (#:key outputs #:allow-other-keys) - (let ((out (assoc-ref outputs "out"))) + (list + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'patch-configuration-directory + (lambda _ (substitute* "src/lib/blockdev.c" - (("/etc/libblockdev/conf.d/" path) (string-append out path)))))) - (add-after 'unpack 'patch-plugin-paths - (lambda* (#:key inputs #:allow-other-keys) - (substitute* (find-files "src/plugins" "\\.c$") - (("(gchar \\*arg.+\\{\")([^\"]+)" all start program) - ;; XXX: Use 'search-input-file' when available. - (string-append start (or (which program) program))))))))) + (("/etc/libblockdev/conf.d/" path) + (string-append #$output path))))) + (add-after 'unpack 'patch-plugin-paths + (lambda* (#:key inputs #:allow-other-keys) + (substitute* (find-files "src/plugins" "\\.c$") + (("(gchar \\*arg.+\\{\")([^\"]+)" all start program) + (string-append + start (or (false-if-exception + (search-input-file inputs + (string-append "bin/" program))) + (false-if-exception + (search-input-file inputs + (string-append "sbin/" program))) + program))))))))) (native-inputs (list gobject-introspection pkg-config From patchwork Mon Oct 7 20:12:32 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nicolas Graves X-Patchwork-Id: 31807 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 6951B27BBEA; Mon, 7 Oct 2024 21:18:23 +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 AA25927BBE2 for ; Mon, 7 Oct 2024 21:18:22 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sxuBJ-00011c-OX; Mon, 07 Oct 2024 16:18:14 -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 1sxuB3-0000uQ-Lp for guix-patches@gnu.org; Mon, 07 Oct 2024 16:17:57 -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 1sxuB3-0002WN-DM for guix-patches@gnu.org; Mon, 07 Oct 2024 16:17:57 -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:References:In-Reply-To:Date:From:To:Subject; bh=fMJkQNvGI4b3lmwbYZBtDCM5JyV9fMG9sllUPuRxZYk=; b=LGQNDRjbWjeHr2uHoglshdp+tglQZsO4uaqrbzZgAmifZFVOZm8OoEaZbAIc51LGaK+B78PPFal9rsc4gp2wnahr11IbTrLXzxcOR08UkjtTSJCbDi7Avn2fI8G54YH3e6f2S1moSnP0/Kfjx1R4wNGfTJwNw0N2WJFXLLZxwUDbdt0nythp4R2V52/KApwlkdxvnqrf2uKKwsLUzpUiudxOBlHVXahTE/5mz8+POammgXX4DIJjfToGGqbk1aDfUu6XLkuZnWDW6IYruZ8iEYBD98erv1rLoq6NNKvXm/UY4lk9COqLo4sAFSNhGwFhRBCIqekHj+W9C21nEH00Ig==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1sxuBB-0001kD-13 for guix-patches@gnu.org; Mon, 07 Oct 2024 16:18:05 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#71327] [PATCH v2 6/7] gnu: udisks: Update to 2.10.1. Resent-From: Nicolas Graves Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 07 Oct 2024 20:18:04 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 71327 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 71327@debbugs.gnu.org Cc: iskarian@mgsn.dev, maxim.cournoyer@gmail.com Received: via spool by 71327-submit@debbugs.gnu.org id=B71327.17283322546613 (code B ref 71327); Mon, 07 Oct 2024 20:18:04 +0000 Received: (at 71327) by debbugs.gnu.org; 7 Oct 2024 20:17:34 +0000 Received: from localhost ([127.0.0.1]:48388 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sxuAf-0001iP-G8 for submit@debbugs.gnu.org; Mon, 07 Oct 2024 16:17:33 -0400 Received: from 6.mo550.mail-out.ovh.net ([46.105.43.205]:33413) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sxuAd-0001i1-7u for 71327@debbugs.gnu.org; Mon, 07 Oct 2024 16:17:32 -0400 Received: from director8.ghost.mail-out.ovh.net (unknown [10.108.25.152]) by mo550.mail-out.ovh.net (Postfix) with ESMTP id 4XMr6T6trQz1WvM for <71327@debbugs.gnu.org>; Mon, 7 Oct 2024 20:17:21 +0000 (UTC) Received: from ghost-submission-55b549bf7b-sprm4 (unknown [10.111.182.238]) by director8.ghost.mail-out.ovh.net (Postfix) with ESMTPS id A6E451FD1D; Mon, 7 Oct 2024 20:17:21 +0000 (UTC) Received: from ngraves.fr ([37.59.142.99]) by ghost-submission-55b549bf7b-sprm4 with ESMTPSA id 9u+IF9FBBGfKpgEA/lLO5Q (envelope-from ); Mon, 07 Oct 2024 20:17:21 +0000 Authentication-Results: garm.ovh; auth=pass (GARM-99G00311d2fabf-44e5-4ae5-92c6-bef8103635a6, A12302D5D8CF0E033BA678025A323BF4FAD59D46) smtp.auth=ngraves@ngraves.fr X-OVh-ClientIp: 86.246.19.221 Date: Mon, 7 Oct 2024 22:12:32 +0200 Message-ID: <20241007201652.15133-7-ngraves@ngraves.fr> X-Mailer: git-send-email 2.46.0 In-Reply-To: <20241007201652.15133-1-ngraves@ngraves.fr> References: <20241007201652.15133-1-ngraves@ngraves.fr> MIME-Version: 1.0 X-Ovh-Tracer-Id: 4742571886667162321 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: 0 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgeeftddrvddvledgudeglecutefuodetggdotefrodftvfcurfhrohhfihhlvgemucfqggfjpdevjffgvefmvefgnecuuegrihhlohhuthemucehtddtnecunecujfgurhephffvvefufffkofgjfhgggfestdekredtredttdenucfhrhhomheppfhitgholhgrshcuifhrrghvvghsuceonhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrqeenucggtffrrghtthgvrhhnpeelffejteeutefhfeekfffffedvudekjeekgfeludeitdfhkeevhfeivdfhffeggeenucfkphepuddvjedrtddrtddruddpkeeirddvgeeirdduledrvddvuddpfeejrdehledrudegvddrleelnecuvehluhhsthgvrhfuihiivgeptdenucfrrghrrghmpehinhgvthepuddvjedrtddrtddruddpmhgrihhlfhhrohhmpehnghhrrghvvghssehnghhrrghvvghsrdhfrhdpnhgspghrtghpthhtohepuddprhgtphhtthhopeejudefvdejseguvggssghughhsrdhgnhhurdhorhhgpdfovfetjfhoshhtpehmohehhedtpdhmohguvgepshhmthhpohhuth DKIM-Signature: a=rsa-sha256; bh=fMJkQNvGI4b3lmwbYZBtDCM5JyV9fMG9sllUPuRxZYk=; c=relaxed/relaxed; d=ngraves.fr; h=From; s=ovhmo4487190-selector1; t=1728332242; v=1; b=xopPsI1scnxDVlBWAWTrd2skXUqIlxSGYBEA+CKPxqQzJwT/vb9Jd6sy7L12kWStiFFv2ZcU mwGvcywiEzFfGyt+pYrslTowtLwf94i4nbmQ8jpIYDxR8ndAEXEFAUL7zyVX1yfCV9eSfa55Zkk PISjOMEEL2Mp+0jFzudYwBNP+bsHG/ntZJmVCmo0cChNga/Wg6M2WXwHaTxPEx1pKa7FDkAh5vm EpkEk7+6e8dVIf+vX3YwwHMrykXYNPUcrdNZUoF84pVdaDQ8w7y2sm26nbvx4xqRrAXmZ6VV3f8 1M4uxMjHTPHiO7ms1uG/Mn+b2LIz29p+86txb2p/9TJvA== 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 From: Maxim Cournoyer * gnu/packages/freedesktop.scm (udisks): Update to 2.10.1. [native-inputs]: Replace intltool with gettext-minimal. Remove gnome-common. Change-Id: I4fbc4f6949eb14763dad58dbccd9974793ea02f6 --- gnu/packages/freedesktop.scm | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/gnu/packages/freedesktop.scm b/gnu/packages/freedesktop.scm index 6760cddb3e..14c0482496 100644 --- a/gnu/packages/freedesktop.scm +++ b/gnu/packages/freedesktop.scm @@ -1750,7 +1750,7 @@ (define-public libatasmart (define-public udisks (package (name "udisks") - (version "2.8.4") + (version "2.10.1") (source (origin (method url-fetch) (uri (string-append @@ -1758,16 +1758,15 @@ (define-public udisks version "/udisks-" version ".tar.bz2")) (sha256 (base32 - "06cq52kp1nyy15qzylywy9s7hhhqc45k0s3y68crf0zsmjyng0yj")))) + "1klf5pcr9yg8g88mwwh3q2j0idfwd8hfr2q6nknhsm02yv638mxp")))) (build-system gnu-build-system) (native-inputs (list docbook-xml-4.3 ; to build the manpages docbook-xsl + gettext-minimal `(,glib "bin") ; for glib-mkenums - gnome-common ; TODO: Why is this needed? gobject-introspection gtk-doc/stable - intltool pkg-config libxslt)) (propagated-inputs From patchwork Mon Oct 7 20:12:33 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nicolas Graves X-Patchwork-Id: 31811 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 CAFF127BBEC; Mon, 7 Oct 2024 21:18:49 +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 3B23D27BBE2 for ; Mon, 7 Oct 2024 21:18:49 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sxuBO-0001OS-B3; Mon, 07 Oct 2024 16:18:18 -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 1sxuB4-0000vX-Q6 for guix-patches@gnu.org; Mon, 07 Oct 2024 16:18:03 -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 1sxuB3-0002WU-US for guix-patches@gnu.org; Mon, 07 Oct 2024 16:17:58 -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:References:In-Reply-To:Date:From:To:Subject; bh=PdTYNl66wpW3/Wi0GMUWBzvhLuli7zi8r6aOEDcekYQ=; b=MiK+mj7rEFbW1pvYd8E2GLr12AxMH6qvlxg27lCoU6RJsy3iqDUgasXA9xo4RanKmsMbRybPyTOJ7eyC7a9x5W7QCi2jEoo2SbhuojN15CNjF5/n9PUeGOtNuDmtRfR9ggaKA25AC9smpLGNjkoRWmTXtMqdqtVr2ksKlAfSUS8xzcIsLa1mduNNHpUPeKzT4moo67+0GfkCev8tTnQ2OG1gWjXOqgo6+83fPmdzzkO00Qfw5dhmviy8T+jBd8UMsDs3tzkEplfVOdj3XftyDUqJ+pgcIi/qdJxuWpRX+SwZ5993VuVeYe3iTuhqFl9MdBZV55eM/8cCZYmMKKIKBw==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1sxuBB-0001kK-I1 for guix-patches@gnu.org; Mon, 07 Oct 2024 16:18:05 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#71327] [PATCH v2 7/7] gnu: udisks: Remove obsolete wrap-udisksd phase. Resent-From: Nicolas Graves Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 07 Oct 2024 20:18:05 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 71327 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 71327@debbugs.gnu.org Cc: iskarian@mgsn.dev, maxim.cournoyer@gmail.com Received: via spool by 71327-submit@debbugs.gnu.org id=B71327.17283322566625 (code B ref 71327); Mon, 07 Oct 2024 20:18:05 +0000 Received: (at 71327) by debbugs.gnu.org; 7 Oct 2024 20:17:36 +0000 Received: from localhost ([127.0.0.1]:48390 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sxuAi-0001in-2G for submit@debbugs.gnu.org; Mon, 07 Oct 2024 16:17:36 -0400 Received: from 3.mo582.mail-out.ovh.net ([178.33.253.26]:56517) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sxuAe-0001iG-Ic for 71327@debbugs.gnu.org; Mon, 07 Oct 2024 16:17:33 -0400 Received: from director10.ghost.mail-out.ovh.net (unknown [10.108.17.95]) by mo582.mail-out.ovh.net (Postfix) with ESMTP id 4XMr6W3t99z16V2 for <71327@debbugs.gnu.org>; Mon, 7 Oct 2024 20:17:23 +0000 (UTC) Received: from ghost-submission-55b549bf7b-knkw8 (unknown [10.110.188.168]) by director10.ghost.mail-out.ovh.net (Postfix) with ESMTPS id 5067A1FD28; Mon, 7 Oct 2024 20:17:23 +0000 (UTC) Received: from ngraves.fr ([37.59.142.101]) by ghost-submission-55b549bf7b-knkw8 with ESMTPSA id 3f0hDdNBBGeQHwIAGH7rUA (envelope-from ); Mon, 07 Oct 2024 20:17:23 +0000 Authentication-Results: garm.ovh; auth=pass (GARM-101G0049ece0307-cb74-4cc4-a7c1-360bb7614f1d, A12302D5D8CF0E033BA678025A323BF4FAD59D46) smtp.auth=ngraves@ngraves.fr X-OVh-ClientIp: 86.246.19.221 Date: Mon, 7 Oct 2024 22:12:33 +0200 Message-ID: <20241007201652.15133-8-ngraves@ngraves.fr> X-Mailer: git-send-email 2.46.0 In-Reply-To: <20241007201652.15133-1-ngraves@ngraves.fr> References: <20241007201652.15133-1-ngraves@ngraves.fr> MIME-Version: 1.0 X-Ovh-Tracer-Id: 4743134835310256849 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: 0 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgeeftddrvddvledgudeglecutefuodetggdotefrodftvfcurfhrohhfihhlvgemucfqggfjpdevjffgvefmvefgnecuuegrihhlohhuthemucehtddtnecunecujfgurhephffvvefufffkofgjfhgggfestdekredtredttdenucfhrhhomheppfhitgholhgrshcuifhrrghvvghsuceonhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrqeenucggtffrrghtthgvrhhnpeelgeevuefhudekgefhleehudfgfeekvdfgffejffekkefggeehveeluedtudelueenucffohhmrghinhepfhhrvggvuggvshhkthhophdrohhrghenucfkphepuddvjedrtddrtddruddpkeeirddvgeeirdduledrvddvuddpfeejrdehledrudegvddruddtudenucevlhhushhtvghrufhiiigvpedtnecurfgrrhgrmhepihhnvghtpeduvdejrddtrddtrddupdhmrghilhhfrhhomhepnhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrpdhnsggprhgtphhtthhopedupdhrtghpthhtohepjedufedvjeesuggvsggsuhhgshdrghhnuhdrohhrghdpoffvtefjohhsthepmhhoheekvddpmhhouggvpehsmhhtphhouhht DKIM-Signature: a=rsa-sha256; bh=PdTYNl66wpW3/Wi0GMUWBzvhLuli7zi8r6aOEDcekYQ=; c=relaxed/relaxed; d=ngraves.fr; h=From; s=ovhmo4487190-selector1; t=1728332243; v=1; b=189IIuCjyC/xwDXkDBw5T9D1a4muqeGFts3pZe5jjQ6OsypuYkINrk14ZxaY3/JuCOUiimNi L9DUDHn/of7DY8EKGmel2PYMmHPQ05HkTy1jpi2fh4qzQFag6CXiYhVq0Oe6r5LmW7AV5qiOz6C CJ9gzkyNQDrUf78aOF2Verf2kB+HtkqGyUsxL/3/OXdfM4R5726XfRDJj5OzBugr6mhi9N0stwr DKCYJ35buOHIJ081CZgv+m4dcswPxV8tdZklkQYZBbYbU1dTamcwNVAQ0D8enOQiVyX6mJRqbBM +21q18oNvi8XTnp+KDpF9w5849EDSJJ0cXVb3nNiLyYMg== 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 From: Maxim Cournoyer The tools are now patched in the libblockdev plugin sources directly. * gnu/packages/freedesktop.scm (udisks) [phases]: Delete the wrap-udisksd phase. --- gnu/packages/freedesktop.scm | 16 +--------------- 1 file changed, 1 insertion(+), 15 deletions(-) diff --git a/gnu/packages/freedesktop.scm b/gnu/packages/freedesktop.scm index 14c0482496..0ab0bb5104 100644 --- a/gnu/packages/freedesktop.scm +++ b/gnu/packages/freedesktop.scm @@ -1804,21 +1804,7 @@ (define-public udisks (("girdir = .*") "girdir = $(datadir)/gir-1.0\n") (("typelibsdir = .*") - "typelibsdir = $(libdir)/girepository-1.0\n")))) - (add-after 'install 'wrap-udisksd - (lambda _ - ;; Tell 'udisksd' where to find the 'mount' command. - (let ((utils #$(this-package-input "util-linux")) - (cryptsetup #$(this-package-input "cryptsetup")) - (parted #$(this-package-input "parted"))) - (wrap-program (string-append #$output "/libexec/udisks2/udisksd") - `("PATH" ":" prefix - (,(string-append utils "/bin") ;for 'mount' - ;; cryptsetup is required for setting encrypted - ;; partitions, e.g. in gnome-disks - ,(string-append cryptsetup "/sbin") - "/run/current-system/profile/bin" - "/run/current-system/profile/sbin"))))))))) + "typelibsdir = $(libdir)/girepository-1.0\n"))))))) (home-page "https://www.freedesktop.org/wiki/Software/udisks/") (synopsis "Disk manager service") (description