futurile/guix-play
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

gnu: Remove texlive-default-updmap.cfg.

Browse Source 
* gnu/packages/tex.scm (texlive-scripts): Provide "updmap.cfg", along with
other similar files.
(texlive-default-updmap.cfg): Remove variable.
(texlive-updmap.cfg)[source]: Use TEXLIVE-SCRIPTS source.
[arguments]: Use G-expressions.  Adapt #:INSTALL-PLAN according to source change.
* guix/profiles.scm (texlive-font-maps): Use "updmap.cfg" provided by
TEXLIVE-SCRIPTS instead of now defunct TEXLIVE-DEFAULT-UPDMAP.CFG.
This commit is contained in:
Nicolas Goaziou 2023-06-26 12:22:32 +02:00
parent 19fd100413
commit 3f8b75b35c
No known key found for this signature in database
GPG Key ID: DA00B4F048E92F2D
2 changed files with 37 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

67
gnu/packages/tex.scm
View File

@ -260,6 +260,7 @@ of user-specified directories similar to how shells look up executables.")
"texmf-dist/scripts/texlive/updmap.pl" "texmf-dist/scripts/texlive/updmap.pl"
"texmf-dist/web2c/fmtutil-hdr.cnf" "texmf-dist/web2c/fmtutil-hdr.cnf"
"texmf-dist/web2c/updmap-hdr.cfg" "texmf-dist/web2c/updmap-hdr.cfg"
"texmf-dist/web2c/updmap.cfg"
"tlpkg/gpg/" "tlpkg/gpg/"
"tlpkg/installer/config.guess" "tlpkg/installer/config.guess"
"tlpkg/installer/curl/curl-ca-bundle.crt" "tlpkg/installer/curl/curl-ca-bundle.crt"
@ -267,7 +268,7 @@ of user-specified directories similar to how shells look up executables.")
"tlpkg/texlive.tlpdb")) "tlpkg/texlive.tlpdb"))
(revision %texlive-revision))) (revision %texlive-revision)))
(sha256 (sha256
"191p4rznf19wl9sbjm61v143wap3izhsql6s1bpq1nnbf1p4bakq"))) "0sqbg5kjpzkpm1fq2c9hpf4f21bvjs3xas944dlbqp44lsqhcmsk")))
(outputs '("out" "doc")) (outputs '("out" "doc"))
(build-system copy-build-system) (build-system copy-build-system)
(arguments (arguments
@ -4948,13 +4949,6 @@ part of the LaTeX required set of packages.")
(define-deprecated-package texlive-latex-psnfss texlive-psnfss) (define-deprecated-package texlive-latex-psnfss texlive-psnfss)
(define-public texlive-default-updmap.cfg
(texlive-origin
"updmap.cfg" (number->string %texlive-revision)
(list "web2c/updmap.cfg")
(base32
"10b9il84x6vwfns7cvf8jv0bfcjr7icph3mhci9cq088v216k3kb")))
(define-public texlive-updmap.cfg (define-public texlive-updmap.cfg
(lambda* (#:optional (packages '())) (lambda* (#:optional (packages '()))
"Return a 'texlive-updmap.cfg' package which contains the fonts map "Return a 'texlive-updmap.cfg' package which contains the fonts map
@ -4978,42 +4972,45 @@ configuration of a base set of packages plus PACKAGES."
texlive-tools))) texlive-tools)))
(package (package
(version (number->string %texlive-revision)) (version (number->string %texlive-revision))
(source texlive-default-updmap.cfg) (source (package-source texlive-scripts))
(name "texlive-updmap.cfg") (name "texlive-updmap.cfg")
(build-system copy-build-system) (build-system copy-build-system)
(arguments (arguments
'(#:modules ((guix build copy-build-system) (list
#:modules '((guix build copy-build-system)
(guix build utils) (guix build utils)
(ice-9 popen) (ice-9 popen)
(ice-9 textual-ports)) (ice-9 textual-ports))
#:install-plan '(("web2c/updmap.cfg" "share/texmf-config/web2c/") #:install-plan
("web2c/map" "share/texmf-dist/fonts/map")) #~'(("texmf-dist/web2c/updmap.cfg" "share/texmf-config/web2c/")
#:phases ("texmf-dist/web2c/map" "share/texmf-dist/fonts/map"))
(modify-phases %standard-phases #:phases
(add-before 'install 'regenerate-updmap.cfg #~(modify-phases %standard-phases
(lambda _ (add-before 'install 'regenerate-updmap.cfg
(with-directory-excursion "web2c" (lambda _
(make-file-writable "updmap.cfg") (with-directory-excursion "texmf-dist/web2c"
(make-file-writable "updmap.cfg")
;; Disable unavailable map files. ;; Disable unavailable map files.
(let* ((port (open-pipe* OPEN_WRITE "updmap-sys" (let* ((port (open-pipe* OPEN_WRITE "updmap-sys"
"--syncwithtrees" "--syncwithtrees"
"--nohash" "--nohash"
"--cnffile" "updmap.cfg"))) "--cnffile" "updmap.cfg")))
(display "Y\n" port) (display "Y\n" port)
(when (not (zero? (status:exit-val (close-pipe port)))) (when (not (zero? (status:exit-val (close-pipe port))))
(error "failed to filter updmap.cfg"))) (error "failed to filter updmap.cfg")))
;; Set TEXMFSYSVAR to a sane and writable value; updmap fails ;; Set TEXMFSYSVAR to a sane and writable value; updmap fails
;; if it cannot create its log file there. ;; if it cannot create its log file there.
(setenv "TEXMFSYSVAR" (getcwd)) (setenv "TEXMFSYSVAR" (getcwd))
;; Generate maps. ;; Generate maps.
(invoke "updmap-sys" (invoke "updmap-sys"
"--cnffile" "updmap.cfg" "--cnffile" "updmap.cfg"
"--dvipdfmxoutputdir" "map/dvipdfmx/updmap/" "--dvipdfmxoutputdir" "map/dvipdfmx/updmap/"
"--dvipsoutputdir" "map/dvips/updmap/" "--dvipsoutputdir" "map/dvips/updmap/"
"--pdftexoutputdir" "map/pdftex/updmap/"))))))) "--pdftexoutputdir" "map/pdftex/updmap/")))))))
(native-inputs (list texlive-scripts))
(propagated-inputs (map (lambda (package) (propagated-inputs (map (lambda (package)
(list (package-name package) package)) (list (package-name package) package))
(append default-packages packages))) (append default-packages packages)))

9
guix/profiles.scm
View File

@ -1799,9 +1799,6 @@ MANIFEST."
(module-ref (resolve-interface '(gnu packages base)) 'grep)) (module-ref (resolve-interface '(gnu packages base)) 'grep))
(define sed (define sed
(module-ref (resolve-interface '(gnu packages base)) 'sed)) (module-ref (resolve-interface '(gnu packages base)) 'sed))
(define updmap.cfg
(module-ref (resolve-interface '(gnu packages tex))
'texlive-default-updmap.cfg))
(define build (define build
(with-imported-modules '((guix build utils) (with-imported-modules '((guix build utils)
(guix build union)) (guix build union))
@ -1835,7 +1832,9 @@ MANIFEST."
(let* ((web2c (string-append #$output "/share/texmf-dist/web2c/")) (let* ((web2c (string-append #$output "/share/texmf-dist/web2c/"))
(maproot (string-append #$output "/share/texmf-dist/fonts/map/")) (maproot (string-append #$output "/share/texmf-dist/fonts/map/"))
(updmap.cfg (string-append web2c "updmap.cfg"))) (updmap.cfg (string-append web2c "updmap.cfg")))
(install-file #$(file-append updmap.cfg "/web2c/updmap.cfg") web2c) (install-file #$(file-append texlive-scripts
"/share/texmf-dist/web2c/updmap.cfg")
web2c)
(make-file-writable updmap.cfg) (make-file-writable updmap.cfg)
(let* ((port (open-pipe* OPEN_WRITE (let* ((port (open-pipe* OPEN_WRITE
#$(file-append texlive-scripts "/bin/updmap-sys") #$(file-append texlive-scripts "/bin/updmap-sys")
@ -1867,6 +1866,8 @@ MANIFEST."
(let ((a (string-append #$output "/share/texmf-dist")) (let ((a (string-append #$output "/share/texmf-dist"))
(b "/tmp/texlive/share/texmf-dist") (b "/tmp/texlive/share/texmf-dist")
(mktexlsr #$(file-append texlive-scripts "/bin/mktexlsr"))) (mktexlsr #$(file-append texlive-scripts "/bin/mktexlsr")))
;; Ignore original "updmap.cfg" from texlive-scripts input.
(delete-file "/tmp/texlive/share/texmf-dist/web2c/updmap.cfg")
(copy-recursively a b) (copy-recursively a b)
(invoke mktexlsr b) (invoke mktexlsr b)
(install-file (string-append b "/ls-R") a)))))) (install-file (string-append b "/ls-R") a))))))