From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp12.migadu.com ([2001:41d0:403:4789::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms9.migadu.com with LMTPS id yN6UKBYNH2XegwEAauVa8A:P1 (envelope-from ) for ; Thu, 05 Oct 2023 21:23:02 +0200 Received: from aspmx1.migadu.com ([2001:41d0:403:4789::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp12.migadu.com with LMTPS id yN6UKBYNH2XegwEAauVa8A (envelope-from ) for ; Thu, 05 Oct 2023 21:23:02 +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 D44C85E891 for ; Thu, 5 Oct 2023 21:23:01 +0200 (CEST) Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20230601 header.b=Yp9D22ln; 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=1696533782; 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: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=6hYrbrpY5qIfW9zL79GiGmYcRsrP7UKOLbAl3xLcyp4=; b=B5uIBaX4DWuT5fQusLCNWhQx6oz/zZAA7JPZhotA+X+eiiVL3p86Z0HgrodLLkyPJ/LyUR xE3bHxt7J3qn2IWspelJU+WmWhzuHOOMiMDd8lGXyn5TDyxZ19W+7kTacbOE2e7Jcabwkm BFkQ7eT+3dLl6LTt9V1f30n2EIO4/u3Cg30Xl76rVrCng30Dg/1oeBhrROphJzT2ubqa7+ rSdqwTxiDEP6sf6D/gLl4bqcv/dSJb18lEZtztXjxahWQETK2Edh2MpZJBqptXiE/4H6Ts IHw5Jd5bCQF/xhrXnJftyXP8W0XVALAQDQfKMdvuCFvyAEEphHpRotwdQT4p/Q== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1696533782; a=rsa-sha256; cv=none; b=iMUcK1DKHTNXR9SxLN7EEtPgmI7L/nl2MgCSXyRQieuJ17jkWEjQx4w7TMdElFW4fsaB0Z 3dBvDMNo9DyI0uuPTPn7h1RAO0rwaY2qg5JFUS2stHMAXbuQIMeI0uahwDQNkNwfkqCqY0 FlLwosh1coTYphKbC22YEsPJiN6WhbHA268fH92nhs74YKksL/EaxoT/mjJp5Pg+BCH63X D7WwqNb5kpiMelzmoNoauEFeWq2cE/7OF6uY4DvYyMr1jej9T+zTPzoRYtjz+wssbZFzRe 9RGT2ldCREa4xSxIqeQiFqx5d5qgin74XtkSLr30imjov8hzcpvnwCgGc53fdw== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20230601 header.b=Yp9D22ln; 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) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qoTvq-0003rO-PL; Thu, 05 Oct 2023 15:22:46 -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 1qoTvo-0003pY-CC for guix-patches@gnu.org; Thu, 05 Oct 2023 15:22:44 -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 1qoTvo-0000F0-0n for guix-patches@gnu.org; Thu, 05 Oct 2023 15:22:44 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qoTw6-0004TQ-08 for guix-patches@gnu.org; Thu, 05 Oct 2023 15:23:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#65479] [PATCH core-updates v2 01/62] gnu: docbook-xml: Fix installation paths. Resent-From: Maxim Cournoyer Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 05 Oct 2023 19:23:01 +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 Cc: 65479@debbugs.gnu.org Received: via spool by 65479-submit@debbugs.gnu.org id=B65479.169653372917128 (code B ref 65479); Thu, 05 Oct 2023 19:23:01 +0000 Received: (at 65479) by debbugs.gnu.org; 5 Oct 2023 19:22:09 +0000 Received: from localhost ([127.0.0.1]:48557 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qoTvE-0004SC-Ih for submit@debbugs.gnu.org; Thu, 05 Oct 2023 15:22:08 -0400 Received: from mail-qk1-x72e.google.com ([2607:f8b0:4864:20::72e]:53500) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qoTvB-0004Rd-0U for 65479@debbugs.gnu.org; Thu, 05 Oct 2023 15:22:07 -0400 Received: by mail-qk1-x72e.google.com with SMTP id af79cd13be357-77575233636so84530185a.2 for <65479@debbugs.gnu.org>; Thu, 05 Oct 2023 12:21:46 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1696533700; x=1697138500; darn=debbugs.gnu.org; h=mime-version:user-agent:message-id:date:references:in-reply-to :subject:cc:to:from:from:to:cc:subject:date:message-id:reply-to; bh=6hYrbrpY5qIfW9zL79GiGmYcRsrP7UKOLbAl3xLcyp4=; b=Yp9D22lnU+u4WmQfhxsxey6OhOs3+kMWpmvPwxWisdZZHj36b9nrZuUnWfzcOuQ/aq YI6RYMS76jSB8gjWNKJJqC0Acf0X5Vvrzu5dJRoBcXWz+RA1K1X2C37fhzEwEWPF/Gxl wssB6DLs7lvx+nFecknFQzbBMt01ctUiIUVQUXK79sXNCXxprds8v5NNF6hyqFL4G/QM qmhnqoYZ0w/z7cQrqBu616s1/SkLVpTaP+c1hn9eGxFa2tBZq7yW0LY2n7/+oBMQST6Q xtdlLfGQxsEBfXqYI5fzcrrEMXkYL9yWsbXuJi4YeDJeKnNpte41htuMgJUTGF4NHQLP MRKg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1696533700; x=1697138500; h=mime-version:user-agent: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=6hYrbrpY5qIfW9zL79GiGmYcRsrP7UKOLbAl3xLcyp4=; b=f9RV4rEhjVM3KEEgYwjIyGz9EIOqBzvA4lgos0uyMeIHXqhGYclRL0wL7p10KA20hr TOQBGoUvM18zM6H10IF+6vNN4EiQ8GO1cKZ49h7tJePcxCR6cgtvsCdx66clhpVV1tKK KrGo3UbQDaiYnvSiV/hM1YbeMab87NNnbXoksSzHrz9ay0V2pjstMEHep/vPi1KN67og RFuHH35yUKsgQi8hNcGXHt7w8lBR/U4PXWPGr9XU9Zs9ue2Va8p0r9JBiEUVtj9D4GPP 7/p9tDmxef8S+V/NSVpgOUvtedoIt6aKXvy/ybVabjr5MUoGMHIzgzvrnSiWaZv4ge7N EdAQ== X-Gm-Message-State: AOJu0Yy+hXDCu+fanNrWR6Hcn/O11QrNTqJdTzOaZOdZN0HVDzsA4eJ8 6PcIu04OLyE9AqkpxEGnhr4uWygPpIQ= X-Google-Smtp-Source: AGHT+IFeOSeibRnKwJimkCcVAt4MhkTShkNJ0evETJ+vNX1bv/qh2zh0JB/4OTrMnFm8XjctJSeLVg== X-Received: by 2002:a0c:f052:0:b0:659:e6cb:cef9 with SMTP id b18-20020a0cf052000000b00659e6cbcef9mr6655061qvl.35.1696533700480; Thu, 05 Oct 2023 12:21:40 -0700 (PDT) Received: from hurd (dsl-151-116.b2b2c.ca. [66.158.151.116]) by smtp.gmail.com with ESMTPSA id z10-20020a0cf00a000000b006616fbcc070sm722877qvk.122.2023.10.05.12.21.39 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 05 Oct 2023 12:21:40 -0700 (PDT) From: Maxim Cournoyer In-Reply-To: <41989879ab49bc0fcc437d5f52839a3c57434ccc.1695478390.git.mirai@makinata.eu> (Bruno Victal's message of "Sat, 23 Sep 2023 15:19:36 +0100") References: <41989879ab49bc0fcc437d5f52839a3c57434ccc.1695478390.git.mirai@makinata.eu> Date: Thu, 05 Oct 2023 15:21:38 -0400 Message-ID: <87wmw0ooxp.fsf@gmail.com> User-Agent: Gnus/5.13 (Gnus v5.13) MIME-Version: 1.0 Content-Type: text/plain 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-Country: US X-Migadu-Flow: FLOW_IN X-Spam-Score: 2.76 X-Migadu-Spam-Score: 2.76 X-Migadu-Scanner: mx1.migadu.com X-Migadu-Queue-Id: D44C85E891 X-TUID: IfcRywWf1Kjz Hi! Nice series! Bruno Victal writes: > Using xml/dtd/docbook as installation path had two problems: > * The paths would conflict in profile, which made it impossible > for two different docbook-xml packages to coexist within the XML_CATALOG_FILES > variable. > * It was technically incorrect since non-DTD schemas were also placed here. > > This commit makes docbook-xml use versioned paths instead. > > * gnu/packages/docbook.scm > (docbook-xml-package, docbook-xml-4.x-package): New procedure. > (docbook-xml): Make docbook-xml an alias for docbook-xml-5.1. > (docbook-xml-5.1): New variable. > (docbook-xml-4.5, docbook-xml-4.4, docbook-xml-4.3, docbook-xml-4.2) > (docbook-xml-4.1.2): Refactor to use docbook-xml-4.x-package procedure. I think it'd be a bit more conventional to rename docbook-xml-package to 'make-docbook-xml'. It'd be nice if instead of having to have to manually override the install phase for each version the generator would handled that. Perhaps it could also accept as an arguments a list of the files to install, in the format understood by the copy-build-system. This should reduce the template inheritance & overriding boilerplate needed. -- Thanks, Maxim