From patchwork Mon Oct 9 20:05:52 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bruno Victal X-Patchwork-Id: 54639 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 4F19727BBE9; Mon, 9 Oct 2023 21:08:20 +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 63F6B27BBE2 for ; Mon, 9 Oct 2023 21:08:16 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qpwXk-0005uQ-Jc; Mon, 09 Oct 2023 16:07:56 -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 1qpwXg-0005rJ-QX for guix-patches@gnu.org; Mon, 09 Oct 2023 16:07: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 1qpwXg-0007vx-IN; Mon, 09 Oct 2023 16:07:52 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qpwXy-0002V8-LQ; Mon, 09 Oct 2023 16:08:10 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#65479] [PATCH core-updates v3 04/63] gnu: libxslt: Set search-paths for XML and SGML catalogs. Resent-From: Bruno Victal Original-Sender: "Debbugs-submit" Resent-CC: guix@cbaines.net, dev@jpoiret.xyz, ludo@gnu.org, othacehe@gnu.org, rekado@elephly.net, zimon.toutoune@gmail.com, me@tobias.gr, guix-patches@gnu.org Resent-Date: Mon, 09 Oct 2023 20:08:10 +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 , Christopher Baines , Josselin Poiret , Ludovic =?utf-8?q?Court=C3=A8s?= , Mathieu Othacehe , Ricardo Wurmus , Simon Tournier , Tobias Geerinckx-Rice X-Debbugs-Original-Xcc: Christopher Baines , Josselin Poiret , Ludovic =?utf-8?q?Court=C3=A8s?= , Mathieu Othacehe , Ricardo Wurmus , Simon Tournier , Tobias Geerinckx-Rice Received: via spool by 65479-submit@debbugs.gnu.org id=B65479.16968820829439 (code B ref 65479); Mon, 09 Oct 2023 20:08:10 +0000 Received: (at 65479) by debbugs.gnu.org; 9 Oct 2023 20:08:02 +0000 Received: from localhost ([127.0.0.1]:33297 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qpwXp-0002Ru-9z for submit@debbugs.gnu.org; Mon, 09 Oct 2023 16:08:01 -0400 Received: from smtpmciv4.myservices.hosting ([185.26.107.240]:45948) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qpwXi-0002QW-30 for 65479@debbugs.gnu.org; Mon, 09 Oct 2023 16:07:54 -0400 Received: from mail1.netim.hosting (unknown [185.26.106.173]) by smtpmciv4.myservices.hosting (Postfix) with ESMTP id AD935203DB for <65479@debbugs.gnu.org>; Mon, 9 Oct 2023 22:07:16 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by mail1.netim.hosting (Postfix) with ESMTP id 22908800A1; Mon, 9 Oct 2023 22:07:16 +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 uAGhOCrTFUYz; Mon, 9 Oct 2023 22:07:15 +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 8F46C8009F; Mon, 9 Oct 2023 22:07:12 +0200 (CEST) From: Bruno Victal Date: Mon, 9 Oct 2023 21:05:52 +0100 Message-ID: <085c08f80f64fa4ecc69f741152026061bd4826d.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 According to xsltproc manpage it supports both XML_CATALOG_FILES and SGML_CATALOG_FILES for catalog lookup. Since the native-search-paths field is not thunked, doing (package-native-search-paths libxslt) can lead to module import cycles so we define a %libxslt-search-paths variable to avoid this kind of trouble. * guix/search-paths.scm (%libxslt-search-paths): New variable. * gnu/packages/xml.scm (libxslt)[native-search-paths]: Set to %libxslt-search-paths. * gnu/packages/perl.scm (perl-app-xml-docbook-builder)[native-search-paths]: Ditto. --- gnu/packages/perl.scm | 4 +--- gnu/packages/xml.scm | 1 + guix/search-paths.scm | 4 ++++ 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/gnu/packages/perl.scm b/gnu/packages/perl.scm index 267a35e560..f0b91e6b65 100644 --- a/gnu/packages/perl.scm +++ b/gnu/packages/perl.scm @@ -599,9 +599,7 @@ (define-public perl-app-xml-docbook-builder (list libxslt)) (propagated-inputs (list perl-class-xsaccessor perl-test-trap)) - (native-search-paths - ;; xsltproc's search paths, to avoid propagating libxslt. - (list $XML_CATALOG_FILES)) + (native-search-paths %libxslt-search-paths) (home-page "https://www.shlomifish.org/open-source/projects/docmake/") (synopsis "Translate DocBook/XML documentation into other file formats") (description diff --git a/gnu/packages/xml.scm b/gnu/packages/xml.scm index 16aabffca8..0b31bb5928 100644 --- a/gnu/packages/xml.scm +++ b/gnu/packages/xml.scm @@ -365,6 +365,7 @@ (define-public libxslt xz)) (native-inputs (list pkg-config)) + (native-search-paths %libxslt-search-paths) (description "Libxslt is an XSLT C library developed for the GNOME project. It is based on libxml for XML parsing, tree manipulation and XPath support.") diff --git a/guix/search-paths.scm b/guix/search-paths.scm index d325e57989..a935684952 100644 --- a/guix/search-paths.scm +++ b/guix/search-paths.scm @@ -46,6 +46,7 @@ (define-module (guix search-paths) $XML_CATALOG_FILES %gcc-search-paths + %libxslt-search-paths search-path-specification->sexp sexp->search-path-specification @@ -179,6 +180,9 @@ (define $XML_CATALOG_FILES (file-pattern "^catalog\\.xml$") (file-type 'regular))) +(define %libxslt-search-paths + (list $SGML_CATALOG_FILES $XML_CATALOG_FILES)) + (define (search-path-specification->sexp spec) "Return an sexp representing SPEC, a . The sexp corresponds to the arguments expected by `set-path-environment-variable'."