| Message ID | 5be04a85bec58fd7af826c245711fbcaab66d19d.1747223352.git.liliana.prikler@gmail.com |
|---|---|
| State | New |
| Headers |
Return-Path: <guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org> X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id D83A227BC4A; Wed, 14 May 2025 12:53:45 +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=-6.4 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI, RCVD_IN_DNSWL_BLOCKED,RCVD_IN_VALIDITY_CERTIFIED,RCVD_IN_VALIDITY_RPBL, RCVD_IN_VALIDITY_SAFE,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 7B36227BC49 for <patchwork@mira.cbaines.net>; Wed, 14 May 2025 12:53:44 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from <guix-patches-bounces@gnu.org>) id 1uFAdp-0006AJ-JD; Wed, 14 May 2025 07:51:17 -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 <Debian-debbugs@debbugs.gnu.org>) id 1uFAdi-00065p-Ez for guix-patches@gnu.org; Wed, 14 May 2025 07:51:10 -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 <Debian-debbugs@debbugs.gnu.org>) id 1uFAdh-0006IB-Ki for guix-patches@gnu.org; Wed, 14 May 2025 07:51:10 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:Date:From:To:Subject; bh=zRrsymoTFqhPf0wDrTmxnsbJbLC2exkYf3YE8NPIqj0=; b=XMwOsIodq18dvhbUN5mTafGEwZAINEHPhypoxRmP0OpqJkCLA5DVLcNNPZ66T8U25FyMx4NBQNGxSh1FqYnqibjS2NJzNbDOu5K1PmIrbUeijaWJDNwFAm7+GpWBnGYzKgz4e94/NQryy6LIRB2io1P78wxrS9QOD/OLoI2U+4CXD4zUePqyELacnSLXge+AuqvV/0xCvXxYpypDJIC5RjhXSmTF0hnJU/NWUViX4tZ0yELGnaFiMs7ZyYDKyeNbFkFcYqObHO7VrsObfUJo1vX28a8WQW79UvleMBFY5UzMhHZfr53WR+JEoUmzf7aZzEihcCGOD90IGfofFnRauQ==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from <Debian-debbugs@debbugs.gnu.org>) id 1uFAde-0006pQ-QW; Wed, 14 May 2025 07:51:06 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#78424] [PATCH] gnu: texlive-libkpathsea: Add definitions for XDG paths. Resent-From: Liliana Marie Prikler <liliana.prikler@gmail.com> Original-Sender: "Debbugs-submit" <debbugs-submit-bounces@debbugs.gnu.org> Resent-CC: andreas@enge.fr, guix@nicolasgoaziou.fr, guix-patches@gnu.org Resent-Date: Wed, 14 May 2025 11:51:05 +0000 Resent-Message-ID: <handler.78424.B.174722343025902@debbugs.gnu.org> Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 78424 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 78424@debbugs.gnu.org Cc: andreas@enge.fr, guix@nicolasgoaziou.fr X-Debbugs-Original-To: guix-patches@gnu.org X-Debbugs-Original-Xcc: andreas@enge.fr, guix@nicolasgoaziou.fr Received: via spool by submit@debbugs.gnu.org id=B.174722343025902 (code B ref -1); Wed, 14 May 2025 11:51:05 +0000 Received: (at submit) by debbugs.gnu.org; 14 May 2025 11:50:30 +0000 Received: from localhost ([127.0.0.1]:40815 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <debbugs-submit-bounces@debbugs.gnu.org>) id 1uFAd4-0006jh-8W for submit@debbugs.gnu.org; Wed, 14 May 2025 07:50:30 -0400 Received: from lists.gnu.org ([2001:470:142::17]:41848) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from <liliana.prikler@gmail.com>) id 1uFAcz-0006i1-Rw for submit@debbugs.gnu.org; Wed, 14 May 2025 07:50:26 -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 <liliana.prikler@gmail.com>) id 1uFAcn-0005nM-GG for guix-patches@gnu.org; Wed, 14 May 2025 07:50:15 -0400 Received: from mail-wr1-x443.google.com ([2a00:1450:4864:20::443]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from <liliana.prikler@gmail.com>) id 1uFAci-0005sS-E3 for guix-patches@gnu.org; Wed, 14 May 2025 07:50:13 -0400 Received: by mail-wr1-x443.google.com with SMTP id ffacd0b85a97d-3a0b6aa08e5so583805f8f.1 for <guix-patches@gnu.org>; Wed, 14 May 2025 04:50:06 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1747223405; x=1747828205; darn=gnu.org; h=to:content-transfer-encoding:mime-version:subject:date:from :message-id:from:to:cc:subject:date:message-id:reply-to; bh=zRrsymoTFqhPf0wDrTmxnsbJbLC2exkYf3YE8NPIqj0=; b=Hb+tw8mUrwgWEhuRah/peLHi0qDTv09Z6wRDhxLyWoOxU/TLd/oghuh1GCvbJJ9rRV asIIyswm1akrYVolGkVEFnaWUcq/edWJmA5CHUPtatySvCg5M+7PL1cEQQLCBOS5Pllj +zzozzV4Hig/R+lv7lvHaeqf0kLBzmV8G/j3T09L+xhSudnNgh/MZCpqfAdzx6tWFqgW tervXRGlpcVzj99oLxTF4YerhWBKWBepAaf1o01cYYmVHNJK29fdS6/gnebNvIaoZXVr MXkdNXlPUEUfA1moG7S+eAJsE+Z5b+PnNpPbnFDeqzGSJTpVhr8ttCNb6mSntCkcWqtB uOJA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1747223405; x=1747828205; h=to:content-transfer-encoding:mime-version:subject:date:from :message-id:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=zRrsymoTFqhPf0wDrTmxnsbJbLC2exkYf3YE8NPIqj0=; b=ZxPYw5EIL40ota4JH6bhc3KSsyRhLuvWtnaLeq1gXFxIpEw8HpOEwN7mrU065eRq7W oY4VGmW8vI7qxgSTc3TGPJB55c/Vm1hjlRmRYs0lwzXqqqkMH/iS4/AfRHOu0b5zWER0 wdCFGb6u5brUuHFmrIkLx5unK4C9OeGXtCcmpaH7Zihx7oG/TRsSufjQMDdJH1h6ouEg MfO14RdsOdSyNJsCaC9v3PVo2jS4D6eUaejZhS1UD2xrASKGgatt4d5s2RVzYftKWQJf 3wj1JUt5vcsEPhF5ofLRAcotGeYERqBDnB0PMqNoCATht1BA1nhlgM//EI92leLSCeh3 1CoA== X-Gm-Message-State: AOJu0YyGCzsd/rnqSDOEzD5nIOCR98/4C3zQHhwVy1PzVrwVIWvp3q/b EUKqOA9K/MM/Qg31vHlw5tpEZOXfTOs7mNsu3VP0/FO/iyaeTnSPMHlHb1UU X-Gm-Gg: ASbGncsLZba7n/v4fevgcquVEco7bKfh3+uW4CchBAUnmpftP+SSexA9jUwwYVN/6QQ p2BnGhC0gxwAcONQAAlcXgKvsfpoT0cZPa7qG5U22ON0cImEUTp8ptQn3tFatvc0FvvC8xF0NtK 0OqTvGQ3GXgVZR3O6laq9yaQLCX3J8va7m8NG7QNnviZx3aIC4KxOerIfT3m8j1UpMNhVIolX1/ Ge7UkJtnDphYhoBv8r1toAeY7MRnQ3Asny3GN7ejBb4QMrh/IqYUmOeZ7aMJlctajdRx768Eg30 3/8cQm+t7d+Mq0ZaNWnWOzZ5wBC5uzHCmcxOrbiVAqAbBEos4ox+x/yqY7XruNETR+kgYXnpVBy L86XtI6MwzkG0vXS/rZEQU6yBspU= X-Google-Smtp-Source: AGHT+IFIg6l0Xcp2xmfN3du1nLE3ZLrH0W70MzrbkrNybKrgO0vn3iwBypfGBBlPjypiWzKNEphCeA== X-Received: by 2002:a05:6000:1446:b0:3a1:fc5b:372a with SMTP id ffacd0b85a97d-3a348dc51acmr3133118f8f.24.1747223404643; Wed, 14 May 2025 04:50:04 -0700 (PDT) Received: from lumine.fritz.box (85-127-114-32.dsl.dynamic.surfer.at. [85.127.114.32]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-3a1f5a4c76dsm19678862f8f.92.2025.05.14.04.50.03 for <guix-patches@gnu.org> (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 14 May 2025 04:50:04 -0700 (PDT) Message-ID: <5be04a85bec58fd7af826c245711fbcaab66d19d.1747223352.git.liliana.prikler@gmail.com> From: Liliana Marie Prikler <liliana.prikler@gmail.com> Date: Wed, 14 May 2025 13:46:01 +0200 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=2a00:1450:4864:20::443; envelope-from=liliana.prikler@gmail.com; helo=mail-wr1-x443.google.com X-Spam_score_int: 0 X-Spam_score: 0.0 X-Spam_bar: / X-Spam_report: (0.0 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001, MALFORMED_FREEMAIL=2.117, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_MXG_LOWER_HDR_SPAM=0.01 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: <guix-patches.gnu.org> List-Unsubscribe: <https://lists.gnu.org/mailman/options/guix-patches>, <mailto:guix-patches-request@gnu.org?subject=unsubscribe> List-Archive: <https://lists.gnu.org/archive/html/guix-patches> List-Post: <mailto:guix-patches@gnu.org> List-Help: <mailto:guix-patches-request@gnu.org?subject=help> List-Subscribe: <https://lists.gnu.org/mailman/listinfo/guix-patches>, <mailto:guix-patches-request@gnu.org?subject=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 |
| Series |
[bug#78424] gnu: texlive-libkpathsea: Add definitions for XDG paths.
|
|
Commit Message
Liliana Marie Prikler
May 14, 2025, 11:46 a.m. UTC
Without these paths set, if they are unset in the environment, jobs that need to read from/write to TEXMFVAR or TEXMFCONFIG will fail. If set, environment variables take precedence. * gnu/packages/tex.scm (texlive-libkpathsea): Add replacement, pointing to… (texlive-libkpathsea/fixed): … this. Add definitions for XDG_CACHE_HOME and XDG_CONFIG_HOME. --- gnu/packages/tex.scm | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) base-commit: 5f5d84beccc180f1b51474c0e47eb6e0d0c9175f
Comments
Hello, Liliana Marie Prikler <liliana.prikler@gmail.com> writes: > Without these paths set, if they are unset in the environment, jobs that need > to read from/write to TEXMFVAR or TEXMFCONFIG will fail. If set, environment > variables take precedence. > > * gnu/packages/tex.scm (texlive-libkpathsea): Add replacement, pointing to… > (texlive-libkpathsea/fixed): … this. Add definitions for XDG_CACHE_HOME and > XDG_CONFIG_HOME. > --- > gnu/packages/tex.scm | 18 ++++++++++++++++++ > 1 file changed, 18 insertions(+) > > diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm > index 99a65641a4a..e2fe5554a0c 100644 > --- a/gnu/packages/tex.scm > +++ b/gnu/packages/tex.scm > @@ -296,6 +296,9 @@ (define-public texlive-source > (define-public texlive-libkpathsea > (package > (name "texlive-libkpathsea") > + ;; TODO: ungraft on tex-team or a dedicated branch, > + ;; integrating the missing definitions. > + (replacement texlive-libkpathsea/fixed) > (version (package-version texlive-source)) > (source > (origin > @@ -395,6 +398,21 @@ (define-public texlive-libkpathsea > of user-specified directories similar to how shells look up executables.") > (license license:lgpl2.1))) > > +(define texlive-libkpathsea/fixed > + (package > + (inherit texlive-libkpathsea) > + (arguments > + (substitute-keyword-arguments (package-arguments texlive-libkpathsea) > + ((#:phases phases) > + #~(modify-phases #$phases > + (add-after 'customize-texmf.cnf 'fix-texmf.cnf > + (lambda _ > + (substitute* "texk/kpathsea/texmf.cnf" > + (("^TEXMFVAR = .*" all) > + (string-append "XDG_CACHE_HOME = ~/.cache\n" all)) > + (("^TEXMFCONFIG = .*" all) > + (string-append "XDG_CONFIG_HOME = ~/.config\n" all))))))))))) It looks good. Perhaps we could also fix in an additional step a little mistake I introduced in the recent TeX Live update: cache and config files are created in, e.g., "$XDG_CACHE_HOME/.texliveYYYY/texmf-var", but it would make sense to put them in "$XDG_CACHE_HOME/texliveYYYY/texmf-var" instead. WDYT? Regards,
Am Freitag, dem 16.05.2025 um 08:58 +0200 schrieb Nicolas Goaziou: > Hello, > > Liliana Marie Prikler <liliana.prikler@gmail.com> writes: > > > Without these paths set, if they are unset in the environment, jobs > > that need > > to read from/write to TEXMFVAR or TEXMFCONFIG will fail. If set, > > environment > > variables take precedence. > > > > * gnu/packages/tex.scm (texlive-libkpathsea): Add replacement, > > pointing to… > > (texlive-libkpathsea/fixed): … this. Add definitions for > > XDG_CACHE_HOME and > > XDG_CONFIG_HOME. > > --- > > gnu/packages/tex.scm | 18 ++++++++++++++++++ > > 1 file changed, 18 insertions(+) > > > > diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm > > index 99a65641a4a..e2fe5554a0c 100644 > > --- a/gnu/packages/tex.scm > > +++ b/gnu/packages/tex.scm > > @@ -296,6 +296,9 @@ (define-public texlive-source > > (define-public texlive-libkpathsea > > (package > > (name "texlive-libkpathsea") > > + ;; TODO: ungraft on tex-team or a dedicated branch, > > + ;; integrating the missing definitions. > > + (replacement texlive-libkpathsea/fixed) > > (version (package-version texlive-source)) > > (source > > (origin > > @@ -395,6 +398,21 @@ (define-public texlive-libkpathsea > > of user-specified directories similar to how shells look up > > executables.") > > (license license:lgpl2.1))) > > > > +(define texlive-libkpathsea/fixed > > + (package > > + (inherit texlive-libkpathsea) > > + (arguments > > + (substitute-keyword-arguments (package-arguments texlive- > > libkpathsea) > > + ((#:phases phases) > > + #~(modify-phases #$phases > > + (add-after 'customize-texmf.cnf 'fix-texmf.cnf > > + (lambda _ > > + (substitute* "texk/kpathsea/texmf.cnf" > > + (("^TEXMFVAR = .*" all) > > + (string-append "XDG_CACHE_HOME = ~/.cache\n" > > all)) > > + (("^TEXMFCONFIG = .*" all) > > + (string-append "XDG_CONFIG_HOME = ~/.config\n" > > all))))))))))) > > It looks good. > > Perhaps we could also fix in an additional step a little mistake > I introduced in the recent TeX Live update: cache and config files > are created in, e.g., "$XDG_CACHE_HOME/.texliveYYYY/texmf-var", but > it would make sense to put them in > "$XDG_CACHE_HOME/texliveYYYY/texmf-var" instead. Sure, I don't see a problem with that. Do you want to push this or should I go? Cheers
Hello, Liliana Marie Prikler <liliana.prikler@gmail.com> writes: > Am Freitag, dem 16.05.2025 um 08:58 +0200 schrieb Nicolas Goaziou: >> Perhaps we could also fix in an additional step a little mistake >> I introduced in the recent TeX Live update: cache and config files >> are created in, e.g., "$XDG_CACHE_HOME/.texliveYYYY/texmf-var", but >> it would make sense to put them in >> "$XDG_CACHE_HOME/texliveYYYY/texmf-var" instead. > Sure, I don't see a problem with that. Do you want to push this or > should I go? Please be my guest ;) Thank you! Regards,
Pushed as commit 91a81927345394c9f52bca6ecf743f48cd24d250 . Andreas
diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm index 99a65641a4a..e2fe5554a0c 100644 --- a/gnu/packages/tex.scm +++ b/gnu/packages/tex.scm @@ -296,6 +296,9 @@ (define-public texlive-source (define-public texlive-libkpathsea (package (name "texlive-libkpathsea") + ;; TODO: ungraft on tex-team or a dedicated branch, + ;; integrating the missing definitions. + (replacement texlive-libkpathsea/fixed) (version (package-version texlive-source)) (source (origin @@ -395,6 +398,21 @@ (define-public texlive-libkpathsea of user-specified directories similar to how shells look up executables.") (license license:lgpl2.1))) +(define texlive-libkpathsea/fixed + (package + (inherit texlive-libkpathsea) + (arguments + (substitute-keyword-arguments (package-arguments texlive-libkpathsea) + ((#:phases phases) + #~(modify-phases #$phases + (add-after 'customize-texmf.cnf 'fix-texmf.cnf + (lambda _ + (substitute* "texk/kpathsea/texmf.cnf" + (("^TEXMFVAR = .*" all) + (string-append "XDG_CACHE_HOME = ~/.cache\n" all)) + (("^TEXMFCONFIG = .*" all) + (string-append "XDG_CONFIG_HOME = ~/.config\n" all))))))))))) + (define-public texlive-libptexenc (package (name "texlive-libptexenc")