From patchwork Mon Jun 3 02:43:19 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maxim Cournoyer X-Patchwork-Id: 28179 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 F350A27BBE9; Mon, 3 Jun 2024 04:00:44 +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=-2.7 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI, SPF_HELO_PASS 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 B723027BBE2 for ; Mon, 3 Jun 2024 04:00:41 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sDxvO-0007IY-Qb; Sun, 02 Jun 2024 22:59:54 -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 1sDxvL-0007GX-Ch for guix-patches@gnu.org; Sun, 02 Jun 2024 22:59:51 -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 1sDxvL-0002OJ-8s for guix-patches@gnu.org; Sun, 02 Jun 2024 22:59:51 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1sDxvW-0003Lt-Te for guix-patches@gnu.org; Sun, 02 Jun 2024 23:00:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#71327] [PATCH 1/8] gnu: libbytesize: Update to 2.10. Resent-From: Maxim Cournoyer Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 03 Jun 2024 03:00:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 71327 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 71327@debbugs.gnu.org Cc: Maxim Cournoyer X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.171738359712838 (code B ref -1); Mon, 03 Jun 2024 03:00:02 +0000 Received: (at submit) by debbugs.gnu.org; 3 Jun 2024 02:59:57 +0000 Received: from localhost ([127.0.0.1]:35073 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sDxvQ-0003Kz-VT for submit@debbugs.gnu.org; Sun, 02 Jun 2024 22:59:57 -0400 Received: from lists.gnu.org ([209.51.188.17]:34182) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sDxvO-0003Ko-SW for submit@debbugs.gnu.org; Sun, 02 Jun 2024 22:59:55 -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 1sDxt6-0000uk-Ir for guix-patches@gnu.org; Sun, 02 Jun 2024 22:57:32 -0400 Received: from mail-qt1-x82e.google.com ([2607:f8b0:4864:20::82e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1sDxgX-0005wh-18 for guix-patches@gnu.org; Sun, 02 Jun 2024 22:44:34 -0400 Received: by mail-qt1-x82e.google.com with SMTP id d75a77b69052e-43fd2809723so20060531cf.3 for ; Sun, 02 Jun 2024 19:43:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1717382610; x=1717987410; darn=gnu.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=ZtFhJOVsTwFMUFqZvxXrZix4adOlFvAGApqGWoZIoNo=; b=JKeDbOUdkgEN3ObLYm3JHCg+bDsHpoSJvJ5KUuRk6qbTup8Qjf9j9UvNHyCoXic20N J4VHVPJiao89c41BOxIf1M7dOgsw9xc2SsFc+rbgd/AQzj0xo5Ejr6wyDql6GA94EV+D KzIwZUroJzDd1rtKtKZhhmFRM17b3JKapGVxW1DTnFYgx1VnVmP9gOgVW/gyzdKdYfWl bVao7Y1HL8zot/fGlTZfpTFpBk4JxNKTsKVx8Zucn7gwwg8r5dwpS2vNVbtEvTW9+Yy3 4EWuo/bBCyM773vkPQZmZA1mRP5Th4lPETpCChEQnE4htQGNr3sJzLrt/HZ4s9jnlMWi GXlQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1717382610; x=1717987410; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=ZtFhJOVsTwFMUFqZvxXrZix4adOlFvAGApqGWoZIoNo=; b=c/S4VIKPSsa6KfF5MVEyQm4+tfccuKBUBobuN9CfwqtbPSQPTU7m/R2SeUR8vwcipv GW/RgnPrcSdnC0rTXOyKt7hiJm3bg328HyLamGXsKxy2MqaUvrVuYbm5fyGlOlD/cgSz 68rpYEFO12XKTky3B481L9SAPIkgnfv5cUILsO3880jYUiudNAn9J9tQO+3lcjt1ulHj UN/ergGAytcF7+6kwr3kfgTprUXgxNhAsd1zYFQXHYODwfDDt/I4Oa3jimTHvekLOSxD +8kCU1aRA3CoU9wdZfu2Fp3S/UEMsDjd9WdrO3ggv7w6Zpp7Hzna1XzgRRKoZNMzX7Cf xKcQ== X-Gm-Message-State: AOJu0YwC9zt/FD33BYuVTtt7LaKcBbZ9qvZbqMmPPZDrJutUfiNT3fxy ihA00MjFKKHxlpls34coS/eNYLRfmDga80CJ6VXsJq4DdrdV1gf2dTrKQA== X-Google-Smtp-Source: AGHT+IFmDxhc1Rq8dcvY26Fx7e7A9JPcpiSJcr8XFtNILVTPrkoBm5VvlWQaoSkjC1dUqWipA0fLDg== X-Received: by 2002:a05:622a:3c7:b0:43d:f92c:10f5 with SMTP id d75a77b69052e-43ff5250b50mr106801701cf.20.1717382610208; Sun, 02 Jun 2024 19:43:30 -0700 (PDT) Received: from localhost.localdomain (dsl-10-130-93.b2b2c.ca. [72.10.130.93]) by smtp.gmail.com with ESMTPSA id d75a77b69052e-43ff23de157sm34957681cf.39.2024.06.02.19.43.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 02 Jun 2024 19:43:29 -0700 (PDT) From: Maxim Cournoyer Date: Sun, 2 Jun 2024 22:43:19 -0400 Message-ID: <1b493965d8ba0a4dc3c06fa813314c4ffa551b3c.1717382583.git.maxim.cournoyer@gmail.com> X-Mailer: git-send-email 2.45.1 MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::82e; envelope-from=maxim.cournoyer@gmail.com; helo=mail-qt1-x82e.google.com 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, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/c.scm (libbytesize): Update to 2.10. Change-Id: Id0640e9c118fcf3ced3f6c6aa145a0f15e4f07d8 --- gnu/packages/c.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) base-commit: dc4c48f10281007a0ab3541b8a64198c60c6d5b0 diff --git a/gnu/packages/c.scm b/gnu/packages/c.scm index d13b62b5e2..bb75dccf8e 100644 --- a/gnu/packages/c.scm +++ b/gnu/packages/c.scm @@ -404,7 +404,7 @@ (define-public python-pcpp (define-public libbytesize (package (name "libbytesize") - (version "2.6") + (version "2.10") (source (origin (method url-fetch) (uri (string-append @@ -412,7 +412,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 Jun 3 12:02:50 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Maxim Cournoyer X-Patchwork-Id: 28191 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 225DC27BBE9; Mon, 3 Jun 2024 13:11:40 +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=-2.7 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI, SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 5AE4C27BBE2 for ; Mon, 3 Jun 2024 13:11:36 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sE6Wb-0002wT-Ro; Mon, 03 Jun 2024 08:10:55 -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 1sE6WZ-0002qo-BD for guix-patches@gnu.org; Mon, 03 Jun 2024 08:10:51 -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 1sE6WY-0001ep-SV for guix-patches@gnu.org; Mon, 03 Jun 2024 08:10:50 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1sE6Wk-0002rz-OP; Mon, 03 Jun 2024 08:11:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#71327] [PATCH 2/8] gnu: libblockdev: Embed executable paths. Resent-From: Maxim Cournoyer Original-Sender: "Debbugs-submit" Resent-CC: maxim.cournoyer@gmail.com, guix-patches@gnu.org Resent-Date: Mon, 03 Jun 2024 12:11: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: Sarah Morgensen , Maxim Cournoyer , Maxim Cournoyer X-Debbugs-Original-Xcc: Maxim Cournoyer Received: via spool by 71327-submit@debbugs.gnu.org id=B71327.171741662310902 (code B ref 71327); Mon, 03 Jun 2024 12:11:02 +0000 Received: (at 71327) by debbugs.gnu.org; 3 Jun 2024 12:10:23 +0000 Received: from localhost ([127.0.0.1]:34574 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sE6W6-0002pf-Le for submit@debbugs.gnu.org; Mon, 03 Jun 2024 08:10:23 -0400 Received: from mail-qt1-f181.google.com ([209.85.160.181]:53388) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sE6R9-0002b3-2l for 71327@debbugs.gnu.org; Mon, 03 Jun 2024 08:05:16 -0400 Received: by mail-qt1-f181.google.com with SMTP id d75a77b69052e-43fab2fa4ccso24538291cf.2 for <71327@debbugs.gnu.org>; Mon, 03 Jun 2024 05:05:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1717416235; x=1718021035; darn=debbugs.gnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=OiVO40CWN7g/JHJwPi+s+mAoek41J9GA+9vWULn7/+U=; b=jyEve2B26hy5o9oZxHIY11eBTTLSaVjmgeI0GAfMBDiguG6GvtHI/T7oiWz64akL/8 hQjeweYMeLYqKznCwpSqM/SL5iP2UPLLAlEqilOru5/0lm/YPJraU8KNcRVXZoTDXNXP lXwIZrMrQMsTUVHXDrOEmHn6jjhsB1HWysamHEeAlaOMhvTd0ziBEpYmVztO+m53HxUx 9EuOg4GnydUako6aBzunTJ/GbDBuHHvCXKXLI7lt1kQoE7fLn0/NH1qaqATcOhCZQLIe ZqNvEdblxRGfNNFXYOEkOt8K+hiZuB/MihsfsZSWDOYsytBRJXx54yr2eVd45DHdD1EN DcHg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1717416235; x=1718021035; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=OiVO40CWN7g/JHJwPi+s+mAoek41J9GA+9vWULn7/+U=; b=ukEc2WO2P4+hm4s259PNUDmK45UCoahYf0S4QIU4Vx+cleCuyRVST25TpvlFa6GVoW q6Y8xssEONRHz4VUoczB0/ll69YeNr4OggezY/AjURSK40j9pTwTYo+NxJnL0lVaqDHP RUf98iARDAodUcD65f0mU++aR1dJkpQGgQK3iTf60V/6uAO+ttSxV5S4GSNUybs5qBI+ 9Mbf4CC8OPO4mjSL/K9LcAN3MtuAVYCnMmq/9orhQtBwQ1ps7P+gH4x0uGilchvfen9d l3N/5rsAQoE6mpzxM2VEg0LVOAWYx8YH5Blz7SiG2Zt2vhdBgODBsJN80zxhzmzhDlN1 C73A== X-Gm-Message-State: AOJu0Yy9WF5YQqtOofOu9PhGJKjQjiYGTaQdu21yek4ycT74YFzsiaf5 Oc4YFTYxe7U1hw1tE7Wc4pu57fmoRDrtJJih0THOrWLS6egwceCilrGfeg== X-Google-Smtp-Source: AGHT+IF4B7Thgf/NQXgjVTYW9uieMkjxxahV6vAFGwc8jbX0H9k5+sOvzrDWyurFh/UXywAE5hdEgA== X-Received: by 2002:a05:622a:1a24:b0:43a:8353:775c with SMTP id d75a77b69052e-43ff5259d75mr93906571cf.2.1717416235240; Mon, 03 Jun 2024 05:03:55 -0700 (PDT) Received: from localhost.localdomain (dsl-154-1.b2b2c.ca. [66.158.154.1]) by smtp.gmail.com with ESMTPSA id d75a77b69052e-43ff258039fsm38876151cf.79.2024.06.03.05.03.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 03 Jun 2024 05:03:54 -0700 (PDT) From: Maxim Cournoyer Date: Mon, 3 Jun 2024 08:02:50 -0400 Message-ID: <0c4bd8c7db24d0734320d4fdb2a2ce1f86a801d2.1717382583.git.maxim.cournoyer@gmail.com> X-Mailer: git-send-email 2.45.1 In-Reply-To: <1b493965d8ba0a4dc3c06fa813314c4ffa551b3c.1717382583.git.maxim.cournoyer@gmail.com> References: <1b493965d8ba0a4dc3c06fa813314c4ffa551b3c.1717382583.git.maxim.cournoyer@gmail.com> MIME-Version: 1.0 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: , 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 10d546b918..10073864ed 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. ;;; @@ -1196,7 +1198,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 Jun 3 12:02:51 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maxim Cournoyer X-Patchwork-Id: 28187 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 423D727BBEA; Mon, 3 Jun 2024 13:06:13 +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=-2.7 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI, SPF_HELO_PASS 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 CB82327BBE9 for ; Mon, 3 Jun 2024 13:06:12 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sE6Rj-0001It-CB; Mon, 03 Jun 2024 08:05:51 -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 1sE6Rh-0001IA-Dw for guix-patches@gnu.org; Mon, 03 Jun 2024 08:05:49 -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 1sE6Rh-0000ch-4d for guix-patches@gnu.org; Mon, 03 Jun 2024 08:05:49 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1sE6Rt-0002dx-QA; Mon, 03 Jun 2024 08:06:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#71327] [PATCH 3/8] gnu: libblockdev: Fix inputs. Resent-From: Maxim Cournoyer Original-Sender: "Debbugs-submit" Resent-CC: maxim.cournoyer@gmail.com, guix-patches@gnu.org Resent-Date: Mon, 03 Jun 2024 12:06:01 +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: Sarah Morgensen , Maxim Cournoyer , Maxim Cournoyer X-Debbugs-Original-Xcc: Maxim Cournoyer Received: via spool by 71327-submit@debbugs.gnu.org id=B71327.171741632010030 (code B ref 71327); Mon, 03 Jun 2024 12:06:01 +0000 Received: (at 71327) by debbugs.gnu.org; 3 Jun 2024 12:05:20 +0000 Received: from localhost ([127.0.0.1]:34242 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sE6RD-0002bi-LU for submit@debbugs.gnu.org; Mon, 03 Jun 2024 08:05:20 -0400 Received: from mail-qt1-f169.google.com ([209.85.160.169]:57601) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sE6RB-0002b9-EA for 71327@debbugs.gnu.org; Mon, 03 Jun 2024 08:05:17 -0400 Received: by mail-qt1-f169.google.com with SMTP id d75a77b69052e-43fd2809723so21809801cf.3 for <71327@debbugs.gnu.org>; Mon, 03 Jun 2024 05:05:04 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1717416238; x=1718021038; darn=debbugs.gnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=xVQIZciGPIr3xyy1sZM7xNr8fG3tGkPWQ/zTvrka1aE=; b=crqTwI7WESg1q/QsMaPa06TrYSCHYyUOQZYPF46OhePAy4OSPY1Se8QzJqeUVVVs25 F/CiV5KVaygX/K7KK4CZGZhlSpSK+Ctwq1fKVOsxtuY2+z6emdWDIzTx8PoIfiFcKNNm hwGwr2KQg1PzmBjE225pXIY7u9HIZBd+NaWJz2dufpwy/kt89ydFumdk/W1n+zaYwIzn ih7D5QsKnX8OlUvoCD8CDb+wz0HisScTIgkqlga4436CeGJb1No0MthDsOmlDwqT8L7d +xrpAfGLRbH6tErG9fHx3LlTxKhS6VswmXT5xjbN1o9w5LNIB0JiVhuIloyvHxorkeka WWZg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1717416238; x=1718021038; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=xVQIZciGPIr3xyy1sZM7xNr8fG3tGkPWQ/zTvrka1aE=; b=Y3SicsyE0tKVuR18WLQXCqeg87vUy0ravZw5fMUi8NGFP0Cg9Ux6h7yWk8yBCkzsDZ lLib9lnR5RtyNU4k4jO6SAzv6Wjvt8xo8IFKSeOKenV8uPkpIT93tFIa/j0Cw/YU7M8r /cM/qzj5mLydhAsD5ZmWHFRC0WoF1yEPtVevxrZ6NZ6SR/NGX8OMw5strN0jV/lULRu5 KaqwwglHQ+WuoBFYnxhrSCtFCxi3VS3mrAG+JEp+6Ju3o2/ML2xHDpgD7BMRpO20wj2L fQnYyhSNnKd6xQtijSNeq4D7yFAcAbOrZrFk8ALU/EwUkUR+/TGaX5pbpXt1mgQn9Ue1 PtpA== X-Gm-Message-State: AOJu0Yx3DGRcX6PuFJFcR3Wpt8f+flmc2+VxEbbkhBiG8XNujJ5VLY1m mkFZjK3khJoJ0MrKMepjhFd2vlEoc9WLOH3/89tVDqZ/oJ7x6lsGmFFZNQ== X-Google-Smtp-Source: AGHT+IHGPtd206fW+NPAPY/wLSKaU/2lF32sc1dqJXHyf6PV05zAQlAhaFITmK0AXM7nPI2Z9x/69Q== X-Received: by 2002:a05:622a:8:b0:43a:3fb0:779b with SMTP id d75a77b69052e-43ff5250f8dmr106957981cf.25.1717416237867; Mon, 03 Jun 2024 05:03:57 -0700 (PDT) Received: from localhost.localdomain (dsl-154-1.b2b2c.ca. [66.158.154.1]) by smtp.gmail.com with ESMTPSA id d75a77b69052e-43ff258039fsm38876151cf.79.2024.06.03.05.03.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 03 Jun 2024 05:03:57 -0700 (PDT) From: Maxim Cournoyer Date: Mon, 3 Jun 2024 08:02:51 -0400 Message-ID: <0c573ccaad8a4f674545b67a769760e290b90b2d.1717382584.git.maxim.cournoyer@gmail.com> X-Mailer: git-send-email 2.45.1 In-Reply-To: <1b493965d8ba0a4dc3c06fa813314c4ffa551b3c.1717382583.git.maxim.cournoyer@gmail.com> References: <1b493965d8ba0a4dc3c06fa813314c4ffa551b3c.1717382583.git.maxim.cournoyer@gmail.com> MIME-Version: 1.0 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: , 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-linu... [inputs]: ... here. Add bcache-tools, e2fsprogs, gptfdisk, multipath-tools, and ntfs-3g. Signed-off-by: Maxim Cournoyer Change-Id: I0eca44547a03e787e992e45ec4f71792e293868a --- 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 10073864ed..2541828dd3 100644 --- a/gnu/packages/disk.scm +++ b/gnu/packages/disk.scm @@ -1208,23 +1208,28 @@ (define-public libblockdev (native-inputs (list gobject-introspection pkg-config - python-wrapper - util-linux)) + python-wrapper)) (inputs - (list btrfs-progs + (list bcache-tools + btrfs-progs cryptsetup 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 Jun 3 12:02:52 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Maxim Cournoyer X-Patchwork-Id: 28193 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 6BDF027BBE2; Mon, 3 Jun 2024 13:41:08 +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=-2.7 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI, SPF_HELO_PASS 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 862D327BBE2 for ; Mon, 3 Jun 2024 13:41:04 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sE6zb-0001Ub-Ee; Mon, 03 Jun 2024 08:40:51 -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 1sE6za-0001Tc-4C for guix-patches@gnu.org; Mon, 03 Jun 2024 08:40:50 -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 1sE6zZ-0007bQ-Mr for guix-patches@gnu.org; Mon, 03 Jun 2024 08:40:49 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1sE6zl-00070p-Jy; Mon, 03 Jun 2024 08:41:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#71327] [PATCH 4/8] gnu: libblockdev: Update to 3.1.1. Resent-From: Maxim Cournoyer Original-Sender: "Debbugs-submit" Resent-CC: maxim.cournoyer@gmail.com, guix-patches@gnu.org Resent-Date: Mon, 03 Jun 2024 12:41:01 +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: Maxim Cournoyer , Maxim Cournoyer X-Debbugs-Original-Xcc: Maxim Cournoyer Received: via spool by 71327-submit@debbugs.gnu.org id=B71327.171741842326867 (code B ref 71327); Mon, 03 Jun 2024 12:41:01 +0000 Received: (at 71327) by debbugs.gnu.org; 3 Jun 2024 12:40:23 +0000 Received: from localhost ([127.0.0.1]:36693 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sE6z5-0006z9-Gd for submit@debbugs.gnu.org; Mon, 03 Jun 2024 08:40:23 -0400 Received: from mail-qk1-f179.google.com ([209.85.222.179]:43490) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sE6XE-0002ta-5g for 71327@debbugs.gnu.org; Mon, 03 Jun 2024 08:11:33 -0400 Received: by mail-qk1-f179.google.com with SMTP id af79cd13be357-794ab12341aso350356185a.1 for <71327@debbugs.gnu.org>; Mon, 03 Jun 2024 05:11:19 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1717416612; x=1718021412; darn=debbugs.gnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=RHdb90FGiWCG/rRFP1zxf5g54Zid299+JMzZCw7fszo=; b=cVnjLU1r+eXFHKV7bTd5Oip7BLufg6Mu7BQtJ199uEmZ1Dv2obwX0Tb4hDCTDcoBee bDxEWXgMs7SAV7cqDdJbul45KGua0BXHsdzsG+e54HGXc962GBJK9Nfd+259hP0fqGMV GuUzkPOID5AXOEmM9xwi9k+KWvDN/YEFo7HZqi0A8ktmJ7ch8GlurGz34V45plqW4pdz 7qHHnGP7R8qDcAuw1pGyYiutvgZtN2V+CndefrJxCJmhfDFRyPJN9uzZG74XrZDvomXu ETkJSR5qoNBA5ZLtWcm6nv2ACJK2BebbwpFBOCqctmIz2C45uQVI7AidDaKQG1sLKslw yo5g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1717416612; x=1718021412; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=RHdb90FGiWCG/rRFP1zxf5g54Zid299+JMzZCw7fszo=; b=BCQNkxy+F/oA++mnZyv8/VQ69WIVeujaim2YH9PTpBnBZ1OGzzEruc0tZEbBIBDMeV e3BAn+1bJOq68DvnaBR3bnTy73fpWAE158ZjsYR1ynBmTofQK5GLf8+OyZHlqu5PKDq9 XxoSmGIZDtHJeKCVN6TpdvsduvXd8cyWVZ7yMh07Wp/FjOTaUHGtr91Gz4lPBcwVudrS +Mgy58mFcE3eOAb+s6rTok5SeBUAzeRI/Vn2ode8dwA2Zin8RXCnLXnYfirQ9OLuYl3S +Dwx928xB0jz3mlRoKW+ef520COsdJw76ATJicv6X4zMFLC4QtvfGG3LZnNnKS7RwW6g JFUw== X-Gm-Message-State: AOJu0YwN11F086UT/m6ISqgVFaTCwp93YKJpp3gLu/eeR6NEMLLE+ycu TrNdgHvhPxxouFQSRlfjYg4DlitI10mf8OOGu+g5u3oUo/osvYOP/gKy/A== X-Google-Smtp-Source: AGHT+IFCdSsIs1g0skfqkQx5GYd7cnG7XE2w4Dqe/QX1RteEXLoPReAN8kAskg7OXzoSfERiBWyQ0g== X-Received: by 2002:a05:622a:190c:b0:43a:b558:4ab7 with SMTP id d75a77b69052e-43ff3617730mr131446221cf.15.1717416240627; Mon, 03 Jun 2024 05:04:00 -0700 (PDT) Received: from localhost.localdomain (dsl-154-1.b2b2c.ca. [66.158.154.1]) by smtp.gmail.com with ESMTPSA id d75a77b69052e-43ff258039fsm38876151cf.79.2024.06.03.05.03.59 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 03 Jun 2024 05:04:00 -0700 (PDT) From: Maxim Cournoyer Date: Mon, 3 Jun 2024 08:02:52 -0400 Message-ID: X-Mailer: git-send-email 2.45.1 In-Reply-To: <1b493965d8ba0a4dc3c06fa813314c4ffa551b3c.1717382583.git.maxim.cournoyer@gmail.com> References: <1b493965d8ba0a4dc3c06fa813314c4ffa551b3c.1717382583.git.maxim.cournoyer@gmail.com> MIME-Version: 1.0 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: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/disk.scm (libblockdev): Update to 3.1.1. [inputs]: Add keyutils and libnvme. Change-Id: I6b229426531d584669a50b02c0c5acef9021a2fa --- gnu/packages/disk.scm | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/gnu/packages/disk.scm b/gnu/packages/disk.scm index 2541828dd3..7fbd6a52d7 100644 --- a/gnu/packages/disk.scm +++ b/gnu/packages/disk.scm @@ -24,7 +24,7 @@ ;;; Copyright © 2021 Justin Veilleux ;;; Copyright © 2021 Sarah Morgensen ;;; Copyright © 2014, 2022 Ludovic Courtès -;;; Copyright © 2022 Maxim Cournoyer +;;; Copyright © 2022, 2024 Maxim Cournoyer ;;; Copyright © 2022 Disseminate Dissent ;;; Copyright © 2023 Timotej Lazar ;;; Copyright © 2023 Morgan Smith @@ -1181,7 +1181,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/" @@ -1189,7 +1189,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 Jun 3 12:02:53 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maxim Cournoyer X-Patchwork-Id: 28192 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 AF4AA27BBE9; Mon, 3 Jun 2024 13:15: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=-2.7 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI, SPF_HELO_PASS autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 7EAE927BBE2 for ; Mon, 3 Jun 2024 13:15:23 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sE6aT-0004Kl-QP; Mon, 03 Jun 2024 08:14:53 -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 1sE6aS-0004Jt-44 for guix-patches@gnu.org; Mon, 03 Jun 2024 08:14:52 -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 1sE6aQ-0002Hq-HT for guix-patches@gnu.org; Mon, 03 Jun 2024 08:14:50 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1sE6ac-00035x-Lp; Mon, 03 Jun 2024 08:15:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#71327] [PATCH 5/8] gnu: libblockdev: Use gexps. Resent-From: Maxim Cournoyer Original-Sender: "Debbugs-submit" Resent-CC: maxim.cournoyer@gmail.com, guix-patches@gnu.org Resent-Date: Mon, 03 Jun 2024 12:15: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: Maxim Cournoyer , Maxim Cournoyer X-Debbugs-Original-Xcc: Maxim Cournoyer Received: via spool by 71327-submit@debbugs.gnu.org id=B71327.171741687811691 (code B ref 71327); Mon, 03 Jun 2024 12:15:02 +0000 Received: (at 71327) by debbugs.gnu.org; 3 Jun 2024 12:14:38 +0000 Received: from localhost ([127.0.0.1]:34884 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sE6aE-00032U-2s for submit@debbugs.gnu.org; Mon, 03 Jun 2024 08:14:38 -0400 Received: from mail-oa1-f49.google.com ([209.85.160.49]:48575) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sE6aD-000329-1O for 71327@debbugs.gnu.org; Mon, 03 Jun 2024 08:14:37 -0400 Received: by mail-oa1-f49.google.com with SMTP id 586e51a60fabf-2507fa7f37aso1807933fac.1 for <71327@debbugs.gnu.org>; Mon, 03 Jun 2024 05:14:24 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1717416797; x=1718021597; darn=debbugs.gnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=YXFkN1BtCypnP9YfR/yPWftbznfPLInhEwEmK/Uid9Y=; b=nIjE8HFkzIj0Yd8XOEKEoAsI2Jsk9eaPL0SjPNZt4hdKT7SGhJdatl6a3B0bnciZ3L ab8DC9heZt728WvSPzmxrP1v8LL4D1V7C/YYhqCg2QpraRyQeffl1gNw8dtbTL58S/mY MKpMMUL9LW7Q/ZCoJCH0DGV6sibocxUELk31CqumPDs69CW30HdTnhVU2AOSFw9+fKU1 vEniX/EN6Lxg59BZOSaZYi3Ou4wlGCpf8P2ycFCF3CY4rLGEIEOJAfDwfH6GBnph46mK LFgVpaWdmhaZ3AA1woiFGpsyWVDv2B4pk2lT5IDq7+MFDIK1t6ybaMR6ExBng/eam8mu SVow== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1717416797; x=1718021597; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=YXFkN1BtCypnP9YfR/yPWftbznfPLInhEwEmK/Uid9Y=; b=F5SrfwEKBP3n8EcIuYtp1t7huS/s/h2XvyOdWXLQ+gBn8lwFuWwv+0srDeihNJd51E FrUyiE3d4ITdJHafBm5DPdyTJyI1dp0Ht34tbek5xlM0nUHb2u5+3iP3+0VhdMJ579yz mWBOP1lEf0z3BEG3a0H8XrV0NeYls4EKwRLnGvVa82zub55gZW9Zp/hYwdoHi2M9FhW8 ch175s1EtuUOzZEdeYPLzdGKjP03x9oJG1l4dHcbjFjBZrV06dNYO+4/gatSDUKg0TKt KHl1MaaTyETFlW2OWiuSk/OwkaPHJUjBY+CCEHkWIRP4j2djq9jRdVDWNMwf2P3nG3PZ druA== X-Gm-Message-State: AOJu0YxYzFxmgt5eiACA5yNJFojujJK3CuKZbdnLnFkQnlB1fexHLwv9 qUESSiRzRGX7Y64c5pkW0Ctrl9Kh3PUIel8bNcBCzbCCkijS1uP2VSAtcw== X-Google-Smtp-Source: AGHT+IFdaQMndHSI/zFWDM2b3qQEq9WePQ2a5UPS77GuoSRK010BXo+wrhXEVSzLdirgwfmA+HPr6A== X-Received: by 2002:a05:622a:13ca:b0:43a:b15d:bf69 with SMTP id d75a77b69052e-43ff54da8e1mr118466951cf.46.1717416243530; Mon, 03 Jun 2024 05:04:03 -0700 (PDT) Received: from localhost.localdomain (dsl-154-1.b2b2c.ca. [66.158.154.1]) by smtp.gmail.com with ESMTPSA id d75a77b69052e-43ff258039fsm38876151cf.79.2024.06.03.05.04.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 03 Jun 2024 05:04:03 -0700 (PDT) From: Maxim Cournoyer Date: Mon, 3 Jun 2024 08:02:53 -0400 Message-ID: <0980caab2c95ff572b945bba1a223d2d9a59d210.1717382584.git.maxim.cournoyer@gmail.com> X-Mailer: git-send-email 2.45.1 In-Reply-To: <1b493965d8ba0a4dc3c06fa813314c4ffa551b3c.1717382583.git.maxim.cournoyer@gmail.com> References: <1b493965d8ba0a4dc3c06fa813314c4ffa551b3c.1717382583.git.maxim.cournoyer@gmail.com> MIME-Version: 1.0 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: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/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 7fbd6a52d7..1cdeb53597 100644 --- a/gnu/packages/disk.scm +++ b/gnu/packages/disk.scm @@ -1192,19 +1192,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 Jun 3 12:02:54 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Maxim Cournoyer X-Patchwork-Id: 28188 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 2561127BBE9; Mon, 3 Jun 2024 13:06:16 +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=-2.7 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI, SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 269BE27BBE2 for ; Mon, 3 Jun 2024 13:06:15 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sE6Rm-0001Kv-1z; Mon, 03 Jun 2024 08:05:54 -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 1sE6Rj-0001Iv-FJ for guix-patches@gnu.org; Mon, 03 Jun 2024 08:05:51 -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 1sE6Rh-0000cq-Ln for guix-patches@gnu.org; Mon, 03 Jun 2024 08:05:50 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1sE6Ru-0002e5-6a; Mon, 03 Jun 2024 08:06:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#71327] [PATCH 6/8] gnu: udisks: Remove input labels. Resent-From: Maxim Cournoyer Original-Sender: "Debbugs-submit" Resent-CC: maxim.cournoyer@gmail.com, guix-patches@gnu.org Resent-Date: Mon, 03 Jun 2024 12:06: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: Maxim Cournoyer , Maxim Cournoyer X-Debbugs-Original-Xcc: Maxim Cournoyer Received: via spool by 71327-submit@debbugs.gnu.org id=B71327.171741632910060 (code B ref 71327); Mon, 03 Jun 2024 12:06:02 +0000 Received: (at 71327) by debbugs.gnu.org; 3 Jun 2024 12:05:29 +0000 Received: from localhost ([127.0.0.1]:34250 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sE6RN-0002cA-3H for submit@debbugs.gnu.org; Mon, 03 Jun 2024 08:05:29 -0400 Received: from mail-qt1-f175.google.com ([209.85.160.175]:53389) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sE6RK-0002bq-55 for 71327@debbugs.gnu.org; Mon, 03 Jun 2024 08:05:27 -0400 Received: by mail-qt1-f175.google.com with SMTP id d75a77b69052e-43fab2fa4ccso24539461cf.2 for <71327@debbugs.gnu.org>; Mon, 03 Jun 2024 05:05:13 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1717416247; x=1718021047; darn=debbugs.gnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=rezKxK7VvSEJuiVym8PjY0AqXcoC4PN0Yuu/n/6YyJU=; b=Z66WJYKmhdOD1S7gVbTud/TCxbQ78mvenCrapsEYILE50iaBRhUNBsbOEO7qzUEjEL UMZBrZzi2vgJQ1DvFwLJJukfig/Lk2iGucW23IWIfG6f4uM32h+a6R+luCbR/8s21AAz ZIQbPWBe3vBSG+Q8b9dUZ+pc3C1F4EoTMig/VswoZNGfL2xGQUzUfOdtmeGCqEFo9sRD HfSeLIEee3V20bEl6iRqGLRdWn3tdPUf/MEJ5vBckjtdI1RMIUsz2hxFtH6TlhKKLTcp EqCiiWKskA8MQHAr58xhp50VwI5lRYORevcCvAedS6KgRdKE4Grz9E3bg29Ka0dkamOV ujaA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1717416247; x=1718021047; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=rezKxK7VvSEJuiVym8PjY0AqXcoC4PN0Yuu/n/6YyJU=; b=uSxxqKYa0bI0RFCeXLaE/5HXQEXmGMk3eIsuokByfYvJZYUMLJdGWh5HCthDCHQnGz cuoFgfPVNjy4zrsljZj3SU0sSw3vmCNeYe2bxwx/PwLVyU6Nl4toiPBhp054XJhGKJPY ySM1JvLqoX9BbYqWfKNMMVctPArPI8yQL7fbB5nAqnapbD1WJh8d+043eo2S5BxNRWnj IStMxYkDTBxB/klyI0K+1EJhjsfhKYl38sjRKAUfYDLKUGC37j9n8JslDFmVdLC6eFDM cF5/iroO44h3Du4xRZckYkFGpTa5gDWPuxt20IC6GS9G3cfiS5V0AMAIIwGt2+/DrZS9 puhg== X-Gm-Message-State: AOJu0Ywx2Z7OIIMMeyfvnQop/YnxeWimtx/R2qAYfPgKiX+9ZjXVZVbF v2fBrWfL5d6hqMpc+KBqhCHFpMTlsXF1f82fGCfy2njdo9mjJSC+e2cToQ== X-Google-Smtp-Source: AGHT+IF+0qHReSg8+AgGZ9EjkBIqHcZuEUbHSER+dA7vdBwv2chGeDgIfPWJ6l+FNSPln0AHivpFNg== X-Received: by 2002:a05:622a:1101:b0:437:c49e:ece9 with SMTP id d75a77b69052e-43ff54f9c2amr81878691cf.42.1717416246550; Mon, 03 Jun 2024 05:04:06 -0700 (PDT) Received: from localhost.localdomain (dsl-154-1.b2b2c.ca. [66.158.154.1]) by smtp.gmail.com with ESMTPSA id d75a77b69052e-43ff258039fsm38876151cf.79.2024.06.03.05.04.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 03 Jun 2024 05:04:06 -0700 (PDT) From: Maxim Cournoyer Date: Mon, 3 Jun 2024 08:02:54 -0400 Message-ID: X-Mailer: git-send-email 2.45.1 In-Reply-To: <1b493965d8ba0a4dc3c06fa813314c4ffa551b3c.1717382583.git.maxim.cournoyer@gmail.com> References: <1b493965d8ba0a4dc3c06fa813314c4ffa551b3c.1717382583.git.maxim.cournoyer@gmail.com> MIME-Version: 1.0 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: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/freedesktop.scm (udisks) [native-inputs]: Remove input labels. [phases]: Remove trailing #t. Change-Id: I805df6ac2e5ad96cf7a092d34354aefb12bd7586 --- gnu/packages/freedesktop.scm | 67 +++++++++++++++++------------------- 1 file changed, 31 insertions(+), 36 deletions(-) diff --git a/gnu/packages/freedesktop.scm b/gnu/packages/freedesktop.scm index 6941450436..bb0858cd9e 100644 --- a/gnu/packages/freedesktop.scm +++ b/gnu/packages/freedesktop.scm @@ -27,7 +27,7 @@ ;;; Copyright © 2021 Robby Zambito ;;; Copyright © 2021, 2022, 2023 Maxime Devos ;;; Copyright © 2021, 2022 John Kehayias -;;; Copyright © 2021, 2021, 2022, 2023 Maxim Cournoyer +;;; Copyright © 2021, 2021, 2022, 2023, 2024 Maxim Cournoyer ;;; Copyright © 2022 Daniel Meißner ;;; Copyright © 2022 Wamm K. D. ;;; Copyright © 2022 Petr Hodina @@ -1732,34 +1732,31 @@ (define-public udisks "06cq52kp1nyy15qzylywy9s7hhhqc45k0s3y68crf0zsmjyng0yj")))) (build-system gnu-build-system) (native-inputs - `(("docbook-xml" ,docbook-xml-4.3) ; to build the manpages - ("docbook-xsl" ,docbook-xsl) - ("glib:bin" ,glib "bin") ; for glib-mkenums - ("gnome-common" ,gnome-common) ; TODO: Why is this needed? - ("gobject-introspection" ,gobject-introspection) - ("gtk-doc" ,gtk-doc/stable) - ("intltool" ,intltool) - ("pkg-config" ,pkg-config) - ("xsltproc" ,libxslt))) + (list docbook-xml-4.3 ; to build the manpages + docbook-xsl + `(,glib "bin") ; for glib-mkenums + gnome-common ; TODO: Why is this needed? + gobject-introspection + gtk-doc/stable + intltool + pkg-config + libxslt)) (propagated-inputs - (list glib)) ; required by udisks2.pc + (list glib)) ; required by udisks2.pc (inputs - `(,acl - ;; TODO(staging): Make unconditional. - ,@(if (%current-target-system) - (list bash-minimal) ; for wrap-program - '()) - ,cryptsetup - ,libatasmart - ,libblockdev - ,libgudev - ,polkit - ,util-linux)) + (list acl + bash-minimal + cryptsetup + libatasmart + libblockdev + libgudev + polkit + util-linux)) (outputs '("out" - "doc")) ;5 MiB of gtk-doc HTML + "doc")) ;5 MiB of gtk-doc HTML (arguments - `(#:tests? #f ; requiring system message dbus - #:disallowed-references ("doc") ;enforce separation of "doc" + `(#:tests? #f ; requiring system message dbus + #:disallowed-references ("doc") ;enforce separation of "doc" #:configure-flags (list "--enable-man" "--enable-available-modules" ; Such as lvm2, btrfs, etc. @@ -1786,15 +1783,14 @@ (define-public udisks docbook-xml-catalog-file))) #:phases (modify-phases %standard-phases - (add-before - 'configure 'fix-girdir - (lambda _ - ;; Install introspection data to its own output. - (substitute* "udisks/Makefile.in" - (("girdir = .*") - "girdir = $(datadir)/gir-1.0\n") - (("typelibsdir = .*") - "typelibsdir = $(libdir)/girepository-1.0\n")))) + (add-before 'configure 'fix-girdir + (lambda _ + ;; Install introspection data to its own output. + (substitute* "udisks/Makefile.in" + (("girdir = .*") + "girdir = $(datadir)/gir-1.0\n") + (("typelibsdir = .*") + "typelibsdir = $(libdir)/girepository-1.0\n")))) (add-after 'install 'wrap-udisksd (lambda* (#:key outputs inputs #:allow-other-keys) ;; Tell 'udisksd' where to find the 'mount' command. @@ -1809,8 +1805,7 @@ (define-public udisks ;; partitions, e.g. in gnome-disks ,(string-append cryptsetup "/sbin") "/run/current-system/profile/bin" - "/run/current-system/profile/sbin"))) - #t)))))) + "/run/current-system/profile/sbin"))))))))) (home-page "https://www.freedesktop.org/wiki/Software/udisks/") (synopsis "Disk manager service") (description From patchwork Mon Jun 3 12:02:55 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maxim Cournoyer X-Patchwork-Id: 28189 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 89CDA27BBE2; Mon, 3 Jun 2024 13:06: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=-2.7 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI, SPF_HELO_PASS autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 0F7B127BBE9 for ; Mon, 3 Jun 2024 13:06:22 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sE6Rl-0001Kd-Ma; Mon, 03 Jun 2024 08:05:53 -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 1sE6Rj-0001Iu-Ei for guix-patches@gnu.org; Mon, 03 Jun 2024 08:05:51 -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 1sE6Ri-0000cs-2M for guix-patches@gnu.org; Mon, 03 Jun 2024 08:05:50 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1sE6Ru-0002eE-Lf; Mon, 03 Jun 2024 08:06:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#71327] [PATCH 7/8] gnu: udisks: Update to 2.10.1. Resent-From: Maxim Cournoyer Original-Sender: "Debbugs-submit" Resent-CC: maxim.cournoyer@gmail.com, guix-patches@gnu.org Resent-Date: Mon, 03 Jun 2024 12:06: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: Maxim Cournoyer , Maxim Cournoyer X-Debbugs-Original-Xcc: Maxim Cournoyer Received: via spool by 71327-submit@debbugs.gnu.org id=B71327.171741633110079 (code B ref 71327); Mon, 03 Jun 2024 12:06:02 +0000 Received: (at 71327) by debbugs.gnu.org; 3 Jun 2024 12:05:31 +0000 Received: from localhost ([127.0.0.1]:34257 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sE6RO-0002cV-QY for submit@debbugs.gnu.org; Mon, 03 Jun 2024 08:05:31 -0400 Received: from mail-qt1-f174.google.com ([209.85.160.174]:48630) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sE6RN-0002bx-Dm for 71327@debbugs.gnu.org; Mon, 03 Jun 2024 08:05:29 -0400 Received: by mail-qt1-f174.google.com with SMTP id d75a77b69052e-43e23ce7b07so21879861cf.1 for <71327@debbugs.gnu.org>; Mon, 03 Jun 2024 05:05:16 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1717416250; x=1718021050; darn=debbugs.gnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=937XioTsshiWFFC+6MI42L6kJHlEnKNZrZvRjP+q6qY=; b=FmyOhm+5IjHcWDljF9CGJ6wxhaS/qAr/PN9C7ZJlLLSB75eplNDl9RvotZekG77kmv 2pD7f6YcKsbwOZjs2OCr6qkbtk8YOJXexjcdl3tL5qVV8YJINZbGILMKOQyIXnzXFszz cf/H/ymq6+UHHfgwtljtR0902pWK3QZyVWuO+IdsVedN+ypU0ZXhHPqptbAUQ1fwqB/Q V+Q2/O49gh8NRVOXuGHbIKmaS4cRMjR1FxB2ECu3PyMO2u78EwMAW1nkcq8d+JMShYx/ vmWxtZiVs7HCqizBRoKNlsqUWwk7btLZfzqr8glp5vFLDpECkRqLU6k1xpCXYn4E3TkY FPIA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1717416250; x=1718021050; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=937XioTsshiWFFC+6MI42L6kJHlEnKNZrZvRjP+q6qY=; b=wZ7K9A62Q6WV326YiFlDku6CiliN3TeBrUz21Du2arFwyKqQjb6Uq2bD5Pz90hMvwE sZeprBr9/xPSwzDufuPiPLwrYpmcuOr83t+tJwIJw1hYHoVpCPcOZooCt8SSom4w0Pov j9ulfmm/8USWmDcUk5c+1m9PzqUKh5SURv/goJuIOO1MjtMHvvjXa4Ml+Y1Izjn9N7Gy UfPYabxGBpAzF4fTTMykGkWlmaOobMlZdKI3aW0TzHft18Hvjkx+5BFrXE+h46o9KPsr SG5N3ntNsb0gAUQO/UFfdRfVBSgx20QLeGkZHIWvisxIQ5ZVyEElqlWIjbVWA9/vGDTR TGQw== X-Gm-Message-State: AOJu0YxpGZrIYH6KYR9rMdtQOf21eM5NW1RQNAdIaDhC86cW8uhlBAJH DuDOvhP8fqwuvJHYaRS5Ff7RxdziZ/ljOefv54clzLUCV8sPABHtE4bA2w== X-Google-Smtp-Source: AGHT+IGzf6/BpzSGBtd54gnoZ2tlC1vPE/V0MQTysP9EHy0rdgJSuauw93x1Vro4Yy6mAK0GRs4exA== X-Received: by 2002:a05:622a:1111:b0:43a:e62b:1e17 with SMTP id d75a77b69052e-43ff527162amr89263431cf.25.1717416249710; Mon, 03 Jun 2024 05:04:09 -0700 (PDT) Received: from localhost.localdomain (dsl-154-1.b2b2c.ca. [66.158.154.1]) by smtp.gmail.com with ESMTPSA id d75a77b69052e-43ff258039fsm38876151cf.79.2024.06.03.05.04.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 03 Jun 2024 05:04:09 -0700 (PDT) From: Maxim Cournoyer Date: Mon, 3 Jun 2024 08:02:55 -0400 Message-ID: <24b1b395816a71df1a173a6dd6a32b0c1ad1da0b.1717382584.git.maxim.cournoyer@gmail.com> X-Mailer: git-send-email 2.45.1 In-Reply-To: <1b493965d8ba0a4dc3c06fa813314c4ffa551b3c.1717382583.git.maxim.cournoyer@gmail.com> References: <1b493965d8ba0a4dc3c06fa813314c4ffa551b3c.1717382583.git.maxim.cournoyer@gmail.com> MIME-Version: 1.0 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: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/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 bb0858cd9e..063816282b 100644 --- a/gnu/packages/freedesktop.scm +++ b/gnu/packages/freedesktop.scm @@ -1721,7 +1721,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 @@ -1729,16 +1729,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 Jun 3 12:02:56 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maxim Cournoyer X-Patchwork-Id: 28190 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 9ADBA27BBEA; Mon, 3 Jun 2024 13:06:26 +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=-2.7 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI, 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 2988C27BBE2 for ; Mon, 3 Jun 2024 13:06:26 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sE6Rl-0001Kn-N7; Mon, 03 Jun 2024 08:05:53 -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 1sE6Rj-0001Iw-Fu for guix-patches@gnu.org; Mon, 03 Jun 2024 08:05:51 -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 1sE6Ri-0000cu-AI for guix-patches@gnu.org; Mon, 03 Jun 2024 08:05:50 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1sE6Rv-0002eP-2y; Mon, 03 Jun 2024 08:06:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#71327] [PATCH 8/8] gnu: udisks: Remove obsolete wrap-udisksd phase. Resent-From: Maxim Cournoyer Original-Sender: "Debbugs-submit" Resent-CC: maxim.cournoyer@gmail.com, guix-patches@gnu.org Resent-Date: Mon, 03 Jun 2024 12:06: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: Maxim Cournoyer , Maxim Cournoyer X-Debbugs-Original-Xcc: Maxim Cournoyer Received: via spool by 71327-submit@debbugs.gnu.org id=B71327.171741633410099 (code B ref 71327); Mon, 03 Jun 2024 12:06:03 +0000 Received: (at 71327) by debbugs.gnu.org; 3 Jun 2024 12:05:34 +0000 Received: from localhost ([127.0.0.1]:34263 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sE6RS-0002co-9M for submit@debbugs.gnu.org; Mon, 03 Jun 2024 08:05:34 -0400 Received: from mail-qt1-f172.google.com ([209.85.160.172]:54381) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sE6RQ-0002c8-NF for 71327@debbugs.gnu.org; Mon, 03 Jun 2024 08:05:33 -0400 Received: by mail-qt1-f172.google.com with SMTP id d75a77b69052e-43fe0f361b5so21938801cf.0 for <71327@debbugs.gnu.org>; Mon, 03 Jun 2024 05:05:19 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1717416253; x=1718021053; darn=debbugs.gnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=++4uOUKyTSvnEJ/HirtnuUkQmd5AuIo+VrwuCZo4gWI=; b=ic39NdWgtBVe6oVu8scSjH6Y5vRgkqc+IenjSdXDmV+y8KP77KEy2eqfBUai+CVC96 F+xtv3J/bFLb9NrtSa4tlP7i12VOJ4luItQyeUq7Msnz+utGz3T8X/sym3f8bRj+/o6G hqoGhwcKXfISgxwRkBfhiQIaBNbUlhOAbdB5Tuw6PWcrF4zsEb0vsfA4h23ljGQpoLsD mwaDnxjhoqWRicOi3RyvP0SE5GHNVmTAZXmerXVk29NxSI95Ryp3kKCQIZzuBCunM7la IUkDyuZNseFraIxgXRdOoSGCjXwvXgiZkLsKiFqoGx3a+gteBvehicYq1O2ROheIb+yW Pa7g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1717416253; x=1718021053; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=++4uOUKyTSvnEJ/HirtnuUkQmd5AuIo+VrwuCZo4gWI=; b=clV7GEn88IF0Og7kXRpmCX0rS3JUROni3A9niIMXdB1K7FPyRxPqDqHR2T+YiIRjqT 0+r+fQhvazRLkREogSMtl7wMEU4YFwjJ2MpW+meevjQigP8SdE5qoba3cMTgcvdpRD5X HrcWRC4Iamgl6AffhRUTSkaY9BTa2gpKgdzE6iKbEgBoPaZRRno+u3nN5rLecUgDm5g4 nY7dxmoR6tEs9hiRiGOotSjVNrZ2Dr/FdR+1kKOmrxoRmTGXdJuvuq6Yi/6Ouzdt9isB Ahp+fElPmKO/Z3/+C9nELunpY7NSLGmC0MP0o/yT2tPW7qUZBDme0DAEuKPWlg2EAQQF khRA== X-Gm-Message-State: AOJu0YwV5ok3CPAkL1DgOYAITTPK1VLYHpSV6S4SsgAS8kWMAhLcFMpA JRP8tA3CwDogXX4QmGiTMeI1D/qbjM+z1tmsKhZiLa7hgdhC5UAQV9Lf7g== X-Google-Smtp-Source: AGHT+IGvQMwGWvChMCKt12+LWukKVChKDO42lV2GoBbzMKtw/l1DUN+7oE7eHud/Bcg+KZ1eQUcaXg== X-Received: by 2002:ac8:5d12:0:b0:43e:e6e:21d7 with SMTP id d75a77b69052e-43ff52851e2mr89481471cf.26.1717416252996; Mon, 03 Jun 2024 05:04:12 -0700 (PDT) Received: from localhost.localdomain (dsl-154-1.b2b2c.ca. [66.158.154.1]) by smtp.gmail.com with ESMTPSA id d75a77b69052e-43ff258039fsm38876151cf.79.2024.06.03.05.04.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 03 Jun 2024 05:04:12 -0700 (PDT) From: Maxim Cournoyer Date: Mon, 3 Jun 2024 08:02:56 -0400 Message-ID: <1e1fb7edb9a0338ef9247bdd143b452814a1b736.1717382584.git.maxim.cournoyer@gmail.com> X-Mailer: git-send-email 2.45.1 In-Reply-To: <1b493965d8ba0a4dc3c06fa813314c4ffa551b3c.1717382583.git.maxim.cournoyer@gmail.com> References: <1b493965d8ba0a4dc3c06fa813314c4ffa551b3c.1717382583.git.maxim.cournoyer@gmail.com> MIME-Version: 1.0 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: , 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 The tools are now patched in the libblockdev plugin sources directly. * gnu/packages/freedesktop.scm (udisks) [phases]: Delete the wrap-udisksd phase. Change-Id: I0de4016adb0cb8af2dca4ef9ebec82e5951b689c --- gnu/packages/freedesktop.scm | 17 +---------------- 1 file changed, 1 insertion(+), 16 deletions(-) diff --git a/gnu/packages/freedesktop.scm b/gnu/packages/freedesktop.scm index 063816282b..39ca00296e 100644 --- a/gnu/packages/freedesktop.scm +++ b/gnu/packages/freedesktop.scm @@ -1789,22 +1789,7 @@ (define-public udisks (("girdir = .*") "girdir = $(datadir)/gir-1.0\n") (("typelibsdir = .*") - "typelibsdir = $(libdir)/girepository-1.0\n")))) - (add-after 'install 'wrap-udisksd - (lambda* (#:key outputs inputs #:allow-other-keys) - ;; Tell 'udisksd' where to find the 'mount' command. - (let ((out (assoc-ref outputs "out")) - (utils (assoc-ref inputs "util-linux")) - (cryptsetup (assoc-ref inputs "cryptsetup")) - (parted (assoc-ref inputs "parted"))) - (wrap-program (string-append out "/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