From 9003bd8709c2b3f88e4ab34d3fc8e061a1beb08e Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Mon, 13 Sep 2021 17:05:00 +0200 Subject: gnu: Add texlive-pdftex. * gnu/packages/chez.scm (texlive-pdftex): New variable. (texlive-generic-pdftex): Deprecate in favor of texlive-pdftex. (teximpatient)[native-inputs]: Replace texlive-generic-pdftex with texlive-pdftex. (texlive-latex-pdfx)[propagated-inputs]: Same. * gnu/packages/python-xyz.scm (python-numpy-documentation)[native-inputs]: Same. (python-matplotlib-documentation)[native-inputs]: Same. (python-ipython-documentation)[native-inputs]: Same. * gnu/packages/chez.scm (chez-web)[native-inputs]: Same. (chez-sockets)[native-inputs]: Same. --- gnu/packages/chez.scm | 4 +-- gnu/packages/python-xyz.scm | 6 ++-- gnu/packages/tex.scm | 75 +++++++++++++++++++-------------------------- 3 files changed, 36 insertions(+), 49 deletions(-) diff --git a/gnu/packages/chez.scm b/gnu/packages/chez.scm index 1cd2cde71b..adc2f1976e 100644 --- a/gnu/packages/chez.scm +++ b/gnu/packages/chez.scm @@ -320,9 +320,9 @@ and 32-bit PowerPC architectures.") texlive-generic-epsf texlive-metapost texlive-fonts-charter - texlive-generic-pdftex texlive-context-base texlive-fonts-cm + texlive-pdftex texlive-tex-plain))))) (arguments `(#:make-flags (list (string-append "PREFIX=" %output) @@ -381,7 +381,7 @@ programming in Scheme.") (native-inputs `(("chez-scheme" ,chez-scheme) ("chez-web" ,chez-web) - ("texlive" ,(texlive-union (list texlive-generic-pdftex))))) + ("texlive" ,(texlive-union (list texlive-pdftex))))) (arguments `(#:tests? #f ; no tests #:phases diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index e98eec19bc..11e9d3437b 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -5386,7 +5386,7 @@ readable format.") ("texlive" ,(texlive-union (list texlive-fonts-cm-super texlive-fonts-ec texlive-generic-ifxetex - texlive-generic-pdftex + texlive-pdftex texlive-amsfonts/patched texlive-latex-capt-of texlive-latex-cmap @@ -5929,7 +5929,7 @@ toolkits.") texlive-latex-type1cm texlive-latex-ucs - texlive-generic-pdftex + texlive-pdftex texlive-fonts-ec texlive-fonts-adobe-times @@ -8264,7 +8264,7 @@ computing.") ("texlive" ,(texlive-union (list texlive-amsfonts/patched texlive-fonts-ec texlive-generic-ifxetex - texlive-generic-pdftex + texlive-pdftex texlive-latex-capt-of texlive-latex-cmap texlive-latex-environ diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm index 2c9acc5019..306f9a4f7c 100644 --- a/gnu/packages/tex.scm +++ b/gnu/packages/tex.scm @@ -6187,49 +6187,33 @@ requires the suffix package, which in turn requires that it runs under e-TeX.") (license license:lppl1.3+))) -(define-public texlive-generic-pdftex +(define-public texlive-pdftex (package - (name "texlive-generic-pdftex") - (version (number->string %texlive-revision)) - (source (origin - (method svn-fetch) - (uri (svn-reference - (url (string-append "svn://www.tug.org/texlive/tags/" - %texlive-tag "/Master/texmf-dist/" - "/tex/generic/pdftex")) - (revision %texlive-revision))) - (file-name (string-append name "-" version "-checkout")) - (sha256 - (base32 - "0k68zmqzs4qvrqxdwsrawbjb14hxqjfamq649azvai0jjxdpkljd")))) - (build-system trivial-build-system) - (arguments - `(#:modules ((guix build utils)) - #:builder - (begin - (use-modules (guix build utils)) - (let ((target (string-append (assoc-ref %outputs "out") - "/share/texmf-dist/tex/generic/pdftex")) - (target-map (string-append (assoc-ref %outputs "out") - "/share/texmf-dist/fonts/map/pdftex"))) - (mkdir-p target) - (copy-recursively (assoc-ref %build-inputs "source") target) - (mkdir-p target-map) - (copy-recursively (assoc-ref %build-inputs "pdftex-map") target-map) - #t)))) - (native-inputs - `(("pdftex-map" - ,(origin - (method svn-fetch) - (uri (svn-reference - (url (string-append "svn://www.tug.org/texlive/tags/" - %texlive-tag "/Master/texmf-dist/" - "/fonts/map/pdftex")) - (revision %texlive-revision))) - (file-name (string-append name "-map-" version "-checkout")) - (sha256 - (base32 - "03rfif2631pgd8g1ar4xblcdh078kky7fvw3kfsj5a47rxxgicp2")))))) + (inherit (simple-texlive-package + "texlive-pdftex" + (list "/doc/pdftex/" + "/doc/man/man1/pdftex.1" + "/doc/man/man1/pdfetex.1" + "/fonts/map/dvips/dummy-space/dummy-space.map" + "/fonts/tfm/public/pdftex/dummy-space.tfm" + "/fonts/type1/public/pdftex/dummy-space.pfb" + "/scripts/simpdftex/simpdftex" + "/tex/generic/config/pdftex-dvi.tex" + "/tex/generic/pdftex/glyphtounicode.tex" + "/tex/generic/pdftex/pdfcolor.tex") + (base32 + "0wsgbl0jrqc1qzgf23dla6b95lv2h8x6xvs5466d8jdrih6pwriq") + #:trivial? #t)) + ;; TODO: add this missing package: + ;; dehyph + (propagated-inputs + `(("texlive-cm" ,texlive-cm) + ("texlive-etex" ,texlive-etex) + ("texlive-fonts-knuth-lib" ,texlive-fonts-knuth-lib) + ("texlive-hyphen-base" ,texlive-hyphen-base) + ("texlive-kpathsea" ,texlive-kpathsea) + ("texlive-tex-ini-files" ,texlive-tex-ini-files) + ("texlive-tex-plain" ,texlive-tex-plain))) (home-page "https://www.ctan.org/pkg/pdftex") (synopsis "TeX extension for direct creation of PDF") (description @@ -6237,6 +6221,9 @@ e-TeX.") directly generate PDF documents instead of DVI.") (license license:gpl2+))) +(define-public texlive-generic-pdftex + (deprecated-package "texlive-generic-pdftex" texlive-pdftex)) + (define texlive-texmf (package (name "texlive-texmf") @@ -6617,7 +6604,7 @@ develop documents with LaTeX, in a single application.") texlive-fonts-adobe-zapfding texlive-fonts-knuth-lib texlive-fonts-mflogo-font - texlive-generic-pdftex))) + texlive-pdftex))) ("automake" ,automake))) (home-page "https://www.gnu.org/software/teximpatient/") (synopsis "Book on TeX, plain TeX and Eplain") @@ -7421,7 +7408,7 @@ the file to which it applies.") (delete-file (string-append target "/pdfx.sty")) #t)))))) (propagated-inputs - `(("texlive-generic-pdftex" ,texlive-generic-pdftex))) + `(("texlive-pdftex" ,texlive-pdftex))) (native-inputs `(("texlive-tex-pdfx" ,(origin -- cgit v1.2.3