From unknown Fri Jun 20 07:26:27 2025 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 X-Mailer: MIME-tools 5.509 (Entity 5.509) Content-Type: text/plain; charset=utf-8 From: bug#53454 <53454@debbugs.gnu.org> To: bug#53454 <53454@debbugs.gnu.org> Subject: Status: [PATCH core-updates 0/1] gnu: texlive-psnfss: Fix build; add "doc" output. Reply-To: bug#53454 <53454@debbugs.gnu.org> Date: Fri, 20 Jun 2025 14:26:27 +0000 retitle 53454 [PATCH core-updates 0/1] gnu: texlive-psnfss: Fix build; add = "doc" output. reassign 53454 guix-patches submitter 53454 Simon South severity 53454 normal tag 53454 patch thanks From debbugs-submit-bounces@debbugs.gnu.org Sat Jan 22 14:24:20 2022 Received: (at submit) by debbugs.gnu.org; 22 Jan 2022 19:24:20 +0000 Received: from localhost ([127.0.0.1]:37948 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nBLzo-0004BD-IH for submit@debbugs.gnu.org; Sat, 22 Jan 2022 14:24:20 -0500 Received: from lists.gnu.org ([209.51.188.17]:57340) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nBLzm-0004B5-HH for submit@debbugs.gnu.org; Sat, 22 Jan 2022 14:24:18 -0500 Received: from eggs.gnu.org ([209.51.188.92]:44738) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nBLze-00008H-0C for guix-patches@gnu.org; Sat, 22 Jan 2022 14:24:16 -0500 Received: from mailout.easymail.ca ([64.68.200.34]:44722) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nBLzb-0000Rn-T2 for guix-patches@gnu.org; Sat, 22 Jan 2022 14:24:09 -0500 Received: from localhost (localhost [127.0.0.1]) by mailout.easymail.ca (Postfix) with ESMTP id 2C07241FA7 for ; Sat, 22 Jan 2022 19:24:04 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at emo02-pco.easydns.vpn Received: from mailout.easymail.ca ([127.0.0.1]) by localhost (emo02-pco.easydns.vpn [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id FhYAqkbReqU2 for ; Sat, 22 Jan 2022 19:24:04 +0000 (UTC) Received: from laptop.simonsouth.net (23-233-96-244.cpe.pppoe.ca [23.233.96.244]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mailout.easymail.ca (Postfix) with ESMTPSA id E29DB41F7F for ; Sat, 22 Jan 2022 19:24:03 +0000 (UTC) From: Simon South To: guix-patches@gnu.org Subject: [PATCH core-updates 0/1] gnu: texlive-psnfss: Fix build; add "doc" output. Date: Sat, 22 Jan 2022 14:24:01 -0500 Message-Id: X-Mailer: git-send-email 2.25.2 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=64.68.200.34; envelope-from=simon@simonsouth.net; helo=mailout.easymail.ca X-Spam_score_int: -41 X-Spam_score: -4.2 X-Spam_bar: ---- X-Spam_report: (-4.2 / 5.0 requ) BAYES_00=-1.9, RCVD_IN_DNSWL_MED=-2.3, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-Spam-Score: -1.3 (-) X-Debbugs-Envelope-To: submit X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -2.3 (--) This patch fixes the texlive-psnfss package, adding a number of missing files as well as a "doc" output with the package's PDF documentation. The current texlive-psnfss package is clearly incomplete: It contains only the package's source and its generated .sty files, the latter of which are actually included twice. Mostly this is due to the package definition not chdir'ing back out of a work directory before the "copy-files" phase runs. This patch adds the missing installation steps, which include arranging files in the output to match the instructions in the package's README file.[0] I've tested this as best I can: The package and its immediate dependencies[1] build fine on both x86-64 and AArch64, and the updated package now works as expected with the TeX source I'm using. [0] https://ctan.math.ca/tex-archive/macros/latex/required/psnfss/README [1] texlive-base, texlive-charter and texlive-tiny. -- Simon South simon@simonsouth.net Simon South (1): gnu: texlive-psnfss: Fix build; add "doc" output. gnu/packages/tex.scm | 34 +++++++++++++++++++++++++++++++++- 1 file changed, 33 insertions(+), 1 deletion(-) base-commit: 80194d9e47f9f50602a5a97ecd33fb9a95dfe03d -- 2.34.0 From debbugs-submit-bounces@debbugs.gnu.org Sat Jan 22 14:28:55 2022 Received: (at 53454) by debbugs.gnu.org; 22 Jan 2022 19:28:55 +0000 Received: from localhost ([127.0.0.1]:37953 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nBM4F-0004I3-7q for submit@debbugs.gnu.org; Sat, 22 Jan 2022 14:28:55 -0500 Received: from mailout.easymail.ca ([64.68.200.34]:56738) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nBM4D-0004Hq-68 for 53454@debbugs.gnu.org; Sat, 22 Jan 2022 14:28:54 -0500 Received: from localhost (localhost [127.0.0.1]) by mailout.easymail.ca (Postfix) with ESMTP id A76A0C8515 for <53454@debbugs.gnu.org>; Sat, 22 Jan 2022 19:28:47 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at emo01-pco.easydns.vpn Received: from mailout.easymail.ca ([127.0.0.1]) by localhost (emo01-pco.easydns.vpn [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id UrUQV_6Q3Gia for <53454@debbugs.gnu.org>; Sat, 22 Jan 2022 19:28:45 +0000 (UTC) Received: from laptop.simonsouth.net (23-233-96-244.cpe.pppoe.ca [23.233.96.244]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mailout.easymail.ca (Postfix) with ESMTPSA id B6041C84D2 for <53454@debbugs.gnu.org>; Sat, 22 Jan 2022 19:28:45 +0000 (UTC) From: Simon South To: 53454@debbugs.gnu.org Subject: [PATCH core-updates 1/1] gnu: texlive-psnfss: Fix build; add "doc" output. Date: Sat, 22 Jan 2022 14:28:43 -0500 Message-Id: <6de30164aa84e0b7ce303177637f995b177e1778.1642877796.git.simon@simonsouth.net> X-Mailer: git-send-email 2.25.2 In-Reply-To: References: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 53454 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) * gnu/packages/tex.scm (texlive-psnfss)[outputs]: Add "doc". [arguments]: Add "chdir-back", "clean-installed-files" and "move-doc-files" phases to ensure files are correctly arranged in package's outputs, matching installation instructions in README. --- gnu/packages/tex.scm | 34 +++++++++++++++++++++++++++++++++- 1 file changed, 33 insertions(+), 1 deletion(-) diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm index ebb7f86552..a81d326b6d 100644 --- a/gnu/packages/tex.scm +++ b/gnu/packages/tex.scm @@ -20,6 +20,7 @@ ;;; Copyright © 2021 Ivan Gankevich ;;; Copyright © 2021 Julien Lepiller ;;; Copyright © 2021 Thiago Jung Bauermann +;;; Copyright © 2022 Simon South ;;; ;;; This file is part of GNU Guix. ;;; @@ -4089,6 +4090,7 @@ (define-public texlive-psnfss "11f14dzhwsy4pli21acccip43d36nf3pac33ihjffnps1i2mhqkd")))) (package (inherit template) + (outputs '("out" "doc")) (arguments (substitute-keyword-arguments (package-arguments template) ((#:tex-directory _ #t) @@ -4097,7 +4099,37 @@ (define-public texlive-psnfss `(modify-phases ,phases (add-after 'unpack 'chdir (lambda _ - (chdir "source/latex/psnfss") #t)))))) + (chdir "source/latex/psnfss") #t)) + (add-after 'install 'chdir-back + (lambda _ + (chdir "../../..") #t)) + (add-after 'chdir-back 'clean-installed-files + (lambda _ + ;; Remove the generated .sty files from the build area as + ;; these were already copied to the default output in the + ;; "install" phase. + (delete-file-recursively "source/latex/psnfss/build") + #t)) + (add-after 'clean-installed-files 'move-doc-files + (lambda* (#:key outputs #:allow-other-keys) + (let* ((doc (assoc-ref outputs "doc")) + (doc-root (string-append doc "/share/texmf-dist")) + (doc-path "doc/latex/psnfss") + (source-path "source/latex/psnfss")) + ;; Move the PDF documentation to the "doc" output. + (let* ((file-name "psnfss2e.pdf") + (source (string-append doc-path "/" file-name)) + (target-dir (string-append doc-root "/" doc-path))) + (mkdir-p target-dir) + (copy-file source + (string-append target-dir "/" file-name)) + (delete-file source)) + + ;; Keep the remaining files together with the package's + ;; source, as per the installation instructions. + (copy-recursively doc-path source-path) + (delete-file-recursively "doc")) + #t)))))) (native-inputs (list texlive-cm)) (home-page "https://www.ctan.org/pkg/psnfss") -- 2.34.0 From debbugs-submit-bounces@debbugs.gnu.org Sat Jan 22 14:35:44 2022 Received: (at 53454) by debbugs.gnu.org; 22 Jan 2022 19:35:44 +0000 Received: from localhost ([127.0.0.1]:37973 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nBMAq-0004US-8N for submit@debbugs.gnu.org; Sat, 22 Jan 2022 14:35:44 -0500 Received: from albert.telenet-ops.be ([195.130.137.90]:50278) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nBMAo-0004SN-Vd for 53454@debbugs.gnu.org; Sat, 22 Jan 2022 14:35:43 -0500 Received: from ptr-bvsjgyhxw7psv60dyze.18120a2.ip6.access.telenet.be ([IPv6:2a02:1811:8c09:9d00:3c5f:2eff:feb0:ba5a]) by albert.telenet-ops.be with bizsmtp id lvbi2600X4UW6Th06vbii6; Sat, 22 Jan 2022 20:35:42 +0100 Message-ID: Subject: Re: [bug#53454] [PATCH core-updates 1/1] gnu: texlive-psnfss: Fix build; add "doc" output. From: Maxime Devos To: Simon South , 53454@debbugs.gnu.org Date: Sat, 22 Jan 2022 20:35:42 +0100 In-Reply-To: <6de30164aa84e0b7ce303177637f995b177e1778.1642877796.git.simon@simonsouth.net> References: <6de30164aa84e0b7ce303177637f995b177e1778.1642877796.git.simon@simonsouth.net> Content-Type: text/plain; charset="UTF-8" User-Agent: Evolution 3.38.3-1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=telenet.be; s=r22; t=1642880142; bh=4/EKi/0mdbdlpl13QT7xmYx604XNk4mLlcOGU7onAJ0=; h=Subject:From:To:Date:In-Reply-To:References; b=C/FLGc7d9Mgms24lgwsue2PKdwrtqHryIgVF4MWi/y4B65OKPqAx0jBs+GQkZwBQn 7Dw89bObsIs0pLRlNiH5hf3JziLKGxVxcdGJIcCmqYIWVdogvDDdUf24TCOtMNGSp/ f6n2U4AJrShwvVSrG6hCR7mayaqGuezXRPb9JVdXLeB24TFjyf40Zc2FcFAgZovtNZ 8nlV8zCk08Q2mfuCa5TvhafTuubIz1UOmauh8F7cE9XreQ3GKSI6xvU4U8skfq+i2L L/EpT0/epCLJD+tSXZ3I4cElbg3/qV5xjcW/A836DDwlCNqhLA73OfHhUlCKxuo1Xg 80jwzL6ZjT/0g== X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 53454 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) Simon South schreef op za 22-01-2022 om 14:28 [-0500]: > +             (add-after 'install 'chdir-back > +               (lambda _ > +                 (chdir "../../..") #t)) Trailing #t are no longer necessary. Greetings, Maxime. From debbugs-submit-bounces@debbugs.gnu.org Sat Jan 22 18:19:34 2022 Received: (at 53454) by debbugs.gnu.org; 22 Jan 2022 23:19:34 +0000 Received: from localhost ([127.0.0.1]:38173 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nBPfS-0001fY-3Q for submit@debbugs.gnu.org; Sat, 22 Jan 2022 18:19:34 -0500 Received: from mailout.easymail.ca ([64.68.200.34]:38198) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nBPfQ-0001fI-6i for 53454@debbugs.gnu.org; Sat, 22 Jan 2022 18:19:33 -0500 Received: from localhost (localhost [127.0.0.1]) by mailout.easymail.ca (Postfix) with ESMTP id 7282D7400C for <53454@debbugs.gnu.org>; Sat, 22 Jan 2022 23:19:26 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at emo05-pco.easydns.vpn Received: from mailout.easymail.ca ([127.0.0.1]) by localhost (emo05-pco.easydns.vpn [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id TW0Aj_LpuOsK for <53454@debbugs.gnu.org>; Sat, 22 Jan 2022 23:19:26 +0000 (UTC) Received: from laptop.simonsouth.net (23-233-96-244.cpe.pppoe.ca [23.233.96.244]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mailout.easymail.ca (Postfix) with ESMTPSA id 2B8E273E51 for <53454@debbugs.gnu.org>; Sat, 22 Jan 2022 23:19:26 +0000 (UTC) From: Simon South To: 53454@debbugs.gnu.org Subject: [PATCH core-updates v2 0/2] gnu: texlive-psnfss: Fix build; add "doc" output. Date: Sat, 22 Jan 2022 18:19:22 -0500 Message-Id: X-Mailer: git-send-email 2.25.2 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 53454 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) Here's v2 of this fix for the texlive-psnfss package. This version omits the trailing "#t" from phases, based on Maxime's feedback, and adds a commit that removes the "#t" from the existing "chdir" phase. Other than a small tweak to the commit message in the second patch everything else is unchanged from v1. Here's the original description: This patch fixes the texlive-psnfss package, adding a number of missing files as well as a "doc" output with the package's PDF documentation. The current texlive-psnfss package is clearly incomplete: It contains only the package's source and its generated .sty files, the latter of which are actually included twice. Mostly this is due to the package definition not chdir'ing back out of a work directory before the "copy-files" phase runs. This patch adds the missing installation steps, which include arranging files in the output to match the instructions in the package's README file.[0] I've tested this as best I can: The package and its immediate dependencies[1] build fine on both x86-64 and AArch64, and the updated package now works as expected with the TeX source I'm using. [0] https://ctan.math.ca/tex-archive/macros/latex/required/psnfss/README [1] texlive-base, texlive-charter and texlive-tiny. -- Simon South simon@simonsouth.net Simon South (2): gnu: texlive-psnfss: Do not return #t from custom phase. gnu: texlive-psnfss: Fix build; add "doc" output. gnu/packages/tex.scm | 32 +++++++++++++++++++++++++++++++- 1 file changed, 31 insertions(+), 1 deletion(-) base-commit: 80194d9e47f9f50602a5a97ecd33fb9a95dfe03d -- 2.34.0 From debbugs-submit-bounces@debbugs.gnu.org Sat Jan 22 18:19:37 2022 Received: (at 53454) by debbugs.gnu.org; 22 Jan 2022 23:19:37 +0000 Received: from localhost ([127.0.0.1]:38175 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nBPfV-0001fm-Dd for submit@debbugs.gnu.org; Sat, 22 Jan 2022 18:19:37 -0500 Received: from mailout.easymail.ca ([64.68.200.34]:38220) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nBPfQ-0001fK-M3 for 53454@debbugs.gnu.org; Sat, 22 Jan 2022 18:19:34 -0500 Received: from localhost (localhost [127.0.0.1]) by mailout.easymail.ca (Postfix) with ESMTP id 72A6E73E51 for <53454@debbugs.gnu.org>; Sat, 22 Jan 2022 23:19:27 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at emo05-pco.easydns.vpn Received: from mailout.easymail.ca ([127.0.0.1]) by localhost (emo05-pco.easydns.vpn [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 7_2ReS-xjWkK for <53454@debbugs.gnu.org>; Sat, 22 Jan 2022 23:19:26 +0000 (UTC) Received: from laptop.simonsouth.net (23-233-96-244.cpe.pppoe.ca [23.233.96.244]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mailout.easymail.ca (Postfix) with ESMTPSA id 4718B73F49 for <53454@debbugs.gnu.org>; Sat, 22 Jan 2022 23:19:26 +0000 (UTC) From: Simon South To: 53454@debbugs.gnu.org Subject: [PATCH core-updates v2 1/2] gnu: texlive-psnfss: Do not return #t from custom phase. Date: Sat, 22 Jan 2022 18:19:23 -0500 Message-Id: X-Mailer: git-send-email 2.25.2 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 53454 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) * gnu/packages/tex.scm (texlive-psnfss)[arguments]<#:phases>: Remove trailing #t from "chdir" phase. --- gnu/packages/tex.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm index ebb7f86552..9649b1361b 100644 --- a/gnu/packages/tex.scm +++ b/gnu/packages/tex.scm @@ -4097,7 +4097,7 @@ (define-public texlive-psnfss `(modify-phases ,phases (add-after 'unpack 'chdir (lambda _ - (chdir "source/latex/psnfss") #t)))))) + (chdir "source/latex/psnfss"))))))) (native-inputs (list texlive-cm)) (home-page "https://www.ctan.org/pkg/psnfss") -- 2.34.0 From debbugs-submit-bounces@debbugs.gnu.org Sat Jan 22 18:19:41 2022 Received: (at 53454) by debbugs.gnu.org; 22 Jan 2022 23:19:41 +0000 Received: from localhost ([127.0.0.1]:38177 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nBPfY-0001g1-OG for submit@debbugs.gnu.org; Sat, 22 Jan 2022 18:19:41 -0500 Received: from mailout.easymail.ca ([64.68.200.34]:38252) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nBPfR-0001fM-Kp for 53454@debbugs.gnu.org; Sat, 22 Jan 2022 18:19:39 -0500 Received: from localhost (localhost [127.0.0.1]) by mailout.easymail.ca (Postfix) with ESMTP id 6DC5173CA0 for <53454@debbugs.gnu.org>; Sat, 22 Jan 2022 23:19:28 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at emo05-pco.easydns.vpn Received: from mailout.easymail.ca ([127.0.0.1]) by localhost (emo05-pco.easydns.vpn [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id pmYv7H7Y7eHB for <53454@debbugs.gnu.org>; Sat, 22 Jan 2022 23:19:26 +0000 (UTC) Received: from laptop.simonsouth.net (23-233-96-244.cpe.pppoe.ca [23.233.96.244]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mailout.easymail.ca (Postfix) with ESMTPSA id 74F867400D for <53454@debbugs.gnu.org>; Sat, 22 Jan 2022 23:19:26 +0000 (UTC) From: Simon South To: 53454@debbugs.gnu.org Subject: [PATCH core-updates v2 2/2] gnu: texlive-psnfss: Fix build; add "doc" output. Date: Sat, 22 Jan 2022 18:19:24 -0500 Message-Id: <2bd3449f24d3d85e9bce5e0bdd7c69408a1aa06f.1642892611.git.simon@simonsouth.net> X-Mailer: git-send-email 2.25.2 In-Reply-To: References: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 53454 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) * gnu/packages/tex.scm (texlive-psnfss)[outputs]: Add "doc". [arguments]<#:phases>: Add "chdir-back", "clean-installed-files" and "move-doc-files" phases to ensure files are correctly arranged in package's outputs, matching installation instructions in README. --- gnu/packages/tex.scm | 32 +++++++++++++++++++++++++++++++- 1 file changed, 31 insertions(+), 1 deletion(-) diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm index 9649b1361b..5ac4012e36 100644 --- a/gnu/packages/tex.scm +++ b/gnu/packages/tex.scm @@ -20,6 +20,7 @@ ;;; Copyright © 2021 Ivan Gankevich ;;; Copyright © 2021 Julien Lepiller ;;; Copyright © 2021 Thiago Jung Bauermann +;;; Copyright © 2022 Simon South ;;; ;;; This file is part of GNU Guix. ;;; @@ -4089,6 +4090,7 @@ (define-public texlive-psnfss "11f14dzhwsy4pli21acccip43d36nf3pac33ihjffnps1i2mhqkd")))) (package (inherit template) + (outputs '("out" "doc")) (arguments (substitute-keyword-arguments (package-arguments template) ((#:tex-directory _ #t) @@ -4097,7 +4099,35 @@ (define-public texlive-psnfss `(modify-phases ,phases (add-after 'unpack 'chdir (lambda _ - (chdir "source/latex/psnfss"))))))) + (chdir "source/latex/psnfss"))) + (add-after 'install 'chdir-back + (lambda _ + (chdir "../../.."))) + (add-after 'chdir-back 'clean-installed-files + (lambda _ + ;; Remove the generated .sty files from the build area as + ;; these were already copied to the default output in the + ;; "install" phase. + (delete-file-recursively "source/latex/psnfss/build"))) + (add-after 'clean-installed-files 'move-doc-files + (lambda* (#:key outputs #:allow-other-keys) + (let* ((doc (assoc-ref outputs "doc")) + (doc-root (string-append doc "/share/texmf-dist")) + (doc-path "doc/latex/psnfss") + (source-path "source/latex/psnfss")) + ;; Move the PDF documentation to the "doc" output. + (let* ((file-name "psnfss2e.pdf") + (source (string-append doc-path "/" file-name)) + (target-dir (string-append doc-root "/" doc-path))) + (mkdir-p target-dir) + (copy-file source + (string-append target-dir "/" file-name)) + (delete-file source)) + + ;; Keep the remaining files together with the package's + ;; source, as per the installation instructions. + (copy-recursively doc-path source-path) + (delete-file-recursively "doc")))))))) (native-inputs (list texlive-cm)) (home-page "https://www.ctan.org/pkg/psnfss") -- 2.34.0 From debbugs-submit-bounces@debbugs.gnu.org Mon Mar 28 06:04:22 2022 Received: (at 53454-done) by debbugs.gnu.org; 28 Mar 2022 10:04:22 +0000 Received: from localhost ([127.0.0.1]:57332 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nYmEY-00009d-7d for submit@debbugs.gnu.org; Mon, 28 Mar 2022 06:04:22 -0400 Received: from eggs.gnu.org ([209.51.188.92]:55032) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nYmEW-00009O-R9 for 53454-done@debbugs.gnu.org; Mon, 28 Mar 2022 06:04:21 -0400 Received: from [2001:470:142:3::e] (port=60942 helo=fencepost.gnu.org) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nYmER-0006P2-DN; Mon, 28 Mar 2022 06:04:15 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-Version:In-Reply-To:Date:References:Subject:To: From; bh=+VjVDc2D6RZHKGiWLug0ZfK6G0A9Bc6Qq1oe2/5+awU=; b=dI5Q1Fp2RPUKEAntGd+m P4YMYmj8gdhu0mdXt7gSFXernUtgn6nPwgf2h55GNjyOB6xCIWdkZOQZAStaajp6FzuTRr4C02hjN wMpY9vgIzvrWewLr4C/eOKXbubPpY3FEoB5PXmkYjWljjW9/c+d2wvGA+DLs5ONyj2PY/J2VnbNqi PlAfMEJf9II5teeHEvpTaQ69njrHE7TpZaFPvZgFl8iCTR4QMOt2JcZTkoTu2DRubBMWiICs6fwOj ewOYnuROWC6ZgxRBHL+bG0HLbxporKdgls8GAq0M7oYs1BA515HDbQaZNiNbopUOlc03wsxliQx4A pqIFgCaW9q5fqg==; Received: from 91-160-117-201.subs.proxad.net ([91.160.117.201]:53350 helo=ribbon) by fencepost.gnu.org with esmtpsa (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nYmER-0003xk-0r; Mon, 28 Mar 2022 06:04:15 -0400 From: =?utf-8?Q?Ludovic_Court=C3=A8s?= To: Simon South Subject: Re: bug#53454: [PATCH core-updates 0/1] gnu: texlive-psnfss: Fix build; add "doc" output. References: Date: Mon, 28 Mar 2022 12:04:12 +0200 In-Reply-To: (Simon South's message of "Sat, 22 Jan 2022 18:19:22 -0500") Message-ID: <87v8vy4cmb.fsf_-_@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/27.2 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 53454-done Cc: 53454-done@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) Hi Simon, Simon South skribis: > Here's v2 of this fix for the texlive-psnfss package. This version omits= the > trailing "#t" from phases, based on Maxime's feedback, and adds a commit = that > removes the "#t" from the existing "chdir" phase. Other than a small twe= ak to > the commit message in the second patch everything else is unchanged from = v1. Pushed in =E2=80=98core-updates=E2=80=99 as 08bb73749e55a8b8078062a0ab6f4f0= eed53a475. Thank you and sorry for the delay! Ludo=E2=80=99. From unknown Fri Jun 20 07:26:27 2025 Received: (at fakecontrol) by fakecontrolmessage; To: internal_control@debbugs.gnu.org From: Debbugs Internal Request Subject: Internal Control Message-Id: bug archived. Date: Mon, 25 Apr 2022 11:24:03 +0000 User-Agent: Fakemail v42.6.9 # This is a fake control message. # # The action: # bug archived. thanks # This fakemail brought to you by your local debbugs # administrator