From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp12.migadu.com ([2001:41d0:306:2d92::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms9.migadu.com with LMTPS id QHTEGOv0DmV4YwAAauVa8A:P1 (envelope-from ) for ; Sat, 23 Sep 2023 16:23:39 +0200 Received: from aspmx1.migadu.com ([2001:41d0:306:2d92::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp12.migadu.com with LMTPS id QHTEGOv0DmV4YwAAauVa8A (envelope-from ) for ; Sat, 23 Sep 2023 16:23:39 +0200 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 0E25446BA0 for ; Sat, 23 Sep 2023 16:23:39 +0200 (CEST) Authentication-Results: aspmx1.migadu.com; dkim=none; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org"; dmarc=none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1695479019; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding:resent-cc: resent-from:resent-sender:resent-message-id:in-reply-to:in-reply-to: references:references:list-id:list-help:list-unsubscribe: list-subscribe:list-post; bh=W4gB6B7fXyj6G8GyTVPvU+ivawKE9zOM04/04cutQOo=; b=s6LFa2yteV3cLLa3R7XlwnkfPRIQ2IqKF1t/YVfCV2jkLdM0x6rXF6VaTZx19rRVMTkxud /2ybsY8Gvx52DwOx7FD1iUzEjTTfj/IBAwf3rY1AVG0cXSPJmhBZP00xuUSyxGWlBMYYP6 dC2Z/2V8OAAVzTSnWHLv0GscZE8xvDTuDpBN9EjjC1dyybzAWCn5ZiSSO6THBjeHaVG3wk kY4cti1Jz/fxlbyBBMxleGzXIrcZcSWfHQKndBmDZfigwzkq0FFvVo5chByCOz/5hSHbBl WfhiJ4op9vTZ414WvVVVht1e6BzBVDleOYd6N8YJ5+YGsd29rcx552OheQnA3A== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=none; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org"; dmarc=none ARC-Seal: i=1; s=key1; d=yhetil.org; t=1695479019; a=rsa-sha256; cv=none; b=rdst/9oX8dCFrmtnwi+xrb2A8XCDimJV/M0CpBqxMEbPUL7CWzvRY5N+HNGp3S1YZpJRwc 0iYn1hDEN9edTwLrOn6xciDojnhUYYSjYRAEjEF4v4nmeOj9+BDyDOVsD4r9lSawb/9E41 mHMB2+oIEfS700GgIRXTzq2lJc5Ld9i/8Im4PajNDleJRINzPT7Uv6riEWRs2ji3tWyECu gFznpVIDuQHQO/V1bEjbSmysoMlngcwLfEp1TzIRVS9xCyeTPVvSJq7L10dQOaVPk55Abb o18ug6EglfYmiSZhQyEqCHpRLEjpclI+mgwxvD8w8bShJOLP61TFk7xKVpYLaA== Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qk3WE-0006ye-Cl; Sat, 23 Sep 2023 10:22:02 -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 1qk3WA-0006wP-Id for guix-patches@gnu.org; Sat, 23 Sep 2023 10:21:58 -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 1qk3WA-00039y-AE for guix-patches@gnu.org; Sat, 23 Sep 2023 10:21:58 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qk3WL-00083c-HC for guix-patches@gnu.org; Sat, 23 Sep 2023 10:22:09 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#65479] [PATCH core-updates v2 28/62] gnu: udisks: Rewrite using G-Expressions. Resent-From: Bruno Victal Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 23 Sep 2023 14:22:09 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 65479 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 65479@debbugs.gnu.org Cc: Bruno Victal Received: via spool by 65479-submit@debbugs.gnu.org id=B65479.169547892030811 (code B ref 65479); Sat, 23 Sep 2023 14:22:09 +0000 Received: (at 65479) by debbugs.gnu.org; 23 Sep 2023 14:22:00 +0000 Received: from localhost ([127.0.0.1]:40206 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qk3WB-00080n-Ib for submit@debbugs.gnu.org; Sat, 23 Sep 2023 10:22:00 -0400 Received: from smtpm3.myservices.hosting ([185.26.105.234]:56832) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qk3Vz-0007z9-PF for 65479@debbugs.gnu.org; Sat, 23 Sep 2023 10:21:48 -0400 Received: from mail1.netim.hosting (unknown [185.26.106.173]) by smtpm3.myservices.hosting (Postfix) with ESMTP id 36C2821080 for <65479@debbugs.gnu.org>; Sat, 23 Sep 2023 16:21:30 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by mail1.netim.hosting (Postfix) with ESMTP id 9D77880099; Sat, 23 Sep 2023 16:21:30 +0200 (CEST) X-Virus-Scanned: Debian amavisd-new at mail1.netim.hosting Received: from mail1.netim.hosting ([127.0.0.1]) by localhost (mail1-2.netim.hosting [127.0.0.1]) (amavisd-new, port 10026) with ESMTP id IEYw-rtSdmdp; Sat, 23 Sep 2023 16:21:29 +0200 (CEST) Received: from guix-nuc.home.arpa (unknown [10.192.1.83]) (Authenticated sender: lumen@makinata.eu) by mail1.netim.hosting (Postfix) with ESMTPSA id B54938009A; Sat, 23 Sep 2023 16:21:27 +0200 (CEST) From: Bruno Victal Date: Sat, 23 Sep 2023 15:20:03 +0100 Message-ID: <05a82d7ad54d31b8c5f835daaedabc40e73d9ea3.1695478390.git.mirai@makinata.eu> X-Mailer: git-send-email 2.41.0 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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+larch=yhetil.org@gnu.org Sender: guix-patches-bounces+larch=yhetil.org@gnu.org X-Migadu-Flow: FLOW_IN X-Migadu-Country: US X-Migadu-Spam-Score: -4.70 X-Migadu-Scanner: mx2.migadu.com X-Migadu-Queue-Id: 0E25446BA0 X-Spam-Score: -4.70 X-TUID: q/sZnRc9d1vu * gnu/packages/freedesktop.scm (udisks)[arguments]: Rewrite using G-Expressions. Drop trailing #t. [native-inputs]: Drop labels. --- gnu/packages/freedesktop.scm | 120 +++++++++++++++++------------------ 1 file changed, 58 insertions(+), 62 deletions(-) diff --git a/gnu/packages/freedesktop.scm b/gnu/packages/freedesktop.scm index d1f767acd6..690a83b26f 100644 --- a/gnu/packages/freedesktop.scm +++ b/gnu/packages/freedesktop.scm @@ -1504,15 +1504,15 @@ (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 (inputs @@ -1530,59 +1530,55 @@ (define-public udisks (outputs '("out" "doc")) ;5 MiB of gtk-doc HTML (arguments - `(#: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. - "--localstatedir=/var" - "--enable-fhs-media" ;mount devices in /media, not /run/media - (string-append "--with-html-dir=" - (assoc-ref %outputs "doc") - "/share/doc/udisks/html") - (string-append "--with-udevdir=" %output "/lib/udev")) - #:make-flags - (let* ((docbook-xsl-name-version ,(string-append - (package-name docbook-xsl) "-" - (package-version docbook-xsl))) - (docbook-xsl-catalog-file (string-append - (assoc-ref %build-inputs "docbook-xsl") - "/xml/xsl/" - docbook-xsl-name-version - "/catalog.xml")) - (docbook-xml-catalog-file (string-append - (assoc-ref %build-inputs "docbook-xml") - "/xml/dtd/docbook/catalog.xml"))) - ;; Reference the catalog files required to build the manpages. - (list (string-append "XML_CATALOG_FILES=" docbook-xsl-catalog-file " " - 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-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"))) - #t)))))) + (list + #: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. + "--localstatedir=/var" + "--enable-fhs-media" ;mount devices in /media, not /run/media + (string-append "--with-html-dir=" #$output:doc + "/share/doc/udisks/html") + (string-append "--with-udevdir=" #$output "/lib/udev")) + #:make-flags + #~(let* ((docbook-xsl-name-version + #$(string-append (package-name docbook-xsl) "-" + (package-version docbook-xsl))) + (docbook-xsl-catalog-file + (string-append #$(this-package-native-input "docbook-xsl") + "/xml/xsl/" docbook-xsl-name-version + "/catalog.xml")) + (docbook-xml-catalog-file + #$(file-append (this-package-native-input "docbook-xml") + "/xml/dtd/docbook/catalog.xml"))) + ;; Reference the catalog files required to build the manpages. + (list (string-append "XML_CATALOG_FILES=" docbook-xsl-catalog-file + " " 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-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"))))))))) (home-page "https://www.freedesktop.org/wiki/Software/udisks/") (synopsis "Disk manager service") (description -- 2.41.0