me/guix
Archived
1
0
Fork 0
Code Activity

gnu: texlive-latex-xkeyval -> texlive-xkeyval.

Browse source 
* gnu/packages/tex.scm (texlive-xkeyval): New variable.
(texlive-latex-xkeyval): Deprecate variable.
(texlive-bidi):
(texlive-pstool):
(texlive-polyglossia):
(texlive-zref):
(texlive-standalone):
(texlive-todonotes):
(texlive-adjustbox):
(texlive-qrcode):
(texlive-breakurl):
* gnu/packages/graphviz.scm (dot2tex):
* gnu/packages/statistics.scm (r-with-tests): Use new name.
This commit is contained in:
Nicolas Goaziou 2023-05-13 16:02:47 +02:00
parent 76819a9655
commit 402f256f81
No known key found for this signature in database
GPG key ID: DA00B4F048E92F2D
3 changed files with 54 additions and 77 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
gnu/packages/graphviz.scm
View file

@ -385,16 +385,16 @@ graphs in Graphviz's DOT language, written in pure Python.")
(list python-pyparsing (list python-pyparsing
;; These TeX dependencies are propagated to make it easier to build ;; These TeX dependencies are propagated to make it easier to build
;; the resulting generated TeX files, which \usepackage them. ;; the resulting generated TeX files, which \usepackage them.
texlive-bin
texlive-amsmath texlive-amsmath
texlive-bin
texlive-geometry texlive-geometry
texlive-graphics texlive-graphics
texlive-latex-base texlive-latex-base
texlive-latex-preview texlive-latex-preview
texlive-latex-xkeyval
texlive-pgf texlive-pgf
texlive-pstricks texlive-pstricks
texlive-xcolor)) texlive-xcolor
texlive-xkeyval))
(home-page "https://github.com/kjellmf/dot2tex") (home-page "https://github.com/kjellmf/dot2tex")
(synopsis "Graphviz to LaTeX converter") (synopsis "Graphviz to LaTeX converter")
(description (description

2
gnu/packages/statistics.scm
View file

@ -401,7 +401,7 @@ as.POSIXct(if (\"\" != Sys.getenv(\"SOURCE_DATE_EPOCH\")) {\
texlive-tools texlive-tools
texlive-upquote texlive-upquote
texlive-url texlive-url
texlive-latex-xkeyval)) texlive-xkeyval))
tzdata-for-tests tzdata-for-tests
xz)) xz))
(inputs (inputs

123
gnu/packages/tex.scm
View file

@ -641,7 +641,7 @@ This package contains the binaries.")
(propagated-inputs (list texlive-iftex (propagated-inputs (list texlive-iftex
texlive-ltxcmds texlive-ltxcmds
texlive-hyperref texlive-hyperref
texlive-latex-xkeyval texlive-xkeyval
texlive-zref)) texlive-zref))
(home-page "https://ctan.org/pkg/bidi") (home-page "https://ctan.org/pkg/bidi")
(synopsis "Bidirectional typesetting in plain TeX and LaTeX using XeTeX") (synopsis "Bidirectional typesetting in plain TeX and LaTeX using XeTeX")
@ -5528,7 +5528,7 @@ rotated.")
texlive-psfrag texlive-psfrag
texlive-tools ; for shellesc texlive-tools ; for shellesc
texlive-trimspaces texlive-trimspaces
texlive-latex-xkeyval)) texlive-xkeyval))
(home-page "https://www.ctan.org/pkg/pstool") (home-page "https://www.ctan.org/pkg/pstool")
(synopsis "Process PostScript graphics within pdfLaTeX documents") (synopsis "Process PostScript graphics within pdfLaTeX documents")
(description (description
@ -6314,7 +6314,7 @@ also provides compacted versions of enumerate and itemize.")
texlive-makecmds texlive-makecmds
texlive-l3packages ;expl3, l3keys2e, xparse texlive-l3packages ;expl3, l3keys2e, xparse
texlive-tools texlive-tools
texlive-latex-xkeyval)) texlive-xkeyval))
(home-page "https://www.ctan.org/pkg/polyglossia") (home-page "https://www.ctan.org/pkg/polyglossia")
(synopsis "Alternative to Babel for XeLaTeX and LuaLaTeX") (synopsis "Alternative to Babel for XeLaTeX and LuaLaTeX")
(description "This package provides a complete Babel replacement for users (description "This package provides a complete Babel replacement for users
@ -7126,7 +7126,7 @@ format under XeTeX.")
texlive-atveryend texlive-atveryend
texlive-kvoptions texlive-kvoptions
texlive-pdftexcmds texlive-pdftexcmds
texlive-latex-xkeyval)) texlive-xkeyval))
(home-page "https://github.com/ho-tex/zref") (home-page "https://github.com/ho-tex/zref")
(synopsis "Reference scheme for LaTeX") (synopsis "Reference scheme for LaTeX")
(description "This package offers a means to remove the limitation, of (description "This package offers a means to remove the limitation, of
@ -10325,76 +10325,51 @@ used in place of @code{tabular}, @code{tabular*} and @code{tabularx}
environments, as well as the @code{array} environment in maths mode.") environments, as well as the @code{array} environment in maths mode.")
(license license:lppl1.3+)))) (license license:lppl1.3+))))
(define-public texlive-latex-xkeyval (define-public texlive-xkeyval
(package (package
(name "texlive-latex-xkeyval") (name "texlive-xkeyval")
(version (number->string %texlive-revision)) (version (number->string %texlive-revision))
(source (origin (source (texlive-origin
(method svn-fetch) name version
(uri (texlive-ref "latex" "xkeyval")) (list "doc/latex/xkeyval/"
(file-name (string-append name "-" version "-checkout")) "source/latex/xkeyval/"
(sha256 "tex/generic/xkeyval/"
(base32 "tex/latex/xkeyval/")
"0w4x82wmdvcmy8z3p55xvpz5q7jac1q1j591hi8mngfyqa8rda1c")))) (base32
"0hcfqxbi907yi9jwq61i638n8g9abf6zc0aazk2lxzshy44h3ms1")))
(outputs '("out" "doc"))
(build-system texlive-build-system) (build-system texlive-build-system)
(arguments (arguments
'(#:tex-directory "latex/xkeyval" '(#:build-targets '("xkeyval.dtx")
#:build-targets '("xkeyval.dtx") #:tex-format "latex" ;won't build with luatex
#:tex-format "latex" ; won't build with luatex
#:phases #:phases
(modify-phases %standard-phases (modify-phases %standard-phases
;; This package cannot be built out of tree as it expects to find ;; This package cannot be built out of tree as it expects to find
;; built files in the working directory. ;; built files in the working directory.
(add-before 'build 'fix-build (add-before 'build 'fix-build
(lambda _ (lambda _
(setenv "TEXINPUTS" (setenv "TEXINPUTS" (string-append (getcwd) "/build:"))
(string-append (getcwd) "/build:")) (substitute* "source/latex/xkeyval/xkeyval.dtx"
(substitute* "xkeyval.dtx"
(("usepackage\\{xcolor\\}") (("usepackage\\{xcolor\\}")
"usepackage[dvips]{xcolor}")) "usepackage[dvips]{xcolor}")))))))
#t))
;; FIXME: We don't have a package for this font yet.
(add-after 'unpack 'remove-dependency-on-fourier
(lambda _
(substitute* "xkeyval.dtx"
(("\\\\usepackage\\{fourier\\}") ""))
#t))
(add-after 'install 'move-files
(lambda* (#:key outputs #:allow-other-keys)
(let* ((out (assoc-ref outputs "out"))
(share (string-append out "/share/texmf-dist"))
(source (string-append share "/tex/latex/xkeyval/"))
(target (string-append share "/tex/generic/xkeyval/")))
(mkdir-p target)
(for-each (lambda (file)
(rename-file (string-append source file)
(string-append target file)))
'("keyval.tex"
"pst-xkey.tex"
"xkeyval.tex"
"xkvex1.tex"
"xkvex2.tex"
"xkvex3.tex"
"xkvex4.tex"
"xkvtxhdr.tex"
"xkvutils.tex"))
#t))))))
(native-inputs (native-inputs
(list texlive-cm (list (texlive-updmap.cfg
texlive-footmisc (list texlive-ec
texlive-graphics-def texlive-footmisc
texlive-iftex texlive-fourier
texlive-latex-base texlive-graphics-def
texlive-listings texlive-iftex
texlive-lm texlive-listings
texlive-pgf texlive-lm
texlive-pst-text texlive-pgf
texlive-pstricks texlive-pst-text
texlive-tools texlive-pstricks
texlive-url texlive-url
texlive-xcolor)) texlive-xcolor))))
(home-page "http://www.ctan.org/pkg/xkeyval") (propagated-inputs
(synopsis "Extension of the keyval package") (list texlive-tools))
(home-page "https://ctan.org/pkg/xkeyval")
(synopsis "Extension of the @code{keyval} package")
(description (description
"This package is an extension of the keyval package and offers additional "This package is an extension of the keyval package and offers additional
macros for setting keys and declaring and setting class or package options. macros for setting keys and declaring and setting class or package options.
@ -10404,6 +10379,8 @@ all help use in documents where several packages define their own sets of
keys.") keys.")
(license license:lppl1.3+))) (license license:lppl1.3+)))
(define-deprecated-package texlive-latex-xkeyval texlive-xkeyval)
(define-public texlive-standalone (define-public texlive-standalone
(package (package
(name "texlive-standalone") (name "texlive-standalone")
@ -10419,7 +10396,7 @@ keys.")
(build-system texlive-build-system) (build-system texlive-build-system)
(arguments '(#:tex-directory "latex/standalone")) (arguments '(#:tex-directory "latex/standalone"))
(propagated-inputs (propagated-inputs
(list texlive-latex-xkeyval)) (list texlive-xkeyval))
(native-inputs (native-inputs
(list texlive-ydoc)) (list texlive-ydoc))
(home-page "http://www.ctan.org/pkg/standalone") (home-page "http://www.ctan.org/pkg/standalone")
@ -10619,7 +10596,7 @@ citations and references.")
(package (package
(inherit template) (inherit template)
(propagated-inputs (propagated-inputs
(list texlive-pgf texlive-latex-xkeyval)) (list texlive-pgf texlive-xkeyval))
(home-page "http://www.ctan.org/pkg/todonotes") (home-page "http://www.ctan.org/pkg/todonotes")
(synopsis "Marking things to do in a LaTeX document") (synopsis "Marking things to do in a LaTeX document")
(description "The @code{todonotes} package lets the user mark (description "The @code{todonotes} package lets the user mark
@ -11378,12 +11355,12 @@ the list of graphics file extensions recognised by package graphics.")
(native-inputs (native-inputs
(list texlive-ydoc)) (list texlive-ydoc))
(propagated-inputs (propagated-inputs
(list texlive-latex-varwidth (list texlive-collectbox
texlive-latex-xkeyval
texlive-collectbox
texlive-ifoddpage texlive-ifoddpage
texlive-pgf
texlive-storebox texlive-storebox
texlive-pgf)) texlive-latex-varwidth
texlive-xkeyval))
(home-page "https://www.ctan.org/pkg/adjustbox") (home-page "https://www.ctan.org/pkg/adjustbox")
(synopsis "Graphics package-alike macros for “general” boxes") (synopsis "Graphics package-alike macros for “general” boxes")
(description "The package provides several macros to adjust boxed (description "The package provides several macros to adjust boxed
@ -11412,14 +11389,14 @@ provided box macros are @code{\\lapbox}, @code{\\marginbox},
#:tex-directory "latex/qrcode")) #:tex-directory "latex/qrcode"))
(propagated-inputs (propagated-inputs
(list texlive-lm (list texlive-lm
texlive-latex-xkeyval texlive-xcolor
texlive-xcolor)) texlive-xkeyval))
(native-inputs (native-inputs
(list (texlive-updmap.cfg (list texlive-lm texlive-zapfding)) (list (texlive-updmap.cfg (list texlive-lm texlive-zapfding))
texlive-hyperref texlive-hyperref
texlive-latex-xkeyval
texlive-stringenc texlive-stringenc
texlive-xcolor)) texlive-xcolor
texlive-xkeyval))
(home-page "https://www.ctan.org/pkg/qrcode") (home-page "https://www.ctan.org/pkg/qrcode")
(synopsis "QR codes without external tools") (synopsis "QR codes without external tools")
(description "This package creates @acronym{QR,Quick Response} codes for (description "This package creates @acronym{QR,Quick Response} codes for
@ -12539,7 +12516,7 @@ both designated as support for @code{breqn}.")
(outputs '("out" "doc")) (outputs '("out" "doc"))
(build-system texlive-build-system) (build-system texlive-build-system)
(propagated-inputs (propagated-inputs
(list texlive-iftex texlive-latex-xkeyval)) (list texlive-iftex texlive-xkeyval))
(home-page "https://ctan.org/pkg/breakurl") (home-page "https://ctan.org/pkg/breakurl")
(synopsis "Line-breakable links in @code{hyperref} for dvips/ps2pdf") (synopsis "Line-breakable links in @code{hyperref} for dvips/ps2pdf")
(description (description