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.
This commit is contained in:
Ricardo Wurmus 2021-09-13 17:05:00 +02:00
parent e47e9d9273
commit 9003bd8709
No known key found for this signature in database
GPG key ID: 197A5888235FACAC
3 changed files with 36 additions and 49 deletions

View file

@ -320,9 +320,9 @@ (define-public chez-web
texlive-generic-epsf texlive-generic-epsf
texlive-metapost texlive-metapost
texlive-fonts-charter texlive-fonts-charter
texlive-generic-pdftex
texlive-context-base texlive-context-base
texlive-fonts-cm texlive-fonts-cm
texlive-pdftex
texlive-tex-plain))))) texlive-tex-plain)))))
(arguments (arguments
`(#:make-flags (list (string-append "PREFIX=" %output) `(#:make-flags (list (string-append "PREFIX=" %output)
@ -381,7 +381,7 @@ (define-public chez-sockets
(native-inputs (native-inputs
`(("chez-scheme" ,chez-scheme) `(("chez-scheme" ,chez-scheme)
("chez-web" ,chez-web) ("chez-web" ,chez-web)
("texlive" ,(texlive-union (list texlive-generic-pdftex))))) ("texlive" ,(texlive-union (list texlive-pdftex)))))
(arguments (arguments
`(#:tests? #f ; no tests `(#:tests? #f ; no tests
#:phases #:phases

View file

@ -5386,7 +5386,7 @@ (define-public python-numpy-documentation
("texlive" ,(texlive-union (list texlive-fonts-cm-super ("texlive" ,(texlive-union (list texlive-fonts-cm-super
texlive-fonts-ec texlive-fonts-ec
texlive-generic-ifxetex texlive-generic-ifxetex
texlive-generic-pdftex texlive-pdftex
texlive-amsfonts/patched texlive-amsfonts/patched
texlive-latex-capt-of texlive-latex-capt-of
texlive-latex-cmap texlive-latex-cmap
@ -5929,7 +5929,7 @@ (define-public python-matplotlib-documentation
texlive-latex-type1cm texlive-latex-type1cm
texlive-latex-ucs texlive-latex-ucs
texlive-generic-pdftex texlive-pdftex
texlive-fonts-ec texlive-fonts-ec
texlive-fonts-adobe-times texlive-fonts-adobe-times
@ -8264,7 +8264,7 @@ (define-public python-ipython-documentation
("texlive" ,(texlive-union (list texlive-amsfonts/patched ("texlive" ,(texlive-union (list texlive-amsfonts/patched
texlive-fonts-ec texlive-fonts-ec
texlive-generic-ifxetex texlive-generic-ifxetex
texlive-generic-pdftex texlive-pdftex
texlive-latex-capt-of texlive-latex-capt-of
texlive-latex-cmap texlive-latex-cmap
texlive-latex-environ texlive-latex-environ

View file

@ -6187,49 +6187,33 @@ (define-public texlive-latex-acronym
e-TeX.") e-TeX.")
(license license:lppl1.3+))) (license license:lppl1.3+)))
(define-public texlive-generic-pdftex (define-public texlive-pdftex
(package (package
(name "texlive-generic-pdftex") (inherit (simple-texlive-package
(version (number->string %texlive-revision)) "texlive-pdftex"
(source (origin (list "/doc/pdftex/"
(method svn-fetch) "/doc/man/man1/pdftex.1"
(uri (svn-reference "/doc/man/man1/pdfetex.1"
(url (string-append "svn://www.tug.org/texlive/tags/" "/fonts/map/dvips/dummy-space/dummy-space.map"
%texlive-tag "/Master/texmf-dist/" "/fonts/tfm/public/pdftex/dummy-space.tfm"
"/tex/generic/pdftex")) "/fonts/type1/public/pdftex/dummy-space.pfb"
(revision %texlive-revision))) "/scripts/simpdftex/simpdftex"
(file-name (string-append name "-" version "-checkout")) "/tex/generic/config/pdftex-dvi.tex"
(sha256 "/tex/generic/pdftex/glyphtounicode.tex"
"/tex/generic/pdftex/pdfcolor.tex")
(base32 (base32
"0k68zmqzs4qvrqxdwsrawbjb14hxqjfamq649azvai0jjxdpkljd")))) "0wsgbl0jrqc1qzgf23dla6b95lv2h8x6xvs5466d8jdrih6pwriq")
(build-system trivial-build-system) #:trivial? #t))
(arguments ;; TODO: add this missing package:
`(#:modules ((guix build utils)) ;; dehyph
#:builder (propagated-inputs
(begin `(("texlive-cm" ,texlive-cm)
(use-modules (guix build utils)) ("texlive-etex" ,texlive-etex)
(let ((target (string-append (assoc-ref %outputs "out") ("texlive-fonts-knuth-lib" ,texlive-fonts-knuth-lib)
"/share/texmf-dist/tex/generic/pdftex")) ("texlive-hyphen-base" ,texlive-hyphen-base)
(target-map (string-append (assoc-ref %outputs "out") ("texlive-kpathsea" ,texlive-kpathsea)
"/share/texmf-dist/fonts/map/pdftex"))) ("texlive-tex-ini-files" ,texlive-tex-ini-files)
(mkdir-p target) ("texlive-tex-plain" ,texlive-tex-plain)))
(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"))))))
(home-page "https://www.ctan.org/pkg/pdftex") (home-page "https://www.ctan.org/pkg/pdftex")
(synopsis "TeX extension for direct creation of PDF") (synopsis "TeX extension for direct creation of PDF")
(description (description
@ -6237,6 +6221,9 @@ (define-public texlive-generic-pdftex
directly generate PDF documents instead of DVI.") directly generate PDF documents instead of DVI.")
(license license:gpl2+))) (license license:gpl2+)))
(define-public texlive-generic-pdftex
(deprecated-package "texlive-generic-pdftex" texlive-pdftex))
(define texlive-texmf (define texlive-texmf
(package (package
(name "texlive-texmf") (name "texlive-texmf")
@ -6617,7 +6604,7 @@ (define-public teximpatient
texlive-fonts-adobe-zapfding texlive-fonts-adobe-zapfding
texlive-fonts-knuth-lib texlive-fonts-knuth-lib
texlive-fonts-mflogo-font texlive-fonts-mflogo-font
texlive-generic-pdftex))) texlive-pdftex)))
("automake" ,automake))) ("automake" ,automake)))
(home-page "https://www.gnu.org/software/teximpatient/") (home-page "https://www.gnu.org/software/teximpatient/")
(synopsis "Book on TeX, plain TeX and Eplain") (synopsis "Book on TeX, plain TeX and Eplain")
@ -7421,7 +7408,7 @@ (define-public texlive-latex-pdfx
(delete-file (string-append target "/pdfx.sty")) (delete-file (string-append target "/pdfx.sty"))
#t)))))) #t))))))
(propagated-inputs (propagated-inputs
`(("texlive-generic-pdftex" ,texlive-generic-pdftex))) `(("texlive-pdftex" ,texlive-pdftex)))
(native-inputs (native-inputs
`(("texlive-tex-pdfx" `(("texlive-tex-pdfx"
,(origin ,(origin