From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp11.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 IJeKIihIEWUWDwEA9RJhRA:P1 (envelope-from ) for ; Mon, 25 Sep 2023 10:43:20 +0200 Received: from aspmx1.migadu.com ([2001:41d0:306:2d92::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp11.migadu.com with LMTPS id IJeKIihIEWUWDwEA9RJhRA (envelope-from ) for ; Mon, 25 Sep 2023 10:43:20 +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 49A163220B for ; Mon, 25 Sep 2023 10:43:20 +0200 (CEST) Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20230601 header.b=JbXrfzo0; 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=fail reason="SPF not aligned (relaxed)" header.from=gmail.com (policy=none) ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1695631400; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: 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:dkim-signature; bh=VkPARBKJVPv9AbqajH4/mDERJbBqP7qgFbAmRmCoMQ4=; b=lsCU08JguedMv/PSLTU9jqzvIaIOqe8dNgpSNkUetyoUXBZv5Xi+W4qRgmCkZh6LNbyihL IFrXKBt8Efr4w5F/Z8Wd5l5mdrjiNZ2ZFE7LNezc77ajdebXQ8CZaUd90KpJ5tSSgBW8We fLSgT80Iw2SzQmj/LrOZY3jJ40cKPTpCqhkwTnrAFjpmxFirwOUXYaO7H3THrFNsEXeYfR f356QtqHI4oQVD0ZpY4fy8JAu1EWksjvxerO82u74U3qJNTg1r5ttEIOHMebfbhJfDfYIh rApKezC6W1+aWe/kMav9IYBqdSzmP4r2oox8uyWE9alNqyfmKjwXOhP+b54tqQ== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20230601 header.b=JbXrfzo0; 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=fail reason="SPF not aligned (relaxed)" header.from=gmail.com (policy=none) ARC-Seal: i=1; s=key1; d=yhetil.org; t=1695631400; a=rsa-sha256; cv=none; b=tUJJ0A5IEGjDz4ulasNfiagXHgPCyzoQQ3m1EhgW+Rk4s6XHkFY7RmoL2U9joUNin2k7W+ lfsSEtn04BIUugQ65X/t3NM4KKMLoQlGLkoFOOurzBytvBXU6Ra49ICWNTdyJtXfM0yitw iiRppy1gignLsYmpc8vtZHcVrfxkAiZDxlVJDdSSYqoyCmOMOVeihAkHGM0WQkkGUQsRT4 RB/jpjZ06dxerK/3yVDCyp2mAx0RIUZckgrWga6i9Mr1v8RYlqsb9uyaL1zqqtzbIJMqYc qfXocolH42Kvt8GNtR36GDNQu+hvy3fNVSs59qNB8V/gvGWbDPgAVi05KD752A== Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qkhBB-0005FJ-8S; Mon, 25 Sep 2023 04:42:57 -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 1qkhB4-0005Cu-Rx for guix-patches@gnu.org; Mon, 25 Sep 2023 04:42: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 1qkhB4-00089c-F0 for guix-patches@gnu.org; Mon, 25 Sep 2023 04:42:50 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qkhBG-0007H0-Mv for guix-patches@gnu.org; Mon, 25 Sep 2023 04:43:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#65479] [PATCH core-updates v2 12/62] search-paths: Add $XML_CATALOG_FILES and $SGML_CATALOG_FILES. Resent-From: Simon Tournier Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 25 Sep 2023 08:43:02 +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: Bruno Victal , 65479@debbugs.gnu.org Cc: Josselin Poiret , Mathieu Othacehe , Ludovic =?UTF-8?Q?Court=C3=A8s?= , Tobias Geerinckx-Rice , Ricardo Wurmus , Bruno Victal , Christopher Baines Received: via spool by 65479-submit@debbugs.gnu.org id=B65479.169563135127876 (code B ref 65479); Mon, 25 Sep 2023 08:43:02 +0000 Received: (at 65479) by debbugs.gnu.org; 25 Sep 2023 08:42:31 +0000 Received: from localhost ([127.0.0.1]:44117 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qkhAk-0007FS-DV for submit@debbugs.gnu.org; Mon, 25 Sep 2023 04:42:30 -0400 Received: from mail-wr1-x42a.google.com ([2a00:1450:4864:20::42a]:38251) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qkhAi-0007F7-O7 for 65479@debbugs.gnu.org; Mon, 25 Sep 2023 04:42:29 -0400 Received: by mail-wr1-x42a.google.com with SMTP id ffacd0b85a97d-3216b83c208so650813f8f.1 for <65479@debbugs.gnu.org>; Mon, 25 Sep 2023 01:42:16 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1695631330; x=1696236130; darn=debbugs.gnu.org; h=content-transfer-encoding:mime-version:message-id:date:references :in-reply-to:subject:cc:to:from:from:to:cc:subject:date:message-id :reply-to; bh=VkPARBKJVPv9AbqajH4/mDERJbBqP7qgFbAmRmCoMQ4=; b=JbXrfzo0km7BpIcqv4OGxFaDbJEmHPhtQFmNAg7FsRC8jdUFXpq8AWAwEYibL5D4XC e2fe/e5h7jfxuPsZGqszt26s6UX30oekZU55AMsk7wyVatHntGjbwmx/5M+1zRFOKx5S LeKd0VRtmAAbjLKv3Gv1jLnX+iJTot1GkX3ZFFRlBlLiHGwOVCh8rMNSlR9qrec0u3Cp +0rfOYAD5DFYCuz88hcSmq1FOgmfln2RMBLM0dpihnXy0YFWCx/zcnty1ToE9GoK8ou6 Wstdc+Bh7qVVnfJFJLZhX0rwaGgHrRyViCn+M9+aKYoNdbohkY/B/Sag9WYtUp0HaVIF vOBQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1695631330; x=1696236130; h=content-transfer-encoding:mime-version:message-id:date:references :in-reply-to:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=VkPARBKJVPv9AbqajH4/mDERJbBqP7qgFbAmRmCoMQ4=; b=CEzFKqVyQhGpD+NJZ8NUNTZBDyR/aMCUHXTr4a/LibxyrmqJ4BDFUEoHlU5nOyKvNm sVwUP/NO9voHH1f4gOxhELfDqVWAt2ruaNsZbvaq1wohlykm3REJW1KqjA7KVwAmPXs+ NA0iWU5+A63cmegUqp4hxsqhKn572hCAKqO//fxW6sjqndEw80930IGxaO62G9dhCi19 Dc9fqtReiud+auDKEU+dxRf672R/C95kVMeue5EgeuL4ciu5SvYFgUuWlntVidzHpmcX 0Ft+eNqWQWDiRrxq6emBu5/m6XfuCDhj3puokzsBf5nOzlZzOvFKR+4R71IMuuPlB78k LxQA== X-Gm-Message-State: AOJu0YwCPdrk1Ys+k0uksWHqPyrM4uz2UtZERfKTV1wJekNqOwtQwtuO a+74VEvz/JshdLV9uI1Prl4= X-Google-Smtp-Source: AGHT+IESZ4YwTCEmNm2RZwMYLC1dyZiKZRjm47GoQIQy5O9TdlRGIL1F5scgX+TDe3yh86fI2KhvAA== X-Received: by 2002:adf:e945:0:b0:31a:e29f:5eab with SMTP id m5-20020adfe945000000b0031ae29f5eabmr5480878wrn.7.1695631330584; Mon, 25 Sep 2023 01:42:10 -0700 (PDT) Received: from pfiuh07 ([193.48.40.241]) by smtp.gmail.com with ESMTPSA id b12-20020adff90c000000b0031fb91f23e9sm11165979wrr.43.2023.09.25.01.42.10 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 25 Sep 2023 01:42:10 -0700 (PDT) From: Simon Tournier In-Reply-To: References: Date: Mon, 25 Sep 2023 10:00:50 +0200 Message-ID: <87lecu7kct.fsf@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable 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.10 X-Migadu-Scanner: mx2.migadu.com X-Migadu-Queue-Id: 49A163220B X-Spam-Score: -4.10 X-TUID: IFScHs05Xm29 Hi, A naive question. :-) On Sat, 23 Sep 2023 at 15:19, Bruno Victal wrote: > diff --git a/doc/guix.texi b/doc/guix.texi > index 346af01e9d..5e7df75976 100644 > --- a/doc/guix.texi > +++ b/doc/guix.texi > @@ -11132,17 +11132,14 @@ Search Paths > to be found in @file{xml} sub-directories---nothing less. The search > path specification looks like this: >=20=20 > +@c This is defined at (guix search-paths) as $XML_CATALOG_FILES. > @lisp > -(package > - (name "libxml2") > - ;; some fields omitted > - (native-search-paths > - (list (search-path-specification > - (variable "XML_CATALOG_FILES") > - (separator " ") > - (files '("xml")) > - (file-pattern "^catalog\\.xml$") > - (file-type 'regular))))) > +(search-path-specification > + (variable "XML_CATALOG_FILES") > + (separator " ") > + (files '("xml")) > + (file-pattern "^catalog\\.xml$") > + (file-type 'regular)) > @end lisp I do not see much the difference, except the =E2=80=99package=E2=80=99 part. [...] > diff --git a/gnu/packages/perl.scm b/gnu/packages/perl.scm > index 8b82c272fc..267a35e560 100644 > --- a/gnu/packages/perl.scm > +++ b/gnu/packages/perl.scm > @@ -601,12 +601,7 @@ (define-public perl-app-xml-docbook-builder > (list perl-class-xsaccessor perl-test-trap)) > (native-search-paths > ;; xsltproc's search paths, to avoid propagating libxslt. > - (list (search-path-specification > - (variable "XML_CATALOG_FILES") > - (separator " ") > - (files '("xml")) > - (file-pattern "^catalog\\.xml$") > - (file-type 'regular)))) > + (list $XML_CATALOG_FILES)) And here that=E2=80=99s not the new example from the manual. Somehow, the = way using =E2=80=99(search-path-specification (variable "XML_CATALOG_FILES") = =E2=80=A6) seems documented but not (list $XML_CATALOG_FILES). And that is confusing me. > diff --git a/guix/search-paths.scm b/guix/search-paths.scm > index 8dc81861c9..752dc8099b 100644 > --- a/guix/search-paths.scm > +++ b/guix/search-paths.scm > @@ -38,6 +38,8 @@ (define-module (guix search-paths) > $SSL_CERT_DIR > $SSL_CERT_FILE > $TZDIR > + $SGML_CATALOG_FILES > + $XML_CATALOG_FILES [...] > +;; Some packages (notably libxml2) make use of 'XML_CATALOG_FILES' > +;; and 'SGML_CATALOG_FILES' for remapping URI references or public/system > +;; identifiers to other URI references. > +(define $SGML_CATALOG_FILES > + ;; $SGML_CATALOG_FILES lists 'catalog' or 'CATALOG' or '*.cat' files f= ound > + ;; under the 'sgml' sub-directory of any given package. > + (search-path-specification > + (variable "SGML_CATALOG_FILES") > + (separator ":") > + (files '("sgml")) > + (file-pattern "^catalog$|^CATALOG$|^.*\\.cat$") > + (file-type 'regular))) > + > +(define $XML_CATALOG_FILES > + ;; $XML_CATALOG_FILES lists 'catalog.xml' files found in under the 'xm= l' > + ;; sub-directory of any given package. > + (search-path-specification > + (variable "XML_CATALOG_FILES") > + (separator " ") > + (files '("xml")) > + (file-pattern "^catalog\\.xml$") > + (file-type 'regular))) Well, somehow the manual should provide an example using, (search-path-specification (variable "SOMETHING_RELEVANT") (separator " ") (files '("foo")) (file-pattern "^catalog\\.bar$") (file-type 'regular)) instead of the one using XML_CATALOG_FILES, especially if this former is now replaced by the shorthand $XML_CATALOG_FILES. Else, I am confused. Cheers, simon