From af87549d9a081726296444470e33219b0e9e9837 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Mon, 17 Jun 2024 10:24:38 +0200 Subject: gnu: texlive-docstrip: Remove it. * gnu/packages/tex.scm (texlive-docstrip): Export it. (texlive-atveryend)[native-inputs]: (texlive-graphics)[native-inputs]: (texlive-l3kernel)[native-inputs]: (texlive-l3backend)[native-inputs]: (texlive-l3packages)[native-inputs]: (texlive-lualibs)[native-inputs]: (texlive-babel)[native-inputs]: (texlive-cyrillic)[native-inputs]: (texlive-firstaid)[native-inputs]: (texlive-atbegshi)[native-inputs]: Use TEXLIVE-LATEX instead of TEXLIVE-DOCSTRIP (and possibly TEXLIVE-PDFTEX). (texlive-hyphen-complete)[arguments]<#:phases>: Add a phase to include "docstrip.tex" in the build process. [native-inputs]: Replace TEXLIVE-DOCSTRIP with TEXLIVE-LATEX checkout. (texlive-docstrip): Remove variable. Change-Id: Id6ae34787acc2956cb51dcdd403b332ac6d1ba94 --- gnu/packages/tex.scm | 51 ++++++++++++++++++++++----------------------------- 1 file changed, 22 insertions(+), 29 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm index db28b0b0d3..1a7f5b3edd 100644 --- a/gnu/packages/tex.scm +++ b/gnu/packages/tex.scm @@ -517,6 +517,13 @@ (define-public texlive-hyphen-complete (lambda _ (substitute* "source/generic/hyph-utf8/lib/tex/hyphen/language.rb" (("require 'byebug'") "")))) + (add-before 'build 'include-docstrip.tex + (lambda* (#:key inputs native-inputs #:allow-other-keys) + (let ((docstrip.tex + (search-input-file (or native-inputs inputs) + "tex/latex/base/docstrip.tex"))) + (setenv "TEXINPUTS" + (string-append (dirname docstrip.tex) ":"))))) (add-before 'build 'regenerate-converters (lambda _ (let ((root (getcwd))) @@ -583,7 +590,11 @@ (define-public texlive-hyphen-complete (native-inputs (list ruby-2.7 ruby-hydra-minimal/pinned - texlive-docstrip + ;; Build phase requires "docstrip.tex" from TEXLIVE-LATEX. + ;; However, adding this package to native inputs would initiate + ;; a circular dependency. To work around this, use TEXLIVE-LATEX + ;; source, then add "docstrip.tex" to TEXINPUTS before build. + (package-source texlive-latex) texlive-tex)) (home-page "https://ctan.org/pkg/hyph-utf8") (synopsis "Hyphenation patterns expressed in UTF-8") @@ -39308,24 +39319,6 @@ (define-public texlive-avantgar from Adobe's basic set.") (license license:gpl3+))) -(define texlive-docstrip - (package - (name "texlive-docstrip") - (version (number->string %texlive-revision)) - (source (texlive-origin - name version - (list "/tex/latex/base/docstrip.tex") - (base32 - "04cwvqs8cx8l60lrwn60krpjg1ada7i8g5mh6cb6bxaz08yvx9i4"))) - (build-system texlive-build-system) - (arguments - (list #:texlive-latex-bin? #f)) - (home-page "https://www.ctan.org/texlive") - (synopsis "Utility to strip documentation from TeX files") - (description "This package provides the docstrip utility to strip -documentation from TeX files. It is part of the LaTeX base.") - (license license:lppl1.3+))) - (define-public texlive-undergradmath (package (name "texlive-undergradmath") @@ -48306,7 +48299,7 @@ (define-public texlive-atveryend (outputs '("out" "doc")) (build-system texlive-build-system) (arguments (list #:texlive-latex-bin? #f)) - (native-inputs (list texlive-docstrip texlive-pdftex)) + (native-inputs (list texlive-latex)) (home-page "https://ctan.org/pkg/atveryend") (synopsis "Hooks at the very end of a document") (description @@ -48718,7 +48711,7 @@ (define-public texlive-graphics (outputs '("out" "doc")) (build-system texlive-build-system) (arguments (list #:texlive-latex-bin? #f)) - (native-inputs (list texlive-docstrip texlive-pdftex)) + (native-inputs (list texlive-latex)) (propagated-inputs (list texlive-graphics-def texlive-graphics-cfg)) (home-page "https://ctan.org/macros/latex/required/graphics") (synopsis "The LaTeX standard graphics bundle") @@ -49802,7 +49795,7 @@ (define-public texlive-l3kernel #:tex-engine "tex" #:tex-format #f #:texlive-latex-bin? #f)) - (native-inputs (list texlive-docstrip)) + (native-inputs (list texlive-latex)) (propagated-inputs (list texlive-l3backend)) (home-page "https://ctan.org/pkg/l3kernel") (synopsis "LaTeX3 programming conventions") @@ -49834,7 +49827,7 @@ (define-public texlive-l3backend (list #:tex-engine "tex" #:tex-format #f #:texlive-latex-bin? #f)) - (native-inputs (list texlive-docstrip)) + (native-inputs (list texlive-latex)) (home-page "https://ctan.org/pkg/l3backend") (synopsis "LaTeX3 backend drivers") (description @@ -49879,7 +49872,7 @@ (define-public texlive-l3packages #:tex-engine "tex" #:tex-format #f #:texlive-latex-bin? #f)) - (native-inputs (list texlive-docstrip)) + (native-inputs (list texlive-latex)) (propagated-inputs (list texlive-l3kernel)) (home-page "https://ctan.org/pkg/l3packages") (synopsis "High-level LaTeX3 concepts") @@ -50255,7 +50248,7 @@ (define-public texlive-lualibs (outputs '("out" "doc")) (build-system texlive-build-system) (arguments (list #:texlive-latex-bin? #f)) - (native-inputs (list texlive-docstrip texlive-pdftex)) + (native-inputs (list texlive-latex)) (home-page "https://ctan.org/pkg/lualibs") (synopsis "Additional Lua functions for LuaTeX macro programmers") (description @@ -50677,7 +50670,7 @@ (define-public texlive-babel (mkdir-p locale-directory) (with-directory-excursion "source/latex/babel/" (invoke "unzip" "locale.zip" "-d" locale-directory)))))))) - (native-inputs (list texlive-docstrip texlive-pdftex unzip)) + (native-inputs (list texlive-latex unzip)) (home-page "https://www.ctan.org/pkg/babel") (synopsis "Multilingual support for Plain TeX or LaTeX") (description @@ -52256,7 +52249,7 @@ (define-public texlive-cyrillic (arguments (list #:tex-engine "tex" #:tex-format #f)) - (native-inputs (list texlive-docstrip)) + (native-inputs (list texlive-latex)) (propagated-inputs (list texlive-cyrillic-bin)) (home-page "https://ctan.org/pkg/cyrillic") (synopsis "Support for Cyrillic fonts in LaTeX") @@ -53212,7 +53205,7 @@ (define-public texlive-firstaid (outputs '("out" "doc")) (build-system texlive-build-system) (arguments (list #:texlive-latex-bin? #f)) - (native-inputs (list texlive-docstrip texlive-pdftex)) + (native-inputs (list texlive-latex)) (home-page "https://ctan.org/pkg/firstaid") (synopsis "First aid for external LaTeX files and packages that need updating") @@ -60302,7 +60295,7 @@ (define-public texlive-atbegshi (outputs '("out" "doc")) (build-system texlive-build-system) (arguments (list #:texlive-latex-bin? #f)) - (native-inputs (list texlive-docstrip texlive-pdftex)) + (native-inputs (list texlive-latex)) (home-page "https://ctan.org/pkg/atbegshi") (synopsis "Execute commands at @code{\\shipout} time") (description -- cgit v1.2.3