From patchwork Mon Oct 9 20:06:48 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bruno Victal X-Patchwork-Id: 54686 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 0F5DD27BBE9; Mon, 9 Oct 2023 22:19: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.9 required=5.0 tests=BAYES_00,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 40C5327BBE2 for ; Mon, 9 Oct 2023 22:19:12 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qpxeO-0007YC-R3; Mon, 09 Oct 2023 17:18:52 -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 1qpxeK-0007WE-RE for guix-patches@gnu.org; Mon, 09 Oct 2023 17:18:48 -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 1qpxeK-0006zG-FZ for guix-patches@gnu.org; Mon, 09 Oct 2023 17:18:48 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qpxed-0007fa-WD; Mon, 09 Oct 2023 17:19:08 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#65479] [PATCH core-updates v3 60/63] gnu: Remove unneeded libxml2 from native-inputs. (libxslt) Resent-From: Bruno Victal Original-Sender: "Debbugs-submit" Resent-CC: leo@famulari.name, liliana.prikler@gmail.com, maxim.cournoyer@gmail.com, rg@raghavgururajan.name, me@tobias.gr, guix-patches@gnu.org Resent-Date: Mon, 09 Oct 2023 21:19:07 +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 , Leo Famulari , Liliana Marie Prikler , Maxim Cournoyer , Raghav Gururajan , Tobias Geerinckx-Rice X-Debbugs-Original-Xcc: Leo Famulari , Liliana Marie Prikler , Maxim Cournoyer , Raghav Gururajan , Tobias Geerinckx-Rice Received: via spool by 65479-submit@debbugs.gnu.org id=B65479.169688633829342 (code B ref 65479); Mon, 09 Oct 2023 21:19:07 +0000 Received: (at 65479) by debbugs.gnu.org; 9 Oct 2023 21:18:58 +0000 Received: from localhost ([127.0.0.1]:33545 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qpxeT-0007dB-Ki for submit@debbugs.gnu.org; Mon, 09 Oct 2023 17:18:58 -0400 Received: from smtpmciv1.myservices.hosting ([185.26.107.237]:57162) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qpxeR-0007d2-Jd for 65479@debbugs.gnu.org; Mon, 09 Oct 2023 17:18:56 -0400 Received: from mail1.netim.hosting (unknown [185.26.106.173]) by smtpmciv1.myservices.hosting (Postfix) with ESMTP id B6738205EC for <65479@debbugs.gnu.org>; Mon, 9 Oct 2023 23:17:43 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by mail1.netim.hosting (Postfix) with ESMTP id 31E628009B; Mon, 9 Oct 2023 23:17:43 +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 lCxTvwRFs-14; Mon, 9 Oct 2023 23:17:42 +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 7484D8009A; Mon, 9 Oct 2023 23:17:42 +0200 (CEST) From: Bruno Victal Date: Mon, 9 Oct 2023 21:06:48 +0100 Message-ID: <922f304e96eeb50dd0a1bcdbb2776aca502d5048.1696881354.git.mirai@makinata.eu> X-Mailer: git-send-email 2.41.0 In-Reply-To: References: 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 XML_CATALOG_FILES is already set within libxslt so it's unnecessary to include libxml2 for the same effect. * gnu/packages/freedesktop.scm (wayland): Remove obsolete comment. (farstream, elogind, packagekit, accountsservice, plymouth)[native-inputs]: Remove libxml2. * gnu/packages/benchmark.scm (sysbench)[native-inputs]: Ditto. * gnu/packages/cluster.scm (drbd-utils)[native-inputs]: Ditto. * gnu/packages/glib.scm (dbus)[native-inputs]: Ditto. * gnu/packages/gnome.scm (gnome-keyring, glade3, dconf, libsecret, colord) (upower, gnome-settings-daemon)[native-inputs]: Ditto. * gnu/packages/gtk.scm (gdk-pixbuf)[native-inputs]: Ditto. * gnu/packages/linux.scm (eudev)[native-inputs]: Ditto. * gnu/packages/networking.scm (iputils)[native-inputs]: Ditto. * gnu/packages/ocr.scm (tesseract-ocr)[native-inputs]: Ditto. * gnu/packages/polkit.scm (polkit)[native-inputs]: Ditto. * gnu/packages/samba.scm (samba/pinned)[native-inputs]: Ditto. * gnu/packages/sssd.scm (adcli)[native-inputs]: Ditto. * gnu/packages/terminals.scm (kmscon)[native-inputs]: Ditto. --- gnu/packages/benchmark.scm | 1 - gnu/packages/cluster.scm | 1 - gnu/packages/freedesktop.scm | 7 +------ gnu/packages/glib.scm | 1 - gnu/packages/gnome.scm | 9 +-------- gnu/packages/gtk.scm | 1 - gnu/packages/linux.scm | 1 - gnu/packages/networking.scm | 4 +--- gnu/packages/ocr.scm | 1 - gnu/packages/polkit.scm | 1 - gnu/packages/samba.scm | 3 +-- gnu/packages/sssd.scm | 1 - gnu/packages/terminals.scm | 1 - 13 files changed, 4 insertions(+), 28 deletions(-) diff --git a/gnu/packages/benchmark.scm b/gnu/packages/benchmark.scm index 4d92457e59..e83ffbde82 100644 --- a/gnu/packages/benchmark.scm +++ b/gnu/packages/benchmark.scm @@ -663,7 +663,6 @@ (define-public sysbench python-wrapper which ;; For documentation - libxml2 ;for XML_CATALOG_FILES libxslt docbook-xml docbook-xsl)) diff --git a/gnu/packages/cluster.scm b/gnu/packages/cluster.scm index 1b38015372..6c69d390f4 100644 --- a/gnu/packages/cluster.scm +++ b/gnu/packages/cluster.scm @@ -133,7 +133,6 @@ (define-public drbd-utils docbook-xml docbook-xml-4.4 ;used by documentation/ra2refentry.xsl docbook-xsl - libxml2 ;for XML_CATALOG_FILES libxslt ;for xsltproc ruby-asciidoctor)) (home-page "https://www.linbit.com/drbd/") diff --git a/gnu/packages/freedesktop.scm b/gnu/packages/freedesktop.scm index 7f290b89e3..cf8959d34c 100644 --- a/gnu/packages/freedesktop.scm +++ b/gnu/packages/freedesktop.scm @@ -275,7 +275,6 @@ (define-public farstream gobject-introspection gtk-doc/stable libtool - libxml2 ;for XML_CATALOG_FILES libxslt perl pkg-config @@ -748,7 +747,6 @@ (define-public elogind docbook-xsl gettext-minimal gperf - libxml2 ;for XML_CATALOG_FILES m4 pkg-config python @@ -979,7 +977,6 @@ (define-public packagekit gettext-minimal `(,glib "bin") gobject-introspection - libxml2 ;for XML_CATALOG_FILES libxslt pkg-config python-wrapper @@ -1185,7 +1182,7 @@ (define-public wayland (list pkg-config-for-build this-package) ;for wayland-scanner '()))) - (inputs (list expat libxml2)) ;for XML_CATALOG_FILES + (inputs (list expat libxml2)) (propagated-inputs (list libffi)) (home-page "https://wayland.freedesktop.org/") (synopsis "Core Wayland window system code and protocol") @@ -1629,7 +1626,6 @@ (define-public accountsservice `(,glib "bin") ; for gdbus-codegen, etc. gobject-introspection gtk-doc - libxml2 ;for XML_CATALOG_FILES libxslt pkg-config vala @@ -2495,7 +2491,6 @@ (define-public plymouth (native-inputs (list gettext-minimal pkg-config - libxml2 ;for XML_CATALOG_FILES libxslt docbook-xsl docbook-xml)) diff --git a/gnu/packages/glib.scm b/gnu/packages/glib.scm index b5eb4602da..31ddf0538b 100644 --- a/gnu/packages/glib.scm +++ b/gnu/packages/glib.scm @@ -153,7 +153,6 @@ (define dbus docbook-xsl doxygen xmlto - libxml2 ;for XML_CATALOG_FILES libxslt yelp-tools)) (inputs diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index de088fb6bb..107ef8bace 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -2583,7 +2583,6 @@ (define-public gnome-keyring gettext-minimal `(,glib "bin") glib ;for m4 macros - libxml2 ;for XML_CATALOG_FILES libxslt ;for documentation pkg-config python-wrapper)) ;for tests @@ -3238,7 +3237,6 @@ (define-public glade3 gobject-introspection hicolor-icon-theme itstool - libxml2 ;for XML_CATALOG_FILES libxslt ;for xsltproc python python-pygobject @@ -4673,7 +4671,6 @@ (define-public dconf (native-inputs (list bash-completion libxslt ;for xsltproc - libxml2 ;for XML_CATALOG_FILES docbook-xml-4.2 docbook-xsl `(,glib "bin") @@ -5185,7 +5182,6 @@ (define-public libsecret gettext-minimal `(,glib "bin") ;for gdbus-codegen, etc. gobject-introspection - libxml2 ;for XML_CATALOG_FILES libxslt pkg-config python @@ -5641,7 +5637,6 @@ (define-public colord (append bash-completion docbook-xsl-1.79.1 gtk-doc/stable - libxml2 ;for XML_CATALOG_FILES libxslt sane-backends vala))))) ;for VAPI, needed by simple-scan @@ -5803,8 +5798,7 @@ (define-public upower umockdev ;; For man pages. docbook-xsl - libxslt ; for 'xsltproc' - libxml2)) ; for 'XML_CATALOG_FILES' + libxslt)) ; for 'xsltproc' (inputs (list dbus-glib libgudev libusb)) (propagated-inputs @@ -5989,7 +5983,6 @@ (define-public gnome-settings-daemon docbook-xsl gettext-minimal `(,glib "bin") ;for glib-mkenums - libxml2 ;for XML_CATALOG_FILES libxslt perl pkg-config)) diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index d6a23dcaaf..f7b44e79e2 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -738,7 +738,6 @@ (define-public gdk-pixbuf ;; For the documentation. docbook-xml-4.3 docbook-xsl - libxml2 ;for XML_CATALOG_FILES libxslt)) ;for xsltproc (native-search-paths ;; This file is produced by the gdk-pixbuf-loaders-cache-file diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 66f9810d3c..b28c48bf52 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -4345,7 +4345,6 @@ (define-public eudev ;; For documentation. docbook-xml-4.2 docbook-xsl - libxml2 ;for $XML_CATALOG_FILES libxslt)) (inputs ;; When linked against libblkid, eudev can populate /dev/disk/by-label diff --git a/gnu/packages/networking.scm b/gnu/packages/networking.scm index 67a3aace09..d6d2c2a38c 100644 --- a/gnu/packages/networking.scm +++ b/gnu/packages/networking.scm @@ -1629,9 +1629,7 @@ (define-public iputils "if false"))))))) (native-inputs (list docbook-xsl docbook-xml-5.0.1 - gettext-minimal - libxml2 ;for XML_CATALOG_FILES - libxslt pkg-config)) + gettext-minimal libxslt pkg-config)) (inputs (list libcap libidn2 openssl)) (synopsis "Collection of network utilities") diff --git a/gnu/packages/ocr.scm b/gnu/packages/ocr.scm index 99ebc9d4f7..10b4459d1c 100644 --- a/gnu/packages/ocr.scm +++ b/gnu/packages/ocr.scm @@ -160,7 +160,6 @@ (define-public tesseract-ocr libarchive libtiff libtool - libxml2 ;for XML_CATALOG_FILES libxslt pkg-config tesseract-ocr-tessdata-fast)) diff --git a/gnu/packages/polkit.scm b/gnu/packages/polkit.scm index 6fe7824a57..c1162679ff 100644 --- a/gnu/packages/polkit.scm +++ b/gnu/packages/polkit.scm @@ -157,7 +157,6 @@ (define-public polkit `(,glib "bin") ;for glib-mkenums docbook-xsl ;for man page generation gobject-introspection - libxml2 ;for XML_CATALOG_FILES libxslt ;for man page generation perl pkg-config diff --git a/gnu/packages/samba.scm b/gnu/packages/samba.scm index c8b8d03521..e40fa9f7db 100644 --- a/gnu/packages/samba.scm +++ b/gnu/packages/samba.scm @@ -278,8 +278,7 @@ (define-public samba/pinned ;; For generating man pages. docbook-xml-4.2 docbook-xsl - libxslt - libxml2))) ;for XML_CATALOG_FILES + libxslt))) (home-page "https://www.samba.org/") (synopsis "The standard Windows interoperability suite of programs for GNU and Unix") diff --git a/gnu/packages/sssd.scm b/gnu/packages/sssd.scm index 34ec77213d..37398bc105 100644 --- a/gnu/packages/sssd.scm +++ b/gnu/packages/sssd.scm @@ -92,7 +92,6 @@ (define-public adcli docbook-xml-4.3 docbook-xsl libtool - libxml2 ;for XML_CATALOG_FILES libxslt util-linux ;For `rev` command used in tests. xmlto)) diff --git a/gnu/packages/terminals.scm b/gnu/packages/terminals.scm index 124f871f8e..d50e5b89af 100644 --- a/gnu/packages/terminals.scm +++ b/gnu/packages/terminals.scm @@ -343,7 +343,6 @@ (define-public kmscon automake libtool libxslt ;to build the man page - libxml2 ;for XML_CATALOG_FILES docbook-xsl)) (inputs `(("libdrm" ,libdrm)