diff options
| author | Nicolas Goaziou <mail@nicolasgoaziou.fr> | 2023-05-13 00:00:28 +0200 |
|---|---|---|
| committer | Nicolas Goaziou <mail@nicolasgoaziou.fr> | 2023-07-18 18:10:37 +0200 |
| commit | 88f97c65a1631bae028af408c04429c59c4286cd (patch) | |
| tree | 5f96ce7228a78e6a48cdb492b109b0fb662ce1e0 | |
| parent | 3d97b99afe48c7c4e05029a784a78eacf2b4b767 (diff) | |
| download | guix-patches-88f97c65a1631bae028af408c04429c59c4286cd.tar guix-patches-88f97c65a1631bae028af408c04429c59c4286cd.tar.gz | |
gnu: texlive-latex-cyrillic -> texlive-cyrillic.
* gnu/packages/tex.scm (texlive-cyrillic): New variable.
(texlive-latex-cyrillic): Deprecate variable.
(texlive-base):
(texlive-xindy):
* gnu/packages/music.scm (lilypond): Use new name.
| -rw-r--r-- | gnu/packages/music.scm | 4 | ||||
| -rw-r--r-- | gnu/packages/tex.scm | 38 |
2 files changed, 25 insertions, 17 deletions
diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm index bc7ea0ab7f..458d4e827d 100644 --- a/gnu/packages/music.scm +++ b/gnu/packages/music.scm @@ -1508,9 +1508,9 @@ and auto-mapping slices to MIDI note numbers.") texinfo texi2html-1.82 (texlive-updmap.cfg - (list texlive-epsf + (list texlive-cyrillic + texlive-epsf texlive-fontinst - texlive-latex-cyrillic texlive-lh texlive-lm texlive-metapost)) diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm index 9fda52b076..d622799c26 100644 --- a/gnu/packages/tex.scm +++ b/gnu/packages/tex.scm @@ -4535,28 +4535,36 @@ support of Swedish in @code{babel}. It provides all the necessary macros, definitions and settings to typeset Swedish documents.") (license license:lppl1.3c+)))) -(define-public texlive-latex-cyrillic +(define-public texlive-cyrillic (package - (name "texlive-latex-cyrillic") + (name "texlive-cyrillic") (version (number->string %texlive-revision)) - (source (origin - (method svn-fetch) - (uri (texlive-ref "latex" "cyrillic")) - (file-name (string-append name "-" version "-checkout")) - (sha256 - (base32 - "083xbwg7hrnlv47fkwvz8yjb830bhxx7y0mq7z7nz2f96y2ldr6b")))) + (source (texlive-origin + name version + (list "doc/latex/cyrillic/" + "source/latex/cyrillic/" + "tex/latex/cyrillic/") + (base32 + "0a1dcpdgnzf08cd1b9ihdk4229aw19ar0f5sfjr44fqqwkav3l5i"))) + (outputs '("out" "doc")) (build-system texlive-build-system) (arguments - '(#:tex-directory "latex/cyrillic")) - (home-page "https://www.ctan.org/pkg/latex-cyrillic") + (list + #:tex-engine "tex" + #:tex-format #f + #:texlive-latex-base #f)) + (native-inputs + (list texlive-docstrip)) + (home-page "https://ctan.org/pkg/cyrillic") (synopsis "Support for Cyrillic fonts in LaTeX") (description "This bundle of macros files provides macro support (including font encoding macros) for the use of Cyrillic characters in fonts encoded under the -T2* and X2 encodings. These encodings cover (between them) pretty much every +T2* and X2 encodings. These encodings cover (between them) pretty much every language that is written in a Cyrillic alphabet.") - (license license:lppl1.3c+))) + (license license:lppl1.3+))) + +(define-deprecated-package texlive-latex-cyrillic texlive-cyrillic) (define-public texlive-passivetex (package @@ -4766,7 +4774,7 @@ part of the LaTeX required set of packages.") texlive-amscls texlive-babel texlive-generic-babel-english - texlive-latex-cyrillic + texlive-cyrillic texlive-psnfss texlive-tools texlive-tetex))) @@ -11686,7 +11694,7 @@ handle complex tests.") texlive-greek-fontenc texlive-hyperref texlive-latex-base - texlive-latex-cyrillic + texlive-cyrillic texlive-latex-geometry (texlive-updmap.cfg ;fonts (list texlive-cbfonts |