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