guix_mirror_bot pushed a commit to branch core-packages-team
in repository guix.
commit bf4b9d862b33f77c4c91dec50f341a54f06b7c6e
Author: Ludovic Courtès <l...@gnu.org>
AuthorDate: Wed Jun 11 15:55:41 2025 +0200
gnu: texlive-libkpathsea: Ungraft.
* gnu/packages/tex.scm (texlive-libkpathsea)[replacement]: Remove.
[arguments]: Adjust ‘customize-texmf.cnf’ phase.
Change-Id: I64abeadb82a11cb54d6388e7f5deda65d2e5ba20
---
gnu/packages/tex.scm | 54 +++++++---------------------------------------------
1 file changed, 7 insertions(+), 47 deletions(-)
diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 42d4a78fab..427a2c5e03 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -297,9 +297,6 @@ should not be installed in a profile.")
(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
@@ -346,9 +343,13 @@ should not be installed in a profile.")
(("^TEXMFDIST = .*") "TEXMFDIST = {$GUIX_TEXMF}\n")
;; Use XDG recommendations for local variables. Also ignore
;; system-wide cache, which is not writable; use local one
- ;; instead, i.e., "$XDG_CACHE_HOME/.texliveYYYY/texmf-var/".
- (("^TEXMFVAR = ~/") "TEXMFVAR = $XDG_CACHE_HOME/")
- (("^TEXMFCONFIG = ~/") "TEXMFCONFIG = $XDG_CONFIG_HOME/")
+ ;; instead, i.e., "$XDG_CACHE_HOME/texliveYYYY/texmf-var/".
+ (("^TEXMFVAR = ~/\\.")
+ (string-append "XDG_CACHE_HOME = ~/.cache\n"
+ "TEXMFVAR = $XDG_CACHE_HOME/"))
+ (("^TEXMFCONFIG = ~/\\.")
+ (string-append "XDG_CONFIG_HOME = ~/.config\n"
+ "TEXMFCONFIG = $XDG_CONFIG_HOME/"))
(("^TEXMFCACHE = .*") "TEXMFCACHE = $TEXMFVAR\n")
;; "ls-R" files are to be expected only in the TEXMFDIST
;; directories. TEXMFLOCAL is not necessary for Guix, but
@@ -399,47 +400,6 @@ should not be installed in a profile.")
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
- (replace 'customize-texmf.cnf
- (lambda _
- (substitute* "texk/kpathsea/texmf.cnf"
- (("^TEXMFROOT = .*") "TEXMFROOT = {$GUIX_TEXMF}/..\n")
- (("^TEXMFDIST = .*") "TEXMFDIST = {$GUIX_TEXMF}\n")
- ;; Use XDG recommendations for local variables. Also ignore
- ;; system-wide cache, which is not writable; use local one
- ;; instead, i.e., "$XDG_CACHE_HOME/texliveYYYY/texmf-var/".
- (("^TEXMFVAR = ~/\\.")
- (string-append "XDG_CACHE_HOME = ~/.cache\n"
- "TEXMFVAR = $XDG_CACHE_HOME/"))
- (("^TEXMFCONFIG = ~/\\.")
- (string-append "XDG_CONFIG_HOME = ~/.config\n"
- "TEXMFCONFIG = $XDG_CONFIG_HOME/"))
- (("^TEXMFCACHE = .*") "TEXMFCACHE = $TEXMFVAR\n")
- ;; "ls-R" files are to be expected only in the TEXMFDIST
- ;; directories. TEXMFLOCAL is not necessary for Guix, but
- ;; could be required anyway by external TeX installations.
- (("^TEXMF = .*")
- "TEXMF =
{$TEXMFCONFIG,$TEXMFVAR,$TEXMFHOME,!!TEXMFLOCAL,TEXMFSYSVAR,TEXMFSYSCONFIG,!!$TEXMFDIST}\n")
- (("^TEXMFDBS = .*") "TEXMFDBS =
{!!$TEXMFLOCAL,!!$TEXMFDIST}\n")
- ;; Set TEXMFCNF. Since earlier values of variables have
- ;; precedence over later ones, insert the desired value
first.
- (("^TEXMFCNF =")
- (string-append
- "TEXMFCNF = " #$output "/share/texmf-dist/web2c\n"
- "TEXMFCNF ="))
- ;; Help TeX finding fonts installed on the system.
- (("^OSFONTDIR = .*") "OSFONTDIR = {$XDG_DATA_DIRS}\n")
- ;; Don't truncate lines.
- (("^error_line = .*$") "error_line = 254\n")
- (("^half_error_line = .*$") "half_error_line = 238\n")
- (("^max_print_line = .*$") "max_print_line =
1000\n"))))))))))
-
(define-public texlive-libptexenc
(package
(name "texlive-libptexenc")
