ngz pushed a commit to branch tex-team-next in repository guix. commit f6957971d3c9131391c4a62375933c705a0412c1 Author: Nicolas Goaziou <m...@nicolasgoaziou.fr> AuthorDate: Sun May 14 10:25:12 2023 +0200
gnu: texlive-latex-tabulary -> texlive-tabulary. * gnu/packages/tex.scm (texlive-tabulary): New variable. (texlive-latex-tabulary): Deprecate variable. * gnu/packages/maths.scm (hypre): * gnu/packages/sphinx.scm (python-sphinx): Use new name. --- gnu/packages/maths.scm | 2 +- gnu/packages/sphinx.scm | 2 +- gnu/packages/tex.scm | 25 ++++++++++++++----------- 3 files changed, 16 insertions(+), 13 deletions(-) diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index c33dcdca12..4df5c29375 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -5788,7 +5788,7 @@ set.") texlive-newunicodechar texlive-parskip texlive-stackengine - texlive-latex-tabulary + texlive-tabulary texlive-tocloft texlive-upquote texlive-latex-varwidth diff --git a/gnu/packages/sphinx.scm b/gnu/packages/sphinx.scm index 5bc2f29e8c..24d6accd9a 100644 --- a/gnu/packages/sphinx.scm +++ b/gnu/packages/sphinx.scm @@ -125,7 +125,7 @@ texlive-latex-needspace texlive-parskip texlive-latex-preview - texlive-latex-tabulary + texlive-tabulary texlive-titlesec texlive-tools ;multicol, longtable texlive-upquote diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm index 2fa6d3bdc6..35abb3a4af 100644 --- a/gnu/packages/tex.scm +++ b/gnu/packages/tex.scm @@ -7663,20 +7663,21 @@ the more recent @code{subcaption} package more satisfactory.") (define-deprecated-package texlive-latex-subfigure texlive-subfigure) -(define-public texlive-latex-tabulary +(define-public texlive-tabulary (package - (name "texlive-latex-tabulary") + (name "texlive-tabulary") (version (number->string %texlive-revision)) - (source (origin - (method svn-fetch) - (uri (texlive-ref "latex" "tabulary")) - (file-name (string-append name "-" version "-checkout")) - (sha256 - (base32 - "1adkdx2zkk42g82nqf57lv1nc1z7kwl13jmy8vpcsizsa0xdnx9n")))) + (source (texlive-origin + name version + (list "doc/latex/tabulary/" "source/latex/tabulary/" + "tex/latex/tabulary/") + (base32 + "00afi9r5264rhfy5kg73fk763i7wm6bvzkmrlg7n17fwl6hx0sa1"))) + (outputs '("out" "doc")) (build-system texlive-build-system) - (arguments '(#:tex-directory "latex/tabulary")) - (home-page "https://www.ctan.org/pkg/tabulary") + (propagated-inputs + (list texlive-tools)) + (home-page "https://ctan.org/pkg/tabulary") (synopsis "Tabular with variable width columns balanced") (description "The package defines a @code{tabular*}-like environment, @code{tabulary}, @@ -7688,6 +7689,8 @@ variable width columns (@code{\\raggedright}, @code{\\centering}, according to the natural width of the widest cell in the column.") (license license:lppl))) +(define-deprecated-package texlive-latex-tabulary texlive-tabulary) + (define-public texlive-latex-threeparttable (package (name "texlive-latex-threeparttable")