Package: guix-patches;
Reported by: Marius Bakke <marius <at> gnu.org>
Date: Mon, 24 May 2021 14:41:02 UTC
Severity: normal
Tags: patch
Done: Marius Bakke <marius <at> gnu.org>
Bug is archived. No further changes may be made.
To add a comment to this bug, you must first unarchive it, by sending
a message to control AT debbugs.gnu.org, with unarchive 48622 in the body.
You can then email your comments to 48622 AT debbugs.gnu.org in the normal way.
Toggle the display of automated, internal messages from the tracker.
View this report as an mbox folder, status mbox, maintainer mbox
guix-patches <at> gnu.org
:bug#48622
; Package guix-patches
.
(Mon, 24 May 2021 14:41:02 GMT) Full text and rfc822 format available.Marius Bakke <marius <at> gnu.org>
:guix-patches <at> gnu.org
.
(Mon, 24 May 2021 14:41:02 GMT) Full text and rfc822 format available.Message #5 received at submit <at> debbugs.gnu.org (full text, mbox):
From: Marius Bakke <marius <at> gnu.org> To: guix-patches <at> gnu.org Subject: [PATCH core-updates 00/29] TeX Live 2020 Date: Mon, 24 May 2021 16:40:48 +0200
Here it comes... The much rumored TeX Live 2020 update! And final GCC 10 blocker. I haven't been able to test all the TeX users, as some are failing to build on the 'core-updates' branch. But of those that do build, there is only a single regression from 'master' (hypre). There are a couple of potential issues still. One is that I don't understand why shebang patching in 'simple-texlive-package' is necessary. IIRC the problem occured after Maxims texlive-union refactoring, but I don't see why this update should affect that. Another is that texlive-base propagates kpathsea just to get 'mktex.opt' into the texlive-updmap.cfg union. I don't know what caused this regression, but I'm sure there are better ways to deal with that. Help wanted, as I suffer from temporary TeX blindness! Most of the new packages are intended to replace 'texlive-oberdiek'. That's because texlive-oberdiek had problems in my original branch, which preceded both Ricardos wip-texlive work and Maxims texlive-union refactoring. Oberdiek is no longer problematic(!), but it's nice to have the smaller components in any case. Finally, there are still indeterministic build failures in the various TeX components. I have about a 80% success rate. :-/ And one more thing... TeX Live 2021 was released just a month ago. I'm going to attempt a naive update once this is merged, but won't bother if it requires more work than simply updating the hashes. Marius Bakke (29): gnu: TeX Live: Update to 2020.0. gnu: Add texlive-latex-refcount. gnu: Add texlive-latex-bookmark. gnu: dblatex: Update to 0.3.12. gnu: simple-texlive-package: Fix shebang patching. gnu: Add texlive-latex-atveryend. gnu: Add texlive-latex-auxhook. gnu: Add texlive-latex-epstopdf-pkg. gnu: Add texlive-latex-hycolor. gnu: Add texlive-generic-infwarerr. gnu: Add texlive-generic-ltxcmds. gnu: Add texlive-latex-pdftexcmds. gnu: Add texlive-latex-letltxmacro. gnu: Add texlive-generic-atbegshi. gnu: Add texlive-generic-intcalc. gnu: Add texlive-generic-bigintcalc. gnu: Add texlive-generic-bitset. gnu: Add texlive-generic-etexcmds. gnu: Add texlive-generic-gettitlestring. gnu: Add texlive-generic-kvdefinekeys. gnu: Add texlive-generic-kvsetkeys. gnu: Add texlive-latex-kvoptions. gnu: Add texlive-generic-pdfescape. gnu: Add texlive-generic-uniquecounter. gnu: Add texlive-latex-rerunfilecheck. gnu: texlive-base: Propagate texlive-kpathsea. gnu: texlive-hyperref: Don't propagate texlive-oberdiek. gnu: texlive-graphics-def: Propagate missing dependency. gnu: dblatex: Remove unused TeX inputs. gnu/local.mk | 2 - gnu/packages/docbook.scm | 18 +- .../patches/texlive-bin-poppler-0.83.patch | 52 -- .../patches/texlive-bin-poppler-0.86.patch | 17 - gnu/packages/tex.scm | 801 +++++++++++++----- guix/build-system/texlive.scm | 4 +- 6 files changed, 596 insertions(+), 298 deletions(-) delete mode 100644 gnu/packages/patches/texlive-bin-poppler-0.83.patch delete mode 100644 gnu/packages/patches/texlive-bin-poppler-0.86.patch -- 2.31.1
guix-patches <at> gnu.org
:bug#48622
; Package guix-patches
.
(Mon, 24 May 2021 14:44:02 GMT) Full text and rfc822 format available.Message #8 received at 48622 <at> debbugs.gnu.org (full text, mbox):
From: Marius Bakke <marius <at> gnu.org> To: 48622 <at> debbugs.gnu.org Subject: [PATCH core-updates 01/29] gnu: TeX Live: Update to 2020.0. Date: Mon, 24 May 2021 16:43:05 +0200
* guix/build-system/texlive.scm (%texlive-tag): Set to 2020.0. (%texlive-revision): Set to 54632. * gnu/packages/tex.scm (texlive-extra-src, texlive-texmf-src, texlive-bin, texlive-texmf, texlive): Update to 20200406. (texlive-bin)[source](patches): Remove. [arguments]: Adjust poppler compatibility phase for new upstream patches. * gnu/packages/tex.scm (hyph-utf8-scripts, texlive-docstrip, texlive-unicode-data texlive-hyphen-base, texlive-dvips, texlive-metafont-base, texlive-fontinst, texlive-fontname, texlive-tex-plain, texlive-hyphen-bulgarian, texlive-hyphen-chinese, texlive-hyphen-hungarian, texlive-hyphen-latin, texlive-hyphen-sanskrit, texlive-hyphen-spanish, texlive-hyph-utf8, texlive-kpathsea, texlive-latexconfig, texlive-latex-base, texlive-union, texlive-latex-filecontents, texlive-latex-fancyvrb, texlive-graphics-def, texlive-latex-graphics, texlive-latex-oberdiek, texlive-latex-tools, texlive-latex-l3kernel, texlive-latex-l3packages, texlive-latex-fontspec, texlive-latex-amsmath, texlive-latex-babel, texlive-latex-draftwatermark, texlive-etoolbox, texlive-latex-geometry, texlive-latex-polyglossia, texlive-latex-supertabular, texlive-tex-texinfo, texlive-latex-appendix, texlive-latex-colortbl, texlive-latex-listings, texlive-inconsolata, texlive-latex-enumitem, texlive-latex-multirow, texlive-latex-overpic, texlive-latex-parskip, texlive-latex-pdfpages, texlive-libertine, texlive-latex-titlesec, texlive-metapost, texlive-latex-acmart, texlive-latex-wasysym, texlive-latex-preview, texlive-latex-acronym, texlive-pdftex, texlive-latex-media9, texlive-latex-ocgx2, texlive-latex-ms, texlive-generic-ulem, texlive-latex-pgf, texlive-latex-koma-script, texlive-generic-listofitems, texlive-bibtex, texlive-context-base, texlive-beamer, texlive-pstricks, texlive-marginnote, texlive-iftex, texlive-tools, texlive-siunitx, texlive-booktabs, texlive-csquotes, texlive-biblatex, texlive-microtype, texlive-caption, texlive-ydoc, texlive-courier, texlive-hyperref, texlive-fontspec, texlive-l3build, texlive-luaotfload, texlive-babel, texlive-tipa, texlive-jknappen, texlive-wasy, texlive-context, texlive-cabin, texlive-fourier, texlive-mweights, texlive-newtx, texlive-xcharter, texlive-tcolorbox): Update hashes. (texlive-hyphen-bulgarian): Don't include removed files. (texlive-hyphen-hungarian, texlive-hyphen-sanskrit): Adjust for directory rename. (texlive-hyphen-chinese, texlive-hyphen-latin): Add more files. (texlive-hyphen-macedonian): New public variable. (texlive-metafont-base)[source]: Switch to SVN-MULTI-FETCH. [arguments]: Adjust for extra source files. (texlive-latex-base)[arguments]: Disable more formats. [propagated-inputs]: Add TEXLIVE-HYPHEN-MACEDONIAN. (texlive-fontinst): Don't include "scripts/texlive/fontinst.sh". (texlive-generic-iftex): New public variable. (texlive-iftex, texlive-generic-ifxetex): Deprecate in favor of TEXLIVE-GENERIC-IFTEX. (texlive-latex-oberdiek)[propagated-inputs]: Change from TEXLIVE-GENERIC-IFXETEX to TEXLIVE-GENERIC-IFTEX. (texlive-latex-xkeyval)[native-inputs]: Likewise. (texlive-default-updmap.cfg): Remove variable. * gnu/packages/patches/texlive-bin-poppler-0.83.patch, gnu/packages/patches/texlive-bin-poppler-0.86.patch: Delete files. * gnu/local.mk (dist_patch_DATA): Adjust accordingly. --- gnu/local.mk | 2 - gnu/packages/docbook.scm | 2 +- .../patches/texlive-bin-poppler-0.83.patch | 52 --- .../patches/texlive-bin-poppler-0.86.patch | 17 - gnu/packages/tex.scm | 380 ++++++++---------- guix/build-system/texlive.scm | 4 +- 6 files changed, 171 insertions(+), 286 deletions(-) delete mode 100644 gnu/packages/patches/texlive-bin-poppler-0.83.patch delete mode 100644 gnu/packages/patches/texlive-bin-poppler-0.86.patch diff --git a/gnu/local.mk b/gnu/local.mk index ecbf67118e..aca50f576a 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1687,8 +1687,6 @@ dist_patch_DATA = \ %D%/packages/patches/tcsh-fix-autotest.patch \ %D%/packages/patches/teensy-loader-cli-help.patch \ %D%/packages/patches/texinfo-5-perl-compat.patch \ - %D%/packages/patches/texlive-bin-poppler-0.83.patch \ - %D%/packages/patches/texlive-bin-poppler-0.86.patch \ %D%/packages/patches/telegram-purple-adjust-test.patch \ %D%/packages/patches/telepathy-glib-channel-memory-leak.patch \ %D%/packages/patches/texi2html-document-encoding.patch \ diff --git a/gnu/packages/docbook.scm b/gnu/packages/docbook.scm index 3fd1930c79..ee21d1b359 100644 --- a/gnu/packages/docbook.scm +++ b/gnu/packages/docbook.scm @@ -430,7 +430,7 @@ the in DocBook SGML DTDs.") texlive-fonts-rsfs texlive-fonts-stmaryrd - texlive-generic-ifxetex))) + texlive-generic-iftex))) ("imagemagick" ,imagemagick) ;for convert ("inkscape" ,inkscape) ;for svg conversion ("docbook" ,docbook-xml) diff --git a/gnu/packages/patches/texlive-bin-poppler-0.83.patch b/gnu/packages/patches/texlive-bin-poppler-0.83.patch deleted file mode 100644 index 5e57e3efac..0000000000 --- a/gnu/packages/patches/texlive-bin-poppler-0.83.patch +++ /dev/null @@ -1,52 +0,0 @@ -Fix build with Poppler 0.83 and later. - -Taken from Arch Linux, but adjusted to patch the versioned Poppler -files, as upstream applies it after copying them in place. -https://git.archlinux.org/svntogit/packages.git/tree/trunk/texlive-poppler-0.83.patch?h=packages/texlive-bin - -diff -ru texlive-source-orig/texk/web2c/pdftexdir/pdftoepdf-poppler0.76.0.cc texlive-source/texk/web2c/pdftexdir/pdftoepdf-poppler0.76.0.cc ---- texlive-source-orig/texk/web2c/pdftexdir/pdftoepdf-poppler0.76.0.cc -+++ texlive-source/texk/web2c/pdftexdir/pdftoepdf-poppler0.76.0.cc -@@ -723,7 +723,7 @@ - #endif - // initialize - if (!isInit) { -- globalParams = new GlobalParams(); -+ globalParams.reset(new GlobalParams()); - globalParams->setErrQuiet(false); - isInit = true; - } -@@ -1108,6 +1108,5 @@ - delete_document(p); - } - // see above for globalParams -- delete globalParams; - } - } -diff -ru texlive-source-orig/texk/web2c/pdftexdir/pdftosrc-poppler0.76.0.cc texlive-source/texk/web2c/pdftexdir/pdftosrc-poppler0.76.0.cc ---- texlive-source-orig/texk/web2c/pdftexdir/pdftosrc-poppler0.76.0.cc -+++ texlive-source/texk/web2c/pdftexdir/pdftosrc-poppler0.76.0.cc -@@ -79,7 +79,7 @@ - exit(1); - } - fileName = new GString(argv[1]); -- globalParams = new GlobalParams(); -+ globalParams.reset(new GlobalParams()); - doc = new PDFDoc(fileName); - if (!doc->isOk()) { - fprintf(stderr, "Invalid PDF file\n"); -@@ -100,7 +100,7 @@ - if (objnum == 0) { - srcStream = catalogDict.dictLookup("SourceObject"); - static char const_SourceFile[] = "SourceFile"; -- if (!srcStream.isStream(const_SourceFile)) { -+ if (!srcStream.isDict(const_SourceFile)) { - fprintf(stderr, "No SourceObject found\n"); - exit(1); - } -@@ -202,5 +202,4 @@ - fprintf(stderr, "Cross-reference table extracted to %s\n", outname); - fclose(outfile); - delete doc; -- delete globalParams; - } diff --git a/gnu/packages/patches/texlive-bin-poppler-0.86.patch b/gnu/packages/patches/texlive-bin-poppler-0.86.patch deleted file mode 100644 index b1adca657b..0000000000 --- a/gnu/packages/patches/texlive-bin-poppler-0.86.patch +++ /dev/null @@ -1,17 +0,0 @@ -Fix build with Poppler 0.86 and later. - -Taken from Arch Linux, but adjusted to patch the versioned Poppler -files, as upstream applies it after copying them in place. -https://git.archlinux.org/svntogit/packages.git/tree/trunk/texlive-poppler-0.86.patch?h=packages/texlive-bin - ---- a/texk/web2c/pdftexdir/pdftoepdf-poppler0.76.0.cc 2020-03-03 21:11:35.102711802 +0000 -+++ b/texk/web2c/pdftexdir/pdftoepdf-poppler0.76.0.cc 2020-03-03 21:13:13.057420111 +0000 -@@ -757,7 +757,7 @@ - if (page_name) { - // get page by name - GString name(page_name); -- LinkDest *link = pdf_doc->doc->findDest(&name); -+ LinkDest *link = pdf_doc->doc->findDest(&name).get(); - if (link == 0 || !link->isOk()) - pdftex_fail("PDF inclusion: invalid destination <%s>", page_name); - Ref ref = link->getPageRef(); diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm index 0634b6e79f..1cf288ee2f 100644 --- a/gnu/packages/tex.scm +++ b/gnu/packages/tex.scm @@ -8,7 +8,7 @@ ;;; Copyright © 2016 Thomas Danckaert <post <at> thomasdanckaert.be> ;;; Copyright © 2016, 2017, 2018, 2019, 2020, 2021 Ricardo Wurmus <rekado <at> elephly.net> ;;; Copyright © 2017 Leo Famulari <leo <at> famulari.name> -;;; Copyright © 2017, 2020 Marius Bakke <mbakke <at> fastmail.com> +;;; Copyright © 2017, 2020, 2021 Marius Bakke <marius <at> gnu.org> ;;; Copyright © 2017, 2018, 2019, 2020 Tobias Geerinckx-Rice <me <at> tobias.gr> ;;; Copyright © 2018 Danny Milosavljevic <dannym+a <at> scratchpost.org> ;;; Copyright © 2018, 2020 Arun Isaac <arunisaac <at> systemreboot.net> @@ -149,7 +149,7 @@ copied to their outputs; otherwise the TEXLIVE-BUILD-SYSTEM is used." "-checkout")) (sha256 (base32 - "0lk7shx768sxvgr85y8bnmmnj8x4bbkgpxrz3z8jp8avi33prw83")))) + "1gdyc8nmvp5jqlc429rmfzfl0cqqsdayc70y1hxwz025pv9jn960")))) (define (texlive-hyphen-package name code locations hash) "Return a TeX Live hyphenation package with the given NAME, using source @@ -222,47 +222,29 @@ files from LOCATIONS with expected checksum HASH. CODE is not currently in use. (define texlive-extra-src (origin (method url-fetch) - (uri "ftp://tug.org/historic/systems/texlive/2019/texlive-20190410-extra.tar.xz") + (uri "ftp://tug.org/historic/systems/texlive/2020/texlive-20200406-extra.tar.xz") (sha256 (base32 - "13ncf2an4nlqv18lki6y2p6pcsgs1i54zqkhfwprax5j53bk70j8")))) + "0kx6r2ncnqpmhs0jhjk4ypq99czcvql9l9n0npcgqzrv4qmzsg94")))) (define texlive-texmf-src (origin (method url-fetch) - (uri "ftp://tug.org/historic/systems/texlive/2019/texlive-20190410-texmf.tar.xz") + (uri "ftp://tug.org/historic/systems/texlive/2020/texlive-20200406-texmf.tar.xz") (sha256 (base32 - "00n4qh9fj8v9zzy3y488hpfq1g3dnnh72y4yjsaikfcqpi59gv62")))) + "15ashyxm3j78wjik1pp7vwi1wg07xjgh9zv0vkhqim6g7rc7xa8a")))) (define-public texlive-bin (package (name "texlive-bin") - (version "20190410") + (version "20200406") (source (origin (method url-fetch) - (uri (string-append "ftp://tug.org/historic/systems/texlive/2019/" + (uri (string-append "ftp://tug.org/historic/systems/texlive/2020/" "texlive-" version "-source.tar.xz")) (sha256 (base32 - "1dfps39q6bdr1zsbp9p74mvalmy3bycihv19sb9c6kg30kprz8nj")) - (patches - (let ((arch-patch - (lambda (name revision hash) - (origin - (method url-fetch) - (uri (string-append "https://git.archlinux.org/svntogit/packages.git" - "/plain/trunk/" name "?h=packages/texlive-bin" - "&id=" revision)) - (file-name (string-append "texlive-bin-" name)) - (sha256 (base32 hash))))) - (arch-revision "49d7fe25e5ea63f136ebc20270c1d8fc9b00041c")) - (list - (arch-patch "pdftex-poppler0.76.patch" arch-revision - "03vc88dz37mjjyaspzv0fik2fp5gp8qv82114869akd1dhszbaax") - (search-patch "texlive-bin-poppler-0.83.patch") - (arch-patch "texlive-poppler-0.84.patch" arch-revision - "1ia6cr99krk4ipx4hdi2qdb98bh2h26mckjlpxdzrjnfhlnghksa") - (search-patch "texlive-bin-poppler-0.86.patch")))) + "0y4h4j2qg714srhvf1hvn165w7sanr1j2vzrsgc23kxvrc43sbz3")) (modules '((guix build utils) (ice-9 ftw))) (snippet @@ -295,7 +277,7 @@ files from LOCATIONS with expected checksum HASH. CODE is not currently in use. "-checkout")) (sha256 (base32 - "1cj04svl8bpfwjr4gqfcc04rmklz3aggrxvgj7q5bxrh7c7g18xh")))) + "0p3ff839q4kv3zj4xxc76fqcjcjinv8xf7ix0zgwl7yhy5p3sm80")))) ("cairo" ,cairo) ("fontconfig" ,fontconfig) ("fontforge" ,fontforge) @@ -384,9 +366,9 @@ files from LOCATIONS with expected checksum HASH. CODE is not currently in use. #t)) (add-after 'unpack 'use-code-for-new-poppler (lambda _ - (copy-file "texk/web2c/pdftexdir/pdftoepdf-poppler0.76.0.cc" + (copy-file "texk/web2c/pdftexdir/pdftoepdf-poppler0.86.0.cc" "texk/web2c/pdftexdir/pdftoepdf.cc") - (copy-file "texk/web2c/pdftexdir/pdftosrc-poppler0.76.0.cc" + (copy-file "texk/web2c/pdftexdir/pdftosrc-poppler0.83.0.cc" "texk/web2c/pdftexdir/pdftosrc.cc") #t)) (add-after 'unpack 'patch-dvisvgm-build-files @@ -420,14 +402,16 @@ files from LOCATIONS with expected checksum HASH. CODE is not currently in use. (add-after 'unpack-texlive-scripts 'patch-scripts (lambda _ (let* ((scripts (append (find-files "texk/kpathsea" "^mktex") + (find-files "texk/texlive/linked_scripts" + "\\.sh$") (find-files "texlive-scripts" "\\.sh$"))) (commands '("awk" "basename" "cat" "grep" "mkdir" "rm" "sed" "sort" "uname")) (command-regexp (format #f "\\b(~a)\\b" (string-join commands "|"))) (iso-8859-1-encoded-scripts - '("texlive-scripts/source/rubibtex.sh" - "texlive-scripts/source/rumakeindex.sh"))) + '("texk/texlive/linked_scripts/texlive-extra/rubibtex.sh" + "texk/texlive/linked_scripts/texlive-extra/rumakeindex.sh"))) (define (substitute-commands scripts) (substitute* scripts @@ -467,7 +451,7 @@ files from LOCATIONS with expected checksum HASH. CODE is not currently in use. (("^half_error_line = .*$") "half_error_line = 238\n") (("^max_print_line = .*$") "max_print_line = 1000\n"))) #t)) - (add-after 'install 'postint + (add-after 'install 'post-install (lambda* (#:key inputs outputs #:allow-other-keys #:rest args) (let* ((out (assoc-ref outputs "out")) (patch-source-shebangs (assoc-ref %standard-phases @@ -553,7 +537,7 @@ This package contains the binaries.") "texlive-docstrip" (list "/tex/latex/base/docstrip.tex") (base32 - "1f9sx1lp7v34zwm186msf03q2h28rrg0lh65z59zc0cvqffs6dvb") + "1vyn0vskxqmq58fbq4r4pknbzpxpyw30nmlmsncnialrmrwqm7k5") #:trivial? #t)) (home-page "https://www.ctan.org/texlive") (synopsis "Utility to strip documentation from TeX files.") @@ -568,7 +552,7 @@ documentation from TeX files. It is part of the LaTeX base.") (list "/tex/generic/unicode-data/" "/doc/generic/unicode-data/") (base32 - "0zy4v9y667cka5fi4dnc6x500907812y7pcaf63s5qxi8l7khxxy") + "1mxb55ml92zd00w0zbr0dkscnxdgpxamfabl0izhk3cpz81n9g92") #:trivial? #t)) (home-page "https://www.ctan.org/pkg/unicode-data") (synopsis "Unicode data and loaders for TeX") @@ -601,7 +585,7 @@ out to date by @code{unicode-letters.tex}. ") "/tex/generic/hyphen/hypht1.tex" "/tex/generic/hyphen/zerohyph.tex") (base32 - "0f19nml4hdx9lh7accqdk1b9ismwfm2523l5zsc4kb4arysgcakz") + "1vakayd82a4ga0b80mxypbibw2vrf2a8p4v6bim7s97zh8b9mzk3") #:trivial? #t)) (home-page "https://tug.org/texlive/") (synopsis "Core hyphenation support files") @@ -622,7 +606,7 @@ default versions of those), etc.") "/fonts/enc/dvips/base/" "/tex/generic/dvips/") (base32 - "1qr7h0ahycmz5wmpv54glfss9jqdmmyymj6kim626d1c8v9bmg86") + "0rns1hpjy4fmsskmkwx197j8qbgdmyj0j9214sq9vhpa6nv7czm3") #:trivial? #t)) (home-page "https://www.ctan.org/pkg/dvips") (synopsis "DVI to PostScript drivers") @@ -655,16 +639,17 @@ to adapt the plain e-TeX source file to work with XeTeX and LuaTeX.") (name "texlive-metafont") (version (number->string %texlive-revision)) (source (origin - (method svn-fetch) - (uri (svn-reference + (method svn-multi-fetch) + (uri (svn-multi-reference (url (string-append "svn://www.tug.org/texlive/tags/" - %texlive-tag "/Master/texmf-dist/" - "/metafont")) + %texlive-tag "/Master/texmf-dist")) + (locations '("/metafont/" + "/fonts/source/public/modes/")) (revision %texlive-revision))) (file-name (string-append name "-" version "-checkout")) (sha256 (base32 - "1yl4n8cn5xqk2nc22zgzq6ymd7bhm6xx1mz3azip7i3ki4bhb5q5")))) + "1r1v3zm600nrl3iskx130fjwj1qib82n02dlca446zb53x0hg6gr")))) (build-system gnu-build-system) (arguments `(#:tests? #f ; no test target @@ -673,14 +658,17 @@ to adapt the plain e-TeX source file to work with XeTeX and LuaTeX.") (delete 'configure) (replace 'build (lambda* (#:key inputs #:allow-other-keys) - (let ((cwd (getcwd))) + (let* ((cwd (getcwd)) + (mf (string-append cwd "/metafont")) + (modes (string-append cwd "/fonts/source/public/modes"))) (setenv "MFINPUTS" - (string-append cwd "/base:" - cwd "/misc:" - cwd "/roex:" - cwd "/feynmf:" - cwd "/mfpic:" - cwd "/config"))) + (string-append modes ":" + mf "/base:" + mf "/misc:" + mf "/roex:" + mf "/feynmf:" + mf "/mfpic:" + mf "/config"))) (mkdir "build") (with-directory-excursion "build" (invoke "inimf" "mf.mf")))) @@ -692,10 +680,10 @@ to adapt the plain e-TeX source file to work with XeTeX and LuaTeX.") (mkdir-p base) (mkdir-p mf) (install-file "build/mf.base" base) - (for-each (lambda (where) - (copy-recursively where (string-append mf where))) - (list "base" "misc" "config")) - #t)))))) + (with-directory-excursion "metafont" + (for-each (lambda (where) + (copy-recursively where (string-append mf where))) + (list "base" "misc" "config"))))))))) (native-inputs `(("texlive-bin" ,texlive-bin))) (home-page "https://www.ctan.org/pkg/metafont") @@ -731,11 +719,9 @@ build fonts using the Metafont system.") "/tex/fontinst/latinetx/" "/tex/fontinst/latinmtx/" "/tex/fontinst/mathmtx/" - "/tex/fontinst/smblmtx/" - - "/scripts/texlive/fontinst.sh") + "/tex/fontinst/smblmtx/") (base32 - "0lprwib7n2ygfxvrw675vhif7ghyip2x6k70kqs9syp8lqxiizf8") + "195jsijrpv828pqy99gm13j31nsc8bsa58zlbln2r0h5j9l44b5g") #:trivial? #t))) (package (inherit template) @@ -807,7 +793,7 @@ typesetting in these fonts.") (list "/doc/fonts/fontname/fontname.texi" "/fonts/map/fontname/") (base32 - "0h5im5rnhycrrkd6z10f17m2caa8lv594wf482b68qjmnxfrqnxj") + "009qvjpw48lajp0gxpvdk10n5qw3q41cpq05ycns67mxwkcaywq6") #:trivial? #t)) (home-page "https://www.ctan.org/pkg/fontname") (synopsis "Scheme for naming fonts in TeX") @@ -947,7 +933,7 @@ originals.") "/tex4ht/ht-fonts/alias/adobe/courier/" "/tex4ht/ht-fonts/unicode/adobe/courier/") (base32 - "1hfgisdi7mjf5156ax6d6zsbiq42zkmp1x5lg17rgzf61k6d6z1y") + "03vz7zd7gayry9h4pq81s2bqqn2kmxf9yyzs0vap0w9rkf99rrci") #:trivial? #t)) (home-page "https://ctan.org/pkg/urw-base35") (synopsis "URW Base 35 font pack for LaTeX") @@ -1449,7 +1435,7 @@ incorporates the e-TeX extensions.") "texlive-tex-plain" (list "/tex/plain/") (base32 - "1m4qpaszwfv7j8a85rlwl7rs4iv5nlj67c1vvn6ysly72h9gjydb") + "1qryji08shim7fwjfcm0rcb0m5pwagjv1ahpr3xkfg8mkj160nrg") #:trivial? #t)) (home-page "https://www.ctan.org/pkg/plain") (synopsis "Plain TeX format and supporting files") @@ -1556,11 +1542,9 @@ language.") (package (inherit (texlive-hyphen-package "texlive-hyphen-bulgarian" "bg" - (list "/doc/generic/hyph-utf8/bg/azbukaExtended.pdf" - "/doc/generic/hyph-utf8/bg/azbukaExtended.tex" - "/tex/generic/hyph-utf8/patterns/tex/hyph-bg.tex") + '("/tex/generic/hyph-utf8/patterns/tex/hyph-bg.tex") (base32 - "0ngrgw2rmipxss76rgfk62x9nnsgwmaxxna2jqxxhybai3q39mx5"))) + "0m254y71j3qrb71klvfalfmic3kjy31l85b9cgpdm5yznlsq3i8d"))) (synopsis "Hyphenation patterns for Bulgarian") (description "The package provides hyphenation patterns for the Bulgarian language in T2A and UTF-8 encodings.") @@ -1584,9 +1568,10 @@ T1/EC and UTF-8 encodings.") (package (inherit (texlive-hyphen-package "texlive-hyphen-chinese" "zh-latn-pinyin" - (list "/tex/generic/hyph-utf8/patterns/tex/hyph-zh-latn-pinyin.tex") + '("/tex/generic/hyph-utf8/patterns/ptex/hyph-zh-latn-pinyin.ec.tex" + "/tex/generic/hyph-utf8/patterns/tex/hyph-zh-latn-pinyin.tex") (base32 - "1j68mry2zy91m1kbzwhin5q2jajf6xh48npdds8wvp1sqmzih2a3"))) + "1hhh30hcjymm2igpllly04cavsfmd6xrjkd9zax6b2wdxn3ka4pm"))) (synopsis "Hyphenation patterns for unaccented Chinese pinyin") (description "The package provides hyphenation patterns for unaccented Chinese pinyin T1/EC and UTF-8 encodings.") @@ -1825,10 +1810,10 @@ in monotonic and polytonic spelling in LGR and UTF-8 encodings.") (inherit (texlive-hyphen-package "texlive-hyphen-hungarian" "hu" (list "/doc/generic/huhyphen/" - "/doc/generic/hyph-utf8/hu/" + "/doc/generic/hyph-utf8/languages/hu/" "/tex/generic/hyph-utf8/patterns/tex/hyph-hu.tex") (base32 - "1j1b8kksg9r8nmjyjvvz8fr3hgcrjj6jlybf9p06nwrrwm2r8j8f"))) + "006d2290lcsqzh9ljansbaj9k52s17zgkw0kpsspn5l7a8n00zcl"))) (synopsis "Hyphenation patterns for Hungarian") (description "This package provides hyphenation patterns for Hungarian in T1/EC and UTF-8 encodings.") @@ -1940,11 +1925,12 @@ Europe, in T1/EC and UTF-8 encodings.") (package (inherit (texlive-hyphen-package "texlive-hyphen-latin" '("la-x-classic" "la-x-liturgic" "la") - (list "/tex/generic/hyph-utf8/patterns/tex/hyph-la-x-classic.tex" - "/tex/generic/hyph-utf8/patterns/tex/hyph-la-x-liturgic.tex" - "/tex/generic/hyph-utf8/patterns/tex/hyph-la.tex") + '("/tex/generic/hyph-utf8/patterns/tex/hyph-la-x-classic.tex" + "/tex/generic/hyph-utf8/patterns/tex/hyph-la-x-liturgic.tex" + "/tex/generic/hyph-utf8/patterns/tex/hyph-la.tex" + "/tex/generic/hyph-utf8/patterns/tex-8bit/hyph-la-x-classic.ec.tex") (base32 - "0rxg8a4s5cpj8vlkz5a74a036axda5jqgvr3f9aj2cc2x9f2f3w9"))) + "119rf6sk1f639ky6zr9njn21nsxzgfmjci94y26745qs8w08ilkl"))) (synopsis "Liturgical Latin hyphenation patterns") (description "This package provides hyphenation patterns for Latin in T1/EC and UTF-8 encodings, mainly in modern spelling (u when u is needed and v @@ -1986,6 +1972,18 @@ L7X and UTF-8 encodings.") ;; the hyph-utf8 package we choose the LPPL license. (license license:lppl))) +(define-public texlive-hyphen-macedonian + (package + (inherit (texlive-hyphen-package + "texlive-hyphen-macedonian" "mk" + '("/tex/generic/hyph-utf8/patterns/tex/hyph-mk.tex") + (base32 + "01w4cv8jm9q2gijys7cd7s6lfycdpgw9m26yxicc14ywbpi4ij3i"))) + (synopsis "Macedonian hyphenation patterns") + (description "This package provides hypenation patterns for Macedonian.") + ;; XXX: License just says 'GPL'. Assume GPL2 since the file predates GPL3. + (license license:gpl2+))) + (define-public texlive-hyphen-mongolian (package (inherit (texlive-hyphen-package @@ -2124,10 +2122,10 @@ T2A and UTF-8 encodings.") (package (inherit (texlive-hyphen-package "texlive-hyphen-sanskrit" "sa" - (list "/doc/generic/hyph-utf8/sa/hyphenmin.txt" + (list "/doc/generic/hyph-utf8/languages/sa/hyphenmin.txt" "/tex/generic/hyph-utf8/patterns/tex/hyph-sa.tex") (base32 - "0gi2qk0wf388h9n25gzhv0cdz67ph83wal8h3iz2sqnpdjsw8kpc"))) + "1bkzj8swj4lbswf1vr4pb1jg6dixzs7p8h8zm8s8as52h442aida"))) (synopsis "Sanskrit hyphenation patterns") (description "This package provides hyphenation patterns for Sanskrit and Prakrit in longdesc transliteration, and in Devanagari, Bengali, Kannada, @@ -2185,7 +2183,7 @@ T1/EC and UTF-8 encodings.") "texlive-hyphen-spanish" "es" (list "/tex/generic/hyph-utf8/patterns/tex/hyph-es.tex") (base32 - "1h3yg9vcq0lf7hxv0ahkqmyg269dxjs8m2mz8sgz5l1fxmvahvaj"))) + "05lbvjkj304xxghyihk8js0kmg97ddlgijld3bp81bc28h4cav0v"))) (synopsis "Hyphenation patterns for Spanish") (description "The package provides hyphenation patterns for Spanish in T1/EC and UTF-8 encodings.") @@ -2305,7 +2303,7 @@ T1/EC and UTF-8 encodings.") "/doc/generic/hyph-utf8/img/miktex-languages.png" "/doc/generic/hyph-utf8/img/texlive-collection.png") (base32 - "1bar5mc808ch20anhqrdxcwiych359qsvr7mggxpg2l2kq5xdyq0"))) + "1v6f59r1fcp7pk7ddskqdzl7hzbszsxd04mfd3xznv8fc73iv72l"))) (outputs '("out" "doc")) (build-system gnu-build-system) (arguments @@ -2545,7 +2543,7 @@ UCY (Omega Unicode Cyrillic), LCY, LWN (OT2), and koi8-r.") "/web2c/tcvn-t5.tcx" "/web2c/viscii-t5.tcx") (base32 - "191i8n3g46p53bb9dkx2ggwpzy7skgg0pbklsrpx8x4ayd86wcaf") + "1prvxq211hqfss1bhiykazqfcy298lsz3x8lbmbyrh9c8grnj4ip") #:trivial? #t)) (home-page "https://www.tug.org/texlive/") (synopsis "Files related to the path searching library for TeX") @@ -2561,7 +2559,7 @@ mechanism. This package provides supporting files.") "texlive-latexconfig" (list "/tex/latex/latexconfig/") (base32 - "1wa7yhdpnz1nyidwgli68fyr33jn951bnniqrih5lj98k09rqc3h") + "10ynmd8b9b9l1wl1mva23yz4zir53p6r5z31s39wmxz19pj12qvx") #:trivial? #t)) (home-page "https://www.tug.org/") (synopsis "Configuration files for LaTeX-related formats") @@ -2587,7 +2585,7 @@ formats.") "/tex/latex/base/testpage.tex" "/tex/latex/base/texsys.cfg") (base32 - "0m0gjb4hbsf2iqkkx3px4f28r2scjvsjv4zb2whkbnb44apyw1f0") + "11bcjmn0n7sv7g6r8v6nxl4x1pw0famqmq0v0pbjyz04akhvfvry") #:trivial? #t))) (package (inherit template) @@ -2648,8 +2646,9 @@ formats.") (let ((disabled-formats '("aleph aleph" "lamed aleph" "uptex uptex" "euptex euptex" "eptex eptex" "ptex ptex" "pdfxmltex pdftex" "platex eptex" + "platex-dev eptex" "uplatex-dev euptex" "csplain pdftex" "mf mf-nowin" "mex pdftex" "pdfmex pdftex" - "luacsplain luatex" + "luacsplain luatex" "optex luatex" ,@(if (string-prefix? "powerpc64le" (or (%current-target-system) (%current-system))) @@ -2715,7 +2714,7 @@ formats.") "/tex/generic/config/luatexiniconfig.tex" "/web2c/texmfcnf.lua") (base32 - "1gi87wy12r8w8fhx9ajcid382dmqzf6b9070b5nndvbbjrvhwf23"))))) + "0pk0ckwd5p58nqmhlajhbgxynym25jmhv48xm5ns540r996k0g2r"))))) (propagated-inputs `(("texlive-dehyph-exptl" ,texlive-dehyph-exptl) ("texlive-etex" ,texlive-etex) @@ -2757,6 +2756,7 @@ formats.") ("texlive-hyphen-latin" ,texlive-hyphen-latin) ("texlive-hyphen-latvian" ,texlive-hyphen-latvian) ("texlive-hyphen-lithuanian" ,texlive-hyphen-lithuanian) + ("texlive-hyphen-macedonian" ,texlive-hyphen-macedonian) ("texlive-hyphen-mongolian" ,texlive-hyphen-mongolian) ("texlive-hyphen-norwegian" ,texlive-hyphen-norwegian) ("texlive-hyphen-occitan" ,texlive-hyphen-occitan) @@ -2802,7 +2802,7 @@ contain.") (file-name (string-append name "-" version "-checkout")) (sha256 (base32 - "1h78zw0vhldx478zs4v86ajg7vpkysd1kg3npc480qqls3q6ba40")))) + "1cmfigg5jx3hmdyh4gv8kwxi7dg076ldkxmr46s05xvhzjig1z9x")))) (build-system texlive-build-system) (arguments '(#:tex-directory "latex/filecontents")) (home-page "https://www.ctan.org/pkg/filecontents") @@ -2817,31 +2817,6 @@ overwrite existing files and letting you use @code{filecontents} / @code{filecontents*} anywhere.") (license license:lppl1.3c+))) -(define-public texlive-generic-ifxetex - (package - (name "texlive-generic-ifxetex") - (version (number->string %texlive-revision)) - (source (origin - (method svn-fetch) - (uri (texlive-ref "generic" "ifxetex")) - (file-name (string-append name "-" version "-checkout")) - (sha256 - (base32 - "0w2xj7n0szavj329kds09q626szkc378p3w0sk022q0ln4ksz86d")))) - (build-system texlive-build-system) - (arguments - '(#:tex-directory "generic/ifxetex" - #:tex-format "xelatex")) - (inputs - `(("texlive-latex-filecontents" ,texlive-latex-filecontents))) - (home-page "https://www.ctan.org/pkg/ifxetex") - (synopsis "Am I running under XeTeX?") - (description - "This is a simple package which provides an @code{\\ifxetex} conditional, -so that other code can determine that it is running under XeTeX. The package -requires the e-TeX extensions to the TeX primitive set.") - (license license:lppl1.3c+))) - (define-public texlive-epsf (package (inherit (simple-texlive-package @@ -2872,7 +2847,7 @@ users, via its Plain TeX version.)") (list "/doc/latex/fancyvrb/README" "/tex/latex/fancyvrb/") (base32 - "1dwkcradz9nwpjwmv1sjzn77lvw25ypr0rrgmf1kd8pd2mw7dxcn") + "005ylzlysmvy21rwkbnrf0hnp5bmsjsj11hydg1d9dnq9ffv2s1h") #:trivial? #t)) (home-page "https://www.ctan.org/pkg/fancyvrb") (synopsis "Sophisticated verbatim text") @@ -2892,7 +2867,7 @@ verbatim source).") (list "/doc/latex/graphics-def/README.md" "/tex/latex/graphics-def/") (base32 - "0zrbn9cwfnnrrl3b2zsd74ldksp9jwpvjh7z93ild1m75crpb39a") + "125lm2m9813p29yl7am21kgqdpigyqvrjarg73jpaczifbbbqklf") #:trivial? #t)) (home-page "https://www.ctan.org/pkg/latex-graphics") (synopsis "Color and graphics option files") @@ -2929,7 +2904,7 @@ set default \"driver\" options for the color and graphics packages.") (file-name (string-append name "-" version "-checkout")) (sha256 (base32 - "0nlfhn55ax89rcvpkrl9570671b62kcr4c9l5ch3w5zw9vmi00dz")))) + "0asln498brkd1miyhc7029fjx7gcj6vbbas5aan6w289ac4yz54h")))) (build-system texlive-build-system) (arguments '(#:tex-directory "latex/graphics")) (propagated-inputs @@ -3058,12 +3033,11 @@ XML, using UTF-8 or a suitable 8-bit encoding.") (list "/doc/latex/hyperref/" "/source/latex/hyperref/" ;; These files are not generated from the sources - "/tex/latex/hyperref/hylatex.ltx" "/tex/latex/hyperref/minitoc-hyper.sty" "/tex/latex/hyperref/ntheorem-hyper.sty" "/tex/latex/hyperref/xr-hyper.sty") (base32 - "1074rnymyf7xj2ggajnijmy1p7avfjl216qyi86p38wg0qdf48zd")))) + "1d9myrrwf9zr62j5vp9q4drxs7rj4b06wq04imrnzban5s4gaq6v")))) (package (inherit template) (arguments @@ -3103,7 +3077,7 @@ pdf and HTML backends. The package is distributed with the @code{backref} and (file-name (string-append name "-" version "-checkout")) (sha256 (base32 - "0pi2d6gsddcs9wprdbar46s91kdc5fxl1m79g7xrbccsx8s9xbml")))) + "1ff6yjchdmn7lyllfrnxygjr2ipkrjbb1rs5iyryn47rc3r8mpmk")))) (build-system texlive-build-system) (arguments '(#:tex-directory "latex/oberdiek" @@ -3117,7 +3091,7 @@ pdf and HTML backends. The package is distributed with the @code{backref} and (("ifpdf.ins") "ifpdf.dtx")) #t))))) (propagated-inputs - `(("texlive-generic-ifxetex" ,texlive-generic-ifxetex))) + `(("texlive-generic-iftex" ,texlive-generic-iftex))) (home-page "https://www.ctan.org/pkg/oberdiek") (synopsis "Bundle of packages submitted by Heiko Oberdiek") (description @@ -3139,7 +3113,7 @@ arrows; record information about document class(es) used; and many more.") (file-name (string-append name "-" version "-checkout")) (sha256 (base32 - "1wqvn4z0s92h5iqzrvxw7hinzp95avjk9v8lnqbqr4kz6nv4xb9l")))) + "1p92bg1wdlg28m7xbdipx8rxavvpbmsx8zy845bk2rdqhc9gbhkl")))) (build-system texlive-build-system) (arguments '(#:tex-directory "latex/tools" @@ -3208,7 +3182,7 @@ Live distribution.") (file-name (string-append name "-" version "-checkout")) (sha256 (base32 - "0s77z2cbv841l45qrpf0s8qhzfa4wi689lg7zkw88qg18nzvy0ly")))) + "0w82d5a4d3rc950ms6ymj4mpw5ndz6qs5x53szcfgzgjxsns9l4w")))) (build-system texlive-build-system) (arguments '(#:tex-directory "latex/l3kernel")) @@ -3232,7 +3206,7 @@ that the LaTeX3 conventions can be used with regular LaTeX 2e packages.") (file-name (string-append name "-" version "-checkout")) (sha256 (base32 - "1cv4fk9pabh7mkxhfsdmh4k8xpmzg1psgcsvd11c869m7n3a629h")))) + "15m3ly55gj8hk5xrkpw5bkj0ddwkk4v7qxa6sl3rkymdka1xl3cc")))) (build-system texlive-build-system) (arguments '(#:tex-directory "latex/l3packages" @@ -3284,7 +3258,7 @@ programming tools and kernel support. Packages provided in this release are: "/source/latex/fontspec/" "/tex/latex/fontspec/fontspec.cfg") (base32 - "1ksqhxlnqia4v85hbx0bw58cw77wfdhs33n1a1qmczd4b3zg4wp9")))) + "06rms8dw1j67v3rgv6xmfykdmgbxi5rp78yxc782cy1sw07blgsg")))) (package (inherit template) (arguments @@ -3322,7 +3296,7 @@ the l3kernel and xparse bundles from the LaTeX 3 development team.") ;; /doc/latex/l3build and the man page in the future. "/source/latex/l3build/") (base32 - "009dccv5lq7bq13431l4ihmagxvb3j1pb5bhidsbiyxi3wvi8y97") + "0hqb0f5rpj3mfmxfyn8cgxrm1j5ij466a9y23s0xxpmv11ma5i0i") #:trivial? #t))) (package (inherit template) @@ -3407,7 +3381,7 @@ this bundle for use independent of ConTeXt.") "/scripts/luaotfload/luaotfload-tool.lua" "/tex/luatex/luaotfload/") (base32 - "04xlcc9k56kf9460dzxifnxbv5bkv7kcp9ijiqi054miybw1pymr") + "0a07m8gckkhzj30rjglj4abpx6pqhl9bx4vq2ak29k0wa3s9rm76") #:trivial? #t))) (package (inherit template) @@ -3437,7 +3411,7 @@ loading fonts by their proper names instead of file names.") (file-name (string-append name "-" version "-checkout")) (sha256 (base32 - "0qgk2332dacsxn1z95qzp35gbs7wrzl1ipjdhnmk1r897msm4sf5")))) + "1jx4sd35iwcr5qpvnirshp4rdffqq09k6sbmhwxi8kkir4x5hkmc")))) (build-system texlive-build-system) (arguments '(#:tex-directory "latex/amsmath")) (home-page "https://www.ctan.org/pkg/amsmath") @@ -3494,7 +3468,7 @@ distribution.") "/source/latex/babel/" "/makeindex/babel/") (base32 - "07k9igpwa8sjxlmyxmcbffl8833qhrs34h70kgmakiix5jycznsd")))) + "0xjj4h48vdb9ydyg13c5jyfi4vm39117c8jv2gjrvjw89h0djbp1")))) (package (inherit template) (arguments @@ -3804,18 +3778,6 @@ It includes little more than the required set of LaTeX packages.") '() default-packages))))) -(define-public texlive-default-updmap.cfg - (origin - (method url-fetch) - (uri (string-append "https://tug.org/svn/texlive/tags/" - %texlive-tag "/Master/texmf-dist/web2c/updmap.cfg" - "?revision=" (number->string %texlive-revision))) - (file-name (string-append "updmap.cfg-" - (number->string %texlive-revision))) - (sha256 - (base32 - "0faqknqxs80qp9ywk0by5k85s0yalg97c4lja4q56lsyblrr4j7i")))) - ;;; TODO: Add a TeX Live profile hook computing fonts maps (and others?) ;;; configuration from the packages in the profile, similar to what's done ;;; below. @@ -3836,7 +3798,7 @@ configuration of a base set of packages plus PACKAGES." (file-name "updmap.cfg") (sha256 (base32 - "0faqknqxs80qp9ywk0by5k85s0yalg97c4lja4q56lsyblrr4j7i")))) + "1q3l7yx5sng080ibfb8z3rdah0hhq170j6xw8z1w8i4w9m37lp94")))) (name "texlive-updmap.cfg") (build-system copy-build-system) (arguments @@ -3912,7 +3874,7 @@ It includes little more than the required set of LaTeX packages."))) "/fonts/type1/public/tipa/" "/tex/latex/tipa/") (base32 - "1h53dscv8z6fsa0ax5dys3x11b2f1g60l22hpdf7c88cvdhcs8sn") + "0cqzf8vb10b8jw99m9gflskxa4c3rpiznxglix6chl5lai5sgw44") #:trivial? #t)) (home-page "https://www.ctan.org/pkg/tipa") (synopsis "Fonts and macros for IPA phonetics characters") @@ -4055,7 +4017,7 @@ package.") (file-name (string-append name "-" version "-checkout")) (sha256 (base32 - "1zyl2pcz2x529gzj5m93a1s4ipymdabf7qdjl3l1673pizd4hfyv")))) + "0alshj9d2cdssqfawhyqmgsvqysmn7dgfk8bc59ni1bii3ydm2zm")))) (build-system texlive-build-system) (arguments '(#:tex-directory "latex/draftwatermark")) (home-page "https://www.ctan.org/pkg/draftwatermark") @@ -4403,7 +4365,7 @@ hyperlink to the target of the DOI.") (list "/doc/latex/etoolbox/" "/tex/latex/etoolbox/") (base32 - "1cc1vw1ach55g4ff4x30by8k1mg01w199ccxvn72f5khlnnxial0") + "1w9mycfa0lx9whjzfybx58608phcrfk33w3igy566qv23a1z9rzc") #:trivial? #t)) (home-page "https://www.ctan.org/pkg/etoolbox") (synopsis "e-TeX tools for LaTeX") @@ -4578,7 +4540,7 @@ BibLaTeX, and is considered experimental.") (file-name (string-append name "-" version "-checkout")) (sha256 (base32 - "0a8f38c2ds1flxcr0apdpyaaz3k6fyalz6dkbrmcv9srjc40mh3n")))) + "0a9nrmiwksnpa6iaapirqid974ai56qgin2n4h9mggy9v8gp7r71")))) (build-system texlive-build-system) (arguments '(#:tex-directory "latex/geometry")) (propagated-inputs @@ -4629,7 +4591,7 @@ array environments; verbatim handling; and syntax diagrams.") (file-name (string-append name "-" version "-checkout")) (sha256 (base32 - "0na7v4hsyx5s67cpjj2dbnq8j67k8lln6b19hmj631gfs27slss1")))) + "0c3hrki9pmhz4iall0436wrlrg6qkb1fsdfhz9hv7ysxryr2gihj")))) (build-system texlive-build-system) (arguments '(#:tex-directory "latex/polyglossia")) (home-page "https://www.ctan.org/pkg/polyglossia") @@ -4649,7 +4611,7 @@ and XeLaTeX; it relies on the @code{fontspec} package, version 2.0 at least.") (file-name (string-append name "-" version "-checkout")) (sha256 (base32 - "14b2bc7cqz4ckxxycim9sw6jkrr1pahivm1rdbpz5k6hl967w1s3")))) + "19fd0bqxjkzc16bza3w20pnsc90gbhbllm244b3h6sink4dlnn54")))) (build-system texlive-build-system) (arguments '(#:tex-directory "latex/supertabular")) (home-page "https://www.ctan.org/pkg/supertabular") @@ -4675,7 +4637,7 @@ situations where longtable has problems.") (file-name (string-append name "-" version "-checkout")) (sha256 (base32 - "16jy02m089m7n6v9vbfi4xjgngc1fnvsmmppk8axfwzbhdky3c9c")))) + "1ngzgiy8wd3b9gnbx802x90xa179xxm7vf5jhfdkpgrfxwlycfby")))) (build-system trivial-build-system) (arguments `(#:modules ((guix build utils)) @@ -4769,7 +4731,7 @@ considered obsolete; alternatives are the @code{typearea} package from the (file-name (string-append name "-" version "-checkout")) (sha256 (base32 - "0rxfpr8vq3brwx5rc7qn91ixlp9zva4zrms8a579fqa1g5yva7vg")))) + "1gc2brr2rs495w7qi6spdva1xrza94x7a36dncjdkghnsq8r92h4")))) (build-system texlive-build-system) (arguments '(#:tex-directory "latex/appendix")) (home-page "https://www.ctan.org/pkg/appendix") @@ -4849,7 +4811,7 @@ copy-and-paste functions work properly.") (file-name (string-append name "-" version "-checkout")) (sha256 (base32 - "16vd99p01a0y30xr5yf1z2j5da9x8gy21vb30wk08jh31zffbaqj")))) + "1qa0mh0fy9hcvfsmprv6q50q0qzdjjfbxi3axap26z6zg3qj68bc")))) (build-system texlive-build-system) (arguments '(#:tex-directory "latex/colortbl")) (home-page "https://www.ctan.org/pkg/colortbl") @@ -4986,7 +4948,7 @@ footnotes with symbols rather than numbers.") (file-name (string-append name "-" version "-checkout")) (sha256 (base32 - "1fbrhqj22vzakn30j71fc41l8nliqbv1dmxm0zlwi2qjjbq6fwav")))) + "082zri3gp8s6p2difhk1pbix2vzmvsf6fmld2z78v35xwk3fiya0")))) (build-system texlive-build-system) (arguments '(#:tex-directory "latex/listings" @@ -5159,7 +5121,7 @@ via the CM-super, Latin Modern and (in a restricted way) CM-LGC font sets.") "/fonts/type1/public/inconsolata/" "/tex/latex/inconsolata/") (base32 - "1a77w26m4c4j0202s1qkikz7ha6cxlv8zxhzi9s3l0x1l2pl7cr2") + "19lvma52vk7x8d7j4s9ymjwm3w2k08860fh6dkzn76scgpdm4wlb") #:trivial? #t)) (home-page "https://www.ctan.org/pkg/inconsolata") (synopsis "Monospaced font with support files for use with TeX") @@ -5403,7 +5365,7 @@ splines, and filled circles and ellipses. The package uses @code{tpic} (file-name (string-append name "-" version "-checkout")) (sha256 (base32 - "1vm9xp67hzif0pqab4r3ialf0cyhi0fa4p8kxgp1ymcf85pqip14")))) + "1j8svflnx9w897mdavyf1f0n256wh4bbclrhv5vx7b501gmlbp7d")))) (build-system trivial-build-system) (arguments `(#:modules ((guix build utils)) @@ -5435,7 +5397,7 @@ in the form @code{key=value} are available, for example: (file-name (string-append name "-" version "-checkout")) (sha256 (base32 - "07vbcp6avdwldr870cwf65av2s9lfyzcpp8gpld53yw6lcxgaipj")))) + "1bfpl8mr4h3p46649wb7pdkc3l44r8fqbv89abb3jj0zh8c10928")))) (build-system texlive-build-system) (arguments '(#:tex-directory "latex/multirow")) (home-page "https://www.ctan.org/pkg/multirow") @@ -5460,7 +5422,7 @@ entry at the \"natural\" width of its text.") (file-name (string-append name "-" version "-checkout")) (sha256 (base32 - "1pr6ym3ad7x14ng7gmhsmywh3685d2cnm5qgyrqbigng2r6fcc1k")))) + "1ygsr0rsdabj61zask3346xrwiphz5i6f1nfb9k4d3234psh09kb")))) (build-system trivial-build-system) (arguments `(#:modules ((guix build utils)) @@ -5496,7 +5458,7 @@ positions; a grid for orientation is available.") (file-name (string-append name "-" version "-checkout")) (sha256 (base32 - "0j1fhm1m9k6rz80lmch3x44g20y9nm4abaaf8czb0q8hzwlx5aq5")))) + "12kdsrr55lp0s4xl279gh6mi9gw909vmd96p10dvhbazgxn3ccxs")))) (build-system trivial-build-system) (arguments `(#:modules ((guix build utils)) @@ -5526,7 +5488,7 @@ designed class) helps alleviate this untidiness.") (file-name (string-append name "-" version "-checkout")) (sha256 (base32 - "0s4izcah7im67889qz4d26pcfpasmm35sj1rw4ragkkdk3rlbbbd")))) + "1r1g9lb6bqjrahqmdkazsnifcyxgkp8r33za2h60h50jfvrab66f")))) (build-system texlive-build-system) (arguments '(#:tex-directory "latex/pdfpages")) (home-page "https://www.ctan.org/pkg/pdfpages") @@ -5756,13 +5718,11 @@ of ink traps which typify the Kurier font.") (inherit (simple-texlive-package "texlive-jknappen" (list "/fonts/source/jknappen/" - "/fonts/tfm/jknappen/" - "/fonts/source/jknappen/" "/fonts/tfm/jknappen/" "/tex4ht/ht-fonts/alias/jknappen/" "/tex4ht/ht-fonts/unicode/jknappen/") (base32 - "1v5wk5il41bddzr81h5636h3cjz0w1qann5g9garsb7qfch9fhws") + "0xvy3c845jc7iw1h9rcm1r2yvm1ni1sm9r9k9j2cfc82xy43rwij") #:trivial? #t)) (home-page "https://www.ctan.org/pkg/jknappen") (synopsis "Miscellaneous packages by Jörg Knappen") @@ -5900,7 +5860,7 @@ command).") "/tex/latex/libertine/") (base32 - "1v2vimpfi0b08sd79dadrck7wkpa0bphiakwyvhjc3ygq9k5bp8k") + "1d5r80isyvs2v3i8pzlhsn7ns6bn8ldkbs82g25widraixlhg6yg") #:trivial? #t)) (home-page "https://www.ctan.org/pkg/libertine") (synopsis "Use Linux Libertine and Biolinum fonts with LaTeX") @@ -5958,7 +5918,7 @@ LGR. The package doesn't (currently) support mathematics.") (file-name (string-append name "-" version "-checkout")) (sha256 (base32 - "04nmkhqx6jxcxx9a30zbcd5smxi5fd0cbp132bki7fnvhspnhg21")))) + "1kw7dvxvdfbf31zw0n8r0g5xak3vcdf25n33fqw93j59zpc5nvbl")))) (build-system trivial-build-system) (arguments `(#:modules ((guix build utils)) @@ -6088,7 +6048,7 @@ the derived Type 1 font, together with support files for TeX (LaTeX).") (file-name (string-append name "-" version "-checkout")) (sha256 (base32 - "1xyd57c8z1xi0kbqpbad61flcazz68i9ssxrag0gjvci3irxi8xh")))) + "01ghqyaxxkfscs9jjgnx65hmvqllfzgxc0r5vwpqs7y1h97y6cgc")))) (build-system trivial-build-system) (arguments `(#:modules ((guix build utils)) @@ -6117,7 +6077,7 @@ than the bitmaps Metafont creates.") (uri (texlive-ref "latex" "acmart")) (sha256 (base32 - "18rl67p2zhngskisnhv78mksv8q8q658l6igkswzswldixmkpphq")) + "1avk9wl7hmgxvv8axd134wl6l8khvw7chw568nc8q70xwiwcqcpk")) (file-name (string-append name "-" version "-checkout")))) (build-system texlive-build-system) (arguments '(#:tex-directory "latex/acmart")) @@ -6171,7 +6131,7 @@ get a narrower “natural” width.") "/tex/plain/wasy/" "/doc/fonts/wasy/") (base32 - "10dxbqgv42niybj65hj6y47x8lsl83m48rgw2v2s50k05wbghwbm") + "1swzxgld3lndi5q0q6zkwbw06ndh13fvp04as7zpwyhh646s0hbx") #:trivial? #t)) (home-page "https://www.ctan.org/pkg/wasy") (synopsis "Waldi symbol fonts") @@ -6190,7 +6150,7 @@ the @code{wasysym} package.") (file-name (string-append name "-" version "-checkout")) (sha256 (base32 - "1sgwbfwjjf70g54hh93gsd9jp9nm67w6n74x9d72a56n07jbk5hv")))) + "0zxcf0pfqf439cfwl0r5dd93b0v4pbiih36n2pwshdlvnmy0nr50")))) (build-system texlive-build-system) (arguments '(#:tex-directory "latex/wasysym")) (home-page "https://www.ctan.org/pkg/wasysym") @@ -6289,7 +6249,7 @@ package of that name now exists.") (file-name (string-append name "-" version "-checkout")) (sha256 (base32 - "1hpsk4yp08qvbl43kqiv0hhwxv3gcqqxcpahyv6ch2b38pbj4bh6")))) + "1mcp0x3snhx9phhfxqwn6d12b84vi049ljd1l11ianp3i4kad6ls")))) (build-system texlive-build-system) (arguments '(#:tex-directory "latex/preview" @@ -6321,7 +6281,7 @@ files.") (file-name (string-append name "-" version "-checkout")) (sha256 (base32 - "0jmasg40bk53zdd2jc8nc18jvdai3p2wmamy7hwli8gls4nf25qp")))) + "0dl3dliz0vwds3804s1kxaj0ghd721v2c6hws9ghx0bjky09yxbx")))) (build-system texlive-build-system) (arguments '(#:tex-directory "latex/acronym")) (home-page "https://www.ctan.org/pkg/acronym") @@ -6350,7 +6310,7 @@ e-TeX.") "/tex/generic/config/pdftex-dvi.tex" "/tex/generic/pdftex/") (base32 - "0wsgbl0jrqc1qzgf23dla6b95lv2h8x6xvs5466d8jdrih6pwriq") + "181krzhxs61s62fr6gz7x08c57rbgc2b8i2pr7r8hr6f706ywp26") #:trivial? #t)) (home-page "https://www.ctan.org/pkg/pdftex") (synopsis "TeX extension for direct creation of PDF") @@ -6365,7 +6325,7 @@ directly generate PDF documents instead of DVI.") (define texlive-texmf (package (name "texlive-texmf") - (version "20190410") + (version "20200406") (source texlive-texmf-src) (build-system gnu-build-system) (inputs @@ -6442,7 +6402,7 @@ This package contains the complete tree of texmf-dist data.") (define-public texlive (package (name "texlive") - (version "20190410") + (version "20200406") (source #f) (build-system trivial-build-system) (inputs `(("bash" ,bash-minimal) ;for wrap-program @@ -6834,7 +6794,7 @@ required: automatic sectioning and pagination, spell checking and so forth.") (file-name (string-append name "-" version "-checkout")) (sha256 (base32 - "0s86v2b6b1vky1svmmn8pn0l2gz3v280mvjbr2d9l2sjyarlgz9w")))) + "0ganz4r78zmvq0s3w9d59pc2qh9pv0akv21f57yc3d5yyb520p6x")))) (build-system trivial-build-system) (arguments `(#:modules ((guix build utils)) @@ -6874,7 +6834,7 @@ specification. It replaces the now obsolete @code{movie15} package.") (file-name (string-append name "-" version "-checkout")) (sha256 (base32 - "1yhp51w8yr10c10pc9196q7hlw80brzqinnqbjw81d0sf2p0llc5")))) + "0x7v3ih7k9hqfcnya0wchks63b67yngi21a6343vlwzdqn84mbyp")))) (build-system trivial-build-system) (arguments `(#:modules ((guix build utils)) @@ -6915,7 +6875,7 @@ It also ensures compatibility with the @code{media9} and @code{animate} packages (file-name (string-append name "-" version "-checkout")) (sha256 (base32 - "0m4wx3yjb5al1qsv995z8fii8xxy96mcfihbnlx43lpgayiwz35s")))) + "07zqxynjh3qnnb4fxx5bhw4r21dbsrhanrq38ag62acr876l7agm")))) (build-system texlive-build-system) (arguments '(#:tex-directory "latex/ms" @@ -7038,7 +6998,7 @@ is preferred in many parts of the world, as distinct from that which is used in (file-name (string-append name "-" version "-checkout")) (sha256 (base32 - "1rzdniqq9zk39w8ch8ylx3ywh2mj87s4ivchrsk2b8nx06jyn797")))) + "161ka7sckiakcr1fgydxpc580sr16vp4sp3avjl2v9jn1pd2pwp0")))) (build-system trivial-build-system) (arguments `(#:modules ((guix build utils)) @@ -7075,7 +7035,7 @@ striking out (line through words) and crossing out (/// over words).") (file-name (string-append name "-" version "-checkout")) (sha256 (base32 - "1dscrgwyr71vgx35mzb316xl669arzagfgq50fdv3nxga63959b3")))) + "1hxivv4iq4ji1rz34fdx3hf9i0dj3a8336w1pa87jyavbl07n5g7")))) (build-system trivial-build-system) (native-inputs `(("texlive-latex-pgf-generic" @@ -7089,7 +7049,7 @@ striking out (line through words) and crossing out (/// over words).") (file-name (string-append "texlive-latex-pgf-generic" version "-checkout")) (sha256 (base32 - "0hk5x2j15n4pps279cmkbjl1dvhasq3mbhna5xdvp2qgh635ahks")))))) + "1gh1vm8hkfgz1kw1cdws9hbw9llzw6n7w0v7z763am5amd3cyhhm")))))) (propagated-inputs `(("texlive-latex-xcolor" ,texlive-latex-xcolor))) (arguments @@ -7133,7 +7093,7 @@ produce either PostScript or PDF output.") (file-name (string-append name "-" version "-checkout")) (sha256 (base32 - "1vz9zg7s5w52xr323zgglzprfrvba2zvyzf6b8vrdf4wdghlpv4z")))) + "18bfdfhdfc7nxr29wvcmp08wgq6f3fc7yysg1sgzgsqrffr1viwa")))) (build-system trivial-build-system) (arguments `(#:modules ((guix build utils)) @@ -7192,7 +7152,7 @@ typearea (which are the main parts of the bundle).") (file-name (string-append name "-" version "-checkout")) (sha256 (base32 - "1x4wnpca97rnbvvg6wjmbkxxvnfva274q9ahzx746b435q93z3i1")))) + "1wnbnfrhi6hgqa78jsw6hljzi03i5x99mlr5n2419hgws52hk67y")))) (build-system trivial-build-system) (arguments `(#:modules ((guix build utils)) @@ -7381,7 +7341,7 @@ AMS-LaTeX, AMS-TeX, and plain TeX). The distribution includes Michael Barr's (file-name (string-append name "-" version "-checkout")) (sha256 (base32 - "1wijqq605cbhn2bdaryby3xpkwmnk9ixcrjn5zwlfrxbgfblzfmz")))) + "056q9sg3bn8j70laspwdvh7fr3635l7vv3762h6rq79a58g3bya4")))) (build-system trivial-build-system) (arguments `(#:modules ((guix build utils)) @@ -7440,7 +7400,7 @@ Support for use with LaTeX is available in @code{freenfss}, part of (file-name (string-append name "-" version "-checkout")) (sha256 (base32 - "0d7d74giz5knvj4rj6mbzd6c05mwg9jrxab86jxdqbc3jy7cl4kz")))) + "145klhcf1i1n9rldjxccd3gkjxwp3i36601xlhch8kyf64rrgybk")))) (build-system trivial-build-system) (arguments `(#:modules ((guix build utils)) @@ -7492,7 +7452,7 @@ of support information.") "/tex/generic/context/ppchtex/" "/tex/latex/context/") (base32 - "0cc8509hrc25ri4a8hshgasip5z4qlipx3nxdm97f1sr0l6ncxdr") + "0krbxj0cjyy9b6xv5xx670rh8y3pxbqziljjj80qbdwixk1lf01q") #:trivial? #t)) (home-page "https://www.ctan.org/pkg/context") (synopsis "ConTeXt macro package") @@ -7512,7 +7472,7 @@ for a wealth of support information.") (list "/doc/latex/beamer/" "/tex/latex/beamer/") (base32 - "1fqzbkmw2kfxihab8j4dadc3v68xap6v2ghpp2064fna47xlwy1c") + "1yw9ixmjc0h1nqxsvd8lvibdggcysx25001pzzixg1b00l2jf242") #:trivial? #t)) (propagated-inputs `(("texlive-latex-hyperref" ,texlive-latex-hyperref) @@ -7622,21 +7582,11 @@ standards-compliant PDF documents with pdfTeX, LuaTeX and XeTeX.") (add-after 'unpack 'chdir (lambda _ (chdir "source/latex/ydoc") #t)) (add-after 'copy-files 'move-files - (lambda* (#:key outputs #:allow-other-keys) - (let* ((share (string-append (assoc-ref outputs "out") - "/share/texmf-dist")) - (target (string-append share "/tex/generic/ydoc")) - (doc (string-append (assoc-ref outputs "doc") - "/share/texmf-dist/doc") )) - (mkdir-p target) - (for-each - (lambda (file) - (rename-file (string-append share "/tex/latex/ydoc/" file) - (string-append target "/" file))) - '("ydocincl.tex" "ydocstrip.tex")) - (mkdir-p doc) - (rename-file (string-append share "/doc") doc) - #t))))))) + (lambda* (#:key inputs outputs #:allow-other-keys) + (let ((source (assoc-ref inputs "source")) + (doc (string-append (assoc-ref outputs "doc") + "/share/texmf-dist/doc"))) + (copy-recursively (string-append source "/doc") doc)))))))) (home-page "http://www.ctan.org/pkg/ydoc") (synopsis "Macros for documentation of LaTeX classes and packages") (description "The package provides macros and environments to document @@ -7656,7 +7606,7 @@ change.") "/tex/generic/pstricks/" "/tex/latex/pstricks/") (base32 - "0sdxdd0qi4sccw9il7d4s7jivs24pq99cdzfnrf0gkqjb1y8s7cl") + "0sdq0ij83vg154205n1cps9yirr45240dfcly4bms2cqc789bk5a") #:trivial? #t))) (package (inherit template) @@ -7702,7 +7652,7 @@ of the old package @code{pst-char}.") "texlive-marginnote" (list "/source/latex/marginnote/marginnote.dtx") (base32 - "1vj1k8xm11gjdfj60as42d8lsv3dbzrm5dlgqcfk89d9dzm3k39j")))) + "152bwxhnssj40rr72r6cfirvqbnc0h7xnagfrbz58v2xck53qhg1")))) (package (inherit template) (home-page "http://www.ctan.org/pkg/marginnote") @@ -7723,13 +7673,13 @@ may be used instead of @code{\\marginpar} at almost every place where frames made with the @code{framed} package.") (license license:lppl1.3c+)))) -(define-public texlive-iftex +(define-public texlive-generic-iftex (let ((template (simple-texlive-package - "texlive-iftex" + "texlive-generic-iftex" (list "/doc/generic/iftex/" - "/tex/generic/iftex/iftex.sty") + "/tex/generic/iftex/") (base32 - "089zvw31gby150n1k0zdk2c0q97pgbqs46phxydaqil64b55nnl7") + "147xa5kl4kjs05nj8v3kd7dpr5xkz3xp3gdvjih32ccd7527f5vp") #:trivial? #t))) (package (inherit template) @@ -7743,13 +7693,19 @@ package also provides the @code{\\RequirePDFTeX}, @code{\\RequireXeTeX}, and LuaTeX (respectively) is not the engine in use.") (license license:lppl1.3+)))) +(define-public texlive-iftex + (deprecated-package "texlive-iftex" texlive-generic-iftex)) + +(define-public texlive-generic-ifxetex + (deprecated-package "texlive-generic-ifxetex" texlive-generic-iftex)) + (define-public texlive-tools (let ((template (simple-texlive-package "texlive-tools" (list "/doc/latex/tools/" "/source/latex/tools/") (base32 - "1ivhij7171wvrgcjn4wah84wxwpd21d0chh3zxab4pj067c8d0mh")))) + "1860bll28mr8nhbdfx073mj87vgg3gpc62v8bk9q0kq8pg0wsx1a")))) (package (inherit template) (arguments @@ -7837,7 +7793,7 @@ are part of the LaTeX required tools distribution, comprising the packages: ("texlive-xcolor" ,texlive-xcolor) ("texlive-latex-footmisc" ,texlive-latex-footmisc) ("texlive-latex-listings" ,texlive-latex-listings) - ("texlive-iftex" ,texlive-iftex) + ("texlive-generic-iftex" ,texlive-generic-iftex) ("texlive-pstricks" ,texlive-pstricks) ("texlive-pst-text" ,texlive-pst-text) ("texlive-tools" ,texlive-tools) @@ -7892,7 +7848,7 @@ The behaviour in standalone mode may adjusted using a configuration file (list "/source/latex/siunitx/siunitx.dtx" "/doc/latex/siunitx/README.md") (base32 - "11kf6znkgw7y5qmw75qk6px6pqf57bwr53q0673zaiyq20lif96c"))) + "05kl7yid2npp2gbfshnv2xd08w81fkh5h2n5wd9xcpbhlqjzx9sj"))) (build-system texlive-build-system) (arguments '(#:tex-directory "latex/siunitx" @@ -7932,7 +7888,7 @@ package to handle all of the possible unit-related needs of LaTeX users.") (file-name (string-append name "-" version "-checkout")) (sha256 (base32 - "1dqid48vgh25wmw8xzmx6x3pfgz1y9f0r8aza1yxq2mjny5yf68x")))) + "1mycxzl761p2zzmva8xsjbxbvrxx3vhi5p160mh9kiqwhrs5biz5")))) (build-system texlive-build-system) (arguments '(#:tex-directory "latex/booktabs")) (home-page "http://www.ctan.org/pkg/booktabs") @@ -7950,7 +7906,7 @@ to what constitutes a good table in this context. The package offers (list "/doc/latex/csquotes/" "/tex/latex/csquotes/") (base32 - "088gvi60d7sdl6fgg68fbz30fnpqc3yrpkx80sfw7vwgar3wm3av") + "1k7riymar0xx41n03p6yscrsjr2mzmzzkqihh2yv4lixd1nd7l8j") #:trivial? #t))) (package (inherit template) @@ -8008,7 +7964,7 @@ XML file. (list "/doc/latex/biblatex/" "/tex/latex/biblatex/") (base32 - "11kzvny50iklzkamr0rqd5x532q8rxny1xhmf96jl8mzj1d2zmay") + "0bq15ynx84v3ppz5ar1k321k1ck85x2p0irgxgzjh1lna9h6w7v0") #:trivial? #t))) (package (inherit template) @@ -8086,7 +8042,7 @@ included in the @code{units} bundle.") (list "/doc/latex/microtype/" "/tex/latex/microtype/") (base32 - "0xmjpzbj4nqmnl5m7xx1bshdk2c8n57rmbvn0j479ypj4wdlq9iy") + "1yig4i0alqrb1a6hhhlh5y0y4dzpznh698j0cb9632m2cd3aghwz") #:trivial? #t))) (package (inherit template) @@ -8111,7 +8067,7 @@ the bundle.") (list "/doc/latex/caption/" "/tex/latex/caption/") (base32 - "09gmh8yjj9f5zak8r18g87w9p5jn7flnvmlhxmvdq6992mbdc6hg") + "11wnakgbqbpqvc6rr1j0s7qw5jvkhf3miizax4l73i87a90gxk6b") #:trivial? #t))) (package (inherit template) @@ -8288,7 +8244,7 @@ a repackaging, for use with TeX, of the Bitstream Vera family.") "/fonts/vf/public/fourier/" "/tex/latex/fourier/") (base32 - "1vs2xdx6f6hd01zlslx3y93g3dsa7k3yhqpnhgkizgjmz0r9ipz1") + "04d575nd4yvl58g9dfab9mrjxiv4792bdkz4bjvlkx6x257vlfzn") #:trivial? #t)) (home-page "https://www.ctan.org/pkg/fourier") (synopsis "Utopia fonts for LaTeX documents") @@ -8353,7 +8309,7 @@ figure versions offered by many professional fonts.") (list "/doc/latex/mweights/" "/tex/latex/mweights/") (base32 - "1k2xclk54q3xgn48hji23q52nivkzgwf0s30bmm6k83f7v57qv8h") + "12493g3yz06mhiybnphqbp49fjzy36clzw63b74mkfhsg1pq7h1b") #:trivial? #t)) (home-page "https://www.ctan.org/pkg/mweights") (synopsis "Support for multiple-weight font packages") @@ -8379,7 +8335,7 @@ or if it differs from the weight desired for another font family. The "/fonts/vf/impallari/cabin/" "/tex/latex/cabin/") (base32 - "0dfq9gqch80iyvp58spmpmqfc9h61sjvnddm81ba0af1p8ag8sfg") + "0878gc4aqs9168kfb1j3js7rrxvf9lrxwfqzc9cag1cjy60nqljy") #:trivial? #t)) (home-page "https://www.ctan.org/pkg/cabin") (synopsis "Humanist Sans Serif font with LaTeX support") @@ -8410,7 +8366,7 @@ use with [pdf]LaTeX.") "/fonts/vf/public/newtx/" "/tex/latex/newtx/") (base32 - "0rqjj33m6xkhrjzjhf24kxdg61az5sqsbcl0m7xqkf4akqybn22d") + "0fa90qz8px369yk0x1nhmq4901rvnclx06ijb4ir57f2324rrg8d") #:trivial? #t)) (home-page "https://www.ctan.org/pkg/newtx") (synopsis "Repackaging of the TX fonts with improved metrics") @@ -8438,7 +8394,7 @@ mathematics package that matches Libertine text quite well.") "/fonts/vf/public/xcharter/" "/tex/latex/xcharter/") (base32 - "0krm4h53lw7h9jbmv5nc89fm4x7i8l574aig1l4mw8w3ziknwmi7") + "1qlid98lg0wcdq6hpk9kl2cl139pxcw6y8x8mfah2j95wq1i64lm") #:trivial? #t)) (home-page "https://www.ctan.org/pkg/xcharter") (synopsis "Extension of the Bitstream Charter fonts") @@ -8756,7 +8712,7 @@ provided box macros are @code{\\lapbox}, @code{\\marginbox}, (list "/doc/latex/tcolorbox/" "/tex/latex/tcolorbox/") (base32 - "172lcnk6964alsga5w6kcvjhpjjcw1g9df73k8pyhl5lf4fmxa29") + "1swhagdj0a39ssifp29a36ldrjqmx8w92dqsgsjpal6lhksvzn2w") #:trivial? #true))) (package (inherit template) diff --git a/guix/build-system/texlive.scm b/guix/build-system/texlive.scm index c7fa2e3add..0efa139fc1 100644 --- a/guix/build-system/texlive.scm +++ b/guix/build-system/texlive.scm @@ -44,8 +44,8 @@ ;; These variables specify the SVN tag and the matching SVN revision. They ;; are taken from https://www.tug.org/svn/texlive/tags/ -(define %texlive-tag "texlive-2019.3") -(define %texlive-revision 51265) +(define %texlive-tag "texlive-2020.0") +(define %texlive-revision 54632) (define (texlive-origin name version locations hash) "Return an <origin> object for a TeX Live package consisting of multiple -- 2.31.1
guix-patches <at> gnu.org
:bug#48622
; Package guix-patches
.
(Mon, 24 May 2021 14:44:03 GMT) Full text and rfc822 format available.Message #11 received at 48622 <at> debbugs.gnu.org (full text, mbox):
From: Marius Bakke <marius <at> gnu.org> To: 48622 <at> debbugs.gnu.org Subject: [PATCH core-updates 03/29] gnu: Add texlive-latex-bookmark. Date: Mon, 24 May 2021 16:43:07 +0200
* gnu/packages/tex.scm (texlive-latex-bookmark): New public variable. --- gnu/packages/tex.scm | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm index 8a3f8cb9ba..8cf749e318 100644 --- a/gnu/packages/tex.scm +++ b/gnu/packages/tex.scm @@ -4763,6 +4763,23 @@ environment is provided which can be used instead of the @code{\\appendix} command.") (license license:lppl))) +(define-public texlive-latex-bookmark + (package + (inherit (simple-texlive-package + "texlive-latex-bookmark" + (list "/doc/latex/bookmark/" + "/tex/latex/bookmark/") + (base32 + "1vl1rrydh5jh78llp4i5r1hvznghm9gddwcnfnzwlgp9z67gybh1") + #:trivial? #t)) + (home-page "https://www.ctan.org/pkg/bookmark") + (synopsis "Bookmark (outline) organization for hyperref") + (description + "This package implements a new bookmark (outline) organization for the +@code{hyperref} package. Bookmark properties such as style and color. Other +action types are available (URI, GoToR, Named).") + (license license:lppl1.3c+))) + (define-public texlive-latex-changebar (package (name "texlive-latex-changebar") -- 2.31.1
guix-patches <at> gnu.org
:bug#48622
; Package guix-patches
.
(Mon, 24 May 2021 14:44:03 GMT) Full text and rfc822 format available.Message #14 received at 48622 <at> debbugs.gnu.org (full text, mbox):
From: Marius Bakke <marius <at> gnu.org> To: 48622 <at> debbugs.gnu.org Subject: [PATCH core-updates 02/29] gnu: Add texlive-latex-refcount. Date: Mon, 24 May 2021 16:43:06 +0200
* gnu/packages/tex.scm (texlive-latex-refcount): New public variable. --- gnu/packages/tex.scm | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm index 1cf288ee2f..8a3f8cb9ba 100644 --- a/gnu/packages/tex.scm +++ b/gnu/packages/tex.scm @@ -4244,6 +4244,25 @@ re-processing.") (define-public texlive-latex-pstool (deprecated-package "texlive-latex-pstool" texlive-pstool)) +(define-public texlive-latex-refcount + (package + (inherit (simple-texlive-package + "texlive-latex-refcount" + (list "/doc/latex/refcount/" + "/tex/latex/refcount/") + (base32 + "0pkmqj2qihndlv3ks33xzqw91q46jx79r3aygj68d8dflyddi583") + #:trivial? #t)) + (home-page "https://www.ctan.org/pkg/refcount") + (synopsis "Counter operations with label references") + (description + "This package provides the @code{\\setcounterref} and +@code{\\addtocounterref} commands which use the section (or other) number +from the reference as the value to put into the counter. It also provides +@code{\\setcounterpageref} and @code{\\addtocounterpageref} that do the +corresponding thing with the page reference of the label.") + (license license:lppl1.3c+))) + (define-public texlive-seminar (package (inherit (simple-texlive-package -- 2.31.1
guix-patches <at> gnu.org
:bug#48622
; Package guix-patches
.
(Mon, 24 May 2021 14:44:04 GMT) Full text and rfc822 format available.Message #17 received at 48622 <at> debbugs.gnu.org (full text, mbox):
From: Marius Bakke <marius <at> gnu.org> To: 48622 <at> debbugs.gnu.org Subject: [PATCH core-updates 04/29] gnu: dblatex: Update to 0.3.12. Date: Mon, 24 May 2021 16:43:08 +0200
* gnu/packages/docbook.scm (dblatex): Update to 0.3.12. [source](uri): Adjust file name. [inputs]: Add TEXLIVE-LATEX-BOOKMARK and TEXLIVE-LATEX-REFCOUNT. [arguments]: Remove #:python. --- gnu/packages/docbook.scm | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/gnu/packages/docbook.scm b/gnu/packages/docbook.scm index ee21d1b359..f0497410b6 100644 --- a/gnu/packages/docbook.scm +++ b/gnu/packages/docbook.scm @@ -390,21 +390,22 @@ the in DocBook SGML DTDs.") (define-public dblatex (package (name "dblatex") - (version "0.3.11") + (version "0.3.12") (source (origin (method url-fetch) (uri (string-append "mirror://sourceforge/dblatex/dblatex/" - "dblatex-" version "/dblatex-" + "dblatex-" version "/dblatex3-" version ".tar.bz2")) (sha256 (base32 - "0rp1bc2lgisigscq1i7zxfd2qdaxxxld6khbcxss4pq7fpi9fzkv")))) + "0yd09nypswy3q4scri1dg7dr99d7gd6r2dwx0xm81l9f4y32gs0n")))) (build-system python-build-system) ;; TODO: Add xfig/transfig for fig2dev utility (inputs `(("texlive" ,(texlive-updmap.cfg (list texlive-amsfonts texlive-latex-anysize texlive-latex-appendix + texlive-latex-bookmark texlive-latex-changebar texlive-latex-colortbl texlive-latex-eepic @@ -421,6 +422,7 @@ the in DocBook SGML DTDs.") texlive-latex-oberdiek texlive-latex-overpic texlive-latex-pdfpages + texlive-latex-refcount texlive-latex-subfigure texlive-latex-titlesec texlive-latex-url @@ -436,8 +438,7 @@ the in DocBook SGML DTDs.") ("docbook" ,docbook-xml) ("libxslt" ,libxslt))) ;for xsltproc (arguments - `(#:python ,python-2 ;'print' syntax - ;; Using setuptools causes an invalid "package_base" path in + `(;; Using setuptools causes an invalid "package_base" path in ;; out/bin/.dblatex-real due to a missing leading '/'. This is caused ;; by dblatex's setup.py stripping the root path when creating the ;; script. (dblatex's setup.py still uses distutils and thus has to -- 2.31.1
guix-patches <at> gnu.org
:bug#48622
; Package guix-patches
.
(Mon, 24 May 2021 14:44:04 GMT) Full text and rfc822 format available.Message #20 received at 48622 <at> debbugs.gnu.org (full text, mbox):
From: Marius Bakke <marius <at> gnu.org> To: 48622 <at> debbugs.gnu.org Subject: [PATCH core-updates 05/29] gnu: simple-texlive-package: Fix shebang patching. Date: Mon, 24 May 2021 16:43:09 +0200
* gnu/packages/tex.scm (simple-texlive-package)[arguments]: Copy the working directory instead of the source directory to the output. --- gnu/packages/tex.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm index 8cf749e318..bf2e19c149 100644 --- a/gnu/packages/tex.scm +++ b/gnu/packages/tex.scm @@ -120,7 +120,7 @@ copied to their outputs; otherwise the TEXLIVE-BUILD-SYSTEM is used." (string-append doc "/doc"))) '()) (mkdir-p out) - (copy-recursively (assoc-ref inputs "source") out) + (copy-recursively "." out) ,@(if with-documentation? '((delete-file-recursively (string-append out "/doc"))) '()) -- 2.31.1
guix-patches <at> gnu.org
:bug#48622
; Package guix-patches
.
(Mon, 24 May 2021 14:44:05 GMT) Full text and rfc822 format available.Message #23 received at 48622 <at> debbugs.gnu.org (full text, mbox):
From: Marius Bakke <marius <at> gnu.org> To: 48622 <at> debbugs.gnu.org Subject: [PATCH core-updates 06/29] gnu: Add texlive-latex-atveryend. Date: Mon, 24 May 2021 16:43:10 +0200
* gnu/packages/tex.scm (texlive-latex-atveryend): New public variable. --- gnu/packages/tex.scm | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm index bf2e19c149..d000cdb457 100644 --- a/gnu/packages/tex.scm +++ b/gnu/packages/tex.scm @@ -2792,6 +2792,26 @@ with the required packages, constitutes what every LaTeX distribution should contain.") (license license:lppl1.3c+)))) +(define-public texlive-latex-atveryend + (package + (inherit (simple-texlive-package + "texlive-latex-atveryend" + '("/doc/latex/atveryend/README.md" + "/tex/latex/atveryend/") + (base32 + "1gz5ssxjlqa53a8blsmdk2qjahzc910ldh26xjxfxgqnqb03rqx7") + #:trivial? #t)) + (home-page "https://www.ctan.org/pkg/atveryend") + (synopsis "Hooks at the very end of a document") + (description + "This LaTeX packages provides two hooks for @code{\\end@{document@} +that are executed after the hook of @code{\\AtEndDocument}: +@code{\\AfterLastShipout} can be used for code that is to be executed right +after the last @code{\\clearpage} before the @file{.aux} file is closed. +@code{\\AtVeryEndDocument} is used for code after closing and final reading +of the @file{.aux} file.") + (license license:lppl1.3c+))) + (define-public texlive-latex-filecontents (package (name "texlive-latex-filecontents") -- 2.31.1
guix-patches <at> gnu.org
:bug#48622
; Package guix-patches
.
(Mon, 24 May 2021 14:44:05 GMT) Full text and rfc822 format available.Message #26 received at 48622 <at> debbugs.gnu.org (full text, mbox):
From: Marius Bakke <marius <at> gnu.org> To: 48622 <at> debbugs.gnu.org Subject: [PATCH core-updates 07/29] gnu: Add texlive-latex-auxhook. Date: Mon, 24 May 2021 16:43:11 +0200
* gnu/packages/tex.scm (texlive-latex-auxhook): New public variable. --- gnu/packages/tex.scm | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm index d000cdb457..b4b1caddbf 100644 --- a/gnu/packages/tex.scm +++ b/gnu/packages/tex.scm @@ -2812,6 +2812,22 @@ after the last @code{\\clearpage} before the @file{.aux} file is closed. of the @file{.aux} file.") (license license:lppl1.3c+))) +(define-public texlive-latex-auxhook + (package + (inherit (simple-texlive-package + "texlive-latex-auxhook" + '("/doc/latex/auxhook/README.md" + "/tex/latex/auxhook/") + (base32 + "1xh445shr00rh43nnz03xh8k2mdrxgsr03lllqpgvwhm6yzsydkf") + #:trivial? #t)) + (home-page "https://www.ctan.org/pkg/auxhook") + (synopsis "Hooks for auxiliary files") + (description + "This package provides hooks for adding code at the beginning of +@file{.aux} files.") + (license license:lppl1.3c+))) + (define-public texlive-latex-filecontents (package (name "texlive-latex-filecontents") -- 2.31.1
guix-patches <at> gnu.org
:bug#48622
; Package guix-patches
.
(Mon, 24 May 2021 14:44:06 GMT) Full text and rfc822 format available.Message #29 received at 48622 <at> debbugs.gnu.org (full text, mbox):
From: Marius Bakke <marius <at> gnu.org> To: 48622 <at> debbugs.gnu.org Subject: [PATCH core-updates 08/29] gnu: Add texlive-latex-epstopdf-pkg. Date: Mon, 24 May 2021 16:43:12 +0200
* gnu/packages/tex.scm (texlive-latex-epstopdf-pkg): New public variable. --- gnu/packages/tex.scm | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm index b4b1caddbf..87b1914a94 100644 --- a/gnu/packages/tex.scm +++ b/gnu/packages/tex.scm @@ -2828,6 +2828,24 @@ of the @file{.aux} file.") @file{.aux} files.") (license license:lppl1.3c+))) +(define-public texlive-latex-epstopdf-pkg + (package + (inherit (simple-texlive-package + "texlive-latex-epstopdf-pkg" + '("/doc/latex/epstopdf-pkg/" + "/tex/latex/epstopdf-pkg/") + (base32 + "0zl6jiyp2cvvyqx3lwxdkcvvnkqgbwj4issq07cagf61gljq6fns") + #:trivial? #t)) + (home-page "https://www.ctan.org/pkg/epstopdf-pkg") + (synopsis "Call @command{epstopdf} \"on the fly\"") + (description + "The package adds support for EPS files in the @code{graphicx} package +when running under pdfTeX. If an EPS graphic is detected, the package +spawns a process to convert the EPS to PDF, using the script +@command{epstopdf}.") + (license license:lppl1.3c+))) + (define-public texlive-latex-filecontents (package (name "texlive-latex-filecontents") -- 2.31.1
guix-patches <at> gnu.org
:bug#48622
; Package guix-patches
.
(Mon, 24 May 2021 14:44:06 GMT) Full text and rfc822 format available.Message #32 received at 48622 <at> debbugs.gnu.org (full text, mbox):
From: Marius Bakke <marius <at> gnu.org> To: 48622 <at> debbugs.gnu.org Subject: [PATCH core-updates 09/29] gnu: Add texlive-latex-hycolor. Date: Mon, 24 May 2021 16:43:13 +0200
* gnu/packages/tex.scm (texlive-latex-hycolor): New public variable. --- gnu/packages/tex.scm | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm index 87b1914a94..32fe356a42 100644 --- a/gnu/packages/tex.scm +++ b/gnu/packages/tex.scm @@ -2973,6 +2973,22 @@ documents. It comprises the packages color, graphics, graphicx, trig, epsfig, keyval, and lscape.") (license license:lppl1.3c+))) +(define-public texlive-latex-hycolor + (package + (inherit (simple-texlive-package + "texlive-latex-hycolor" + (list "/doc/latex/hycolor/README.md" + "/tex/latex/hycolor/") + (base32 + "026lfb4l7b3q8g6zc68siqandhb1x98cbycn7njknqva6s99aiqn") + #:trivial? #t)) + (home-page "https://www.ctan.org/pkg/latex-graphics") + (synopsis "Color for hyperref and bookmark") + (description + "This package provides the code for the @code{color} option that is +used by @code{hyperref} and @code{bookmark}.") + (license license:lppl1.3c+))) + (define-public texlive-xcolor (let ((template (simple-texlive-package "texlive-xcolor" -- 2.31.1
guix-patches <at> gnu.org
:bug#48622
; Package guix-patches
.
(Mon, 24 May 2021 14:44:07 GMT) Full text and rfc822 format available.Message #35 received at 48622 <at> debbugs.gnu.org (full text, mbox):
From: Marius Bakke <marius <at> gnu.org> To: 48622 <at> debbugs.gnu.org Subject: [PATCH core-updates 10/29] gnu: Add texlive-generic-infwarerr. Date: Mon, 24 May 2021 16:43:14 +0200
* gnu/packages/tex.scm (texlive-generic-infwarerr): New public variable. --- gnu/packages/tex.scm | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm index 32fe356a42..0f4527bcc2 100644 --- a/gnu/packages/tex.scm +++ b/gnu/packages/tex.scm @@ -7244,6 +7244,23 @@ refers to the version of scrbook, scrreprt, scrartcl, scrlttr2 and typearea (which are the main parts of the bundle).") (license license:lppl1.3+))) +(define-public texlive-generic-infwarerr + (package + (inherit (simple-texlive-package + "texlive-generic-infwarerr" + '("/tex/generic/infwarerr/") + (base32 + "19nlrbfmqbkjrrx9x75s9nd6crg1lzimb2fr3hfblaivj6lx8p4r") + #:trivial? #t)) + (home-page "https://www.ctan.org/pkg/infwarerr") + (synopsis "Information/warning/error macros") + (description + "This package provides a complete set of macros for information, +warning and error messages. Under LaTeX, the commands are wrappers for +the corresponding LaTeX commands; under Plain TeX they are available as +complete implementations.") + (license license:lppl1.3c+))) + (define-public texlive-generic-listofitems (package (name "texlive-generic-listofitems") -- 2.31.1
guix-patches <at> gnu.org
:bug#48622
; Package guix-patches
.
(Mon, 24 May 2021 14:44:07 GMT) Full text and rfc822 format available.Message #38 received at 48622 <at> debbugs.gnu.org (full text, mbox):
From: Marius Bakke <marius <at> gnu.org> To: 48622 <at> debbugs.gnu.org Subject: [PATCH core-updates 11/29] gnu: Add texlive-generic-ltxcmds. Date: Mon, 24 May 2021 16:43:15 +0200
* gnu/packages/tex.scm (texlive-generic-ltxcmds): New public variable. --- gnu/packages/tex.scm | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm index 0f4527bcc2..a6a0369111 100644 --- a/gnu/packages/tex.scm +++ b/gnu/packages/tex.scm @@ -7295,6 +7295,22 @@ the parsing character has been selected by the user, and to access any of these items with a simple syntax.") (license license:lppl1.3c+))) +(define-public texlive-generic-ltxcmds + (package + (inherit (simple-texlive-package + "texlive-generic-ltxcmds" + '("/tex/generic/ltxcmds/") + (base32 + "0mdzy76sbc3pmas5zqxn35w9xcg4v7j4p31jcjm9f4hzm27y974a") + #:trivial? #t)) + (home-page "https://www.ctan.org/pkg/ltxcmds") + (synopsis "LaTeX kernel commands extracted for general use") + (description + "This package exports some utility macros from the LaTeX kernel into +a separate namespace and also makes them available for other formats such +as plain TeX.") + (license license:lppl1.3c+))) + (define-public texlive-latex-readarray (package (name "texlive-latex-readarray") -- 2.31.1
guix-patches <at> gnu.org
:bug#48622
; Package guix-patches
.
(Mon, 24 May 2021 14:45:02 GMT) Full text and rfc822 format available.Message #41 received at 48622 <at> debbugs.gnu.org (full text, mbox):
From: Marius Bakke <marius <at> gnu.org> To: 48622 <at> debbugs.gnu.org Subject: [PATCH core-updates 12/29] gnu: Add texlive-latex-pdftexcmds. Date: Mon, 24 May 2021 16:43:16 +0200
* gnu/packages/tex.scm (texlive-latex-pdftexcmds): New public variable. --- gnu/packages/tex.scm | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm index a6a0369111..bb81b836ee 100644 --- a/gnu/packages/tex.scm +++ b/gnu/packages/tex.scm @@ -4257,6 +4257,26 @@ that are compatible with @code{natbib}: @code{plainnat}, @code{unsrtnat}, designed from the start to be compatible with @code{natbib}.") (license license:lppl))) +(define-public texlive-latex-pdftexcmds + (package + (inherit (simple-texlive-package + "texlive-latex-pdftexcmds" + '("/doc/latex/pdftexcmds/" + "/tex/latex/pdftexcmds/") + (base32 + "0kqav8jri789698wxwr2ww8ssn74fvw3agrv677nz5qyq5zmix8h") + #:trivial? #t)) + (propagated-inputs + `(("texlive-generic-iftex" ,texlive-generic-iftex) + ("texlive-generic-infwarerr" ,texlive-generic-infwarerr) + ("texlive-generic-ltxcmds" ,texlive-generic-ltxcmds))) + (home-page "https://www.ctan.org/pkg/pdftexcmds") + (synopsis "LuaTeX support for pdfTeX utility functions") + (description + "This package makes a number of utility functions from pdfTeX +available for luaTeX by reimplementing them using Lua.") + (license license:lppl1.3c+))) + (define-public texlive-latex-psfrag (package (name "texlive-latex-psfrag") -- 2.31.1
guix-patches <at> gnu.org
:bug#48622
; Package guix-patches
.
(Mon, 24 May 2021 14:45:02 GMT) Full text and rfc822 format available.Message #44 received at 48622 <at> debbugs.gnu.org (full text, mbox):
From: Marius Bakke <marius <at> gnu.org> To: 48622 <at> debbugs.gnu.org Subject: [PATCH core-updates 13/29] gnu: Add texlive-latex-letltxmacro. Date: Mon, 24 May 2021 16:43:17 +0200
* gnu/packages/tex.scm (texlive-latex-letltxmacro): New public variable. --- gnu/packages/tex.scm | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm index bb81b836ee..08ef375696 100644 --- a/gnu/packages/tex.scm +++ b/gnu/packages/tex.scm @@ -5064,6 +5064,24 @@ the same place. The package also has a range of techniques for labelling footnotes with symbols rather than numbers.") (license license:lppl1.3+))) +(define-public texlive-latex-letltxmacro + (package + (inherit (simple-texlive-package + "texlive-latex-letltxmacro" + (list "/doc/latex/letltxmacro/" + "/tex/latex/letltxmacro/") + (base32 + "0yy1m1jiyxq2pssp0pidaa2swx6lyxw3zwpm2r8m0v2r3lvsyyxx") + #:trivial? #t)) + (home-page "https://www.ctan.org/pkg/letltxmacro") + (synopsis "Let assignment for macros") + (description + "TeX’s @code{\\let} assignment does not work for LaTeX macros with +optional arguments, or for macros that are defined as robust macros by +@code{\\DeclareRobustCommand}. This package defines @code{\\LetLtxMacro} +that also takes care of the involved internal macros.") + (license license:lppl1.3c+))) + (define-public texlive-latex-listings (package (name "texlive-latex-listings") -- 2.31.1
guix-patches <at> gnu.org
:bug#48622
; Package guix-patches
.
(Mon, 24 May 2021 14:45:02 GMT) Full text and rfc822 format available.Message #47 received at 48622 <at> debbugs.gnu.org (full text, mbox):
From: Marius Bakke <marius <at> gnu.org> To: 48622 <at> debbugs.gnu.org Subject: [PATCH core-updates 14/29] gnu: Add texlive-generic-atbegshi. Date: Mon, 24 May 2021 16:43:18 +0200
* gnu/packages/tex.scm (texlive-generic-atbegshi): New public variable. --- gnu/packages/tex.scm | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm index 08ef375696..81d72ec62b 100644 --- a/gnu/packages/tex.scm +++ b/gnu/packages/tex.scm @@ -7282,6 +7282,24 @@ refers to the version of scrbook, scrreprt, scrartcl, scrlttr2 and typearea (which are the main parts of the bundle).") (license license:lppl1.3+))) +(define-public texlive-generic-atbegshi + (package + (inherit (simple-texlive-package + "texlive-generic-atbegshi" + '("/doc/latex/atbegshi/" + "/tex/generic/atbegshi/") + (base32 + "184fr5kd3wl44ix63lwb3ll7dhiikkyw1czbnzrl4am4rx0zh4d8") + #:trivial? #t)) + (home-page "https://www.ctan.org/pkg/atbegshi") + (synopsis "Execute commands at @code{\\shipout} time") + (description + "This package is a modern reimplementation of package @code{everyshi}, +providing various commands to be executed before a @code{\\shipout} command. +It makes use of e-TeX’s facilities if they are available. The package may +be used either with LaTeX or with plain TeX.") + (license license:lppl1.3c+))) + (define-public texlive-generic-infwarerr (package (inherit (simple-texlive-package -- 2.31.1
guix-patches <at> gnu.org
:bug#48622
; Package guix-patches
.
(Mon, 24 May 2021 14:45:03 GMT) Full text and rfc822 format available.Message #50 received at 48622 <at> debbugs.gnu.org (full text, mbox):
From: Marius Bakke <marius <at> gnu.org> To: 48622 <at> debbugs.gnu.org Subject: [PATCH core-updates 15/29] gnu: Add texlive-generic-intcalc. Date: Mon, 24 May 2021 16:43:19 +0200
* gnu/packages/tex.scm (texlive-generic-intcalc): New public variable. --- gnu/packages/tex.scm | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm index 81d72ec62b..d860d99e85 100644 --- a/gnu/packages/tex.scm +++ b/gnu/packages/tex.scm @@ -7317,6 +7317,21 @@ the corresponding LaTeX commands; under Plain TeX they are available as complete implementations.") (license license:lppl1.3c+))) +(define-public texlive-generic-intcalc + (package + (inherit (simple-texlive-package + "texlive-generic-intcalc" + '("/tex/generic/intcalc/") + (base32 + "0llrnayqwdqxi91yh7panbbiljina3bynv2hxhi6sssaw3pyd92l") + #:trivial? #t)) + (home-page "https://www.ctan.org/pkg/intcalc") + (synopsis "Expandable arithmetic operations with integers") + (description + "This package provides expandable arithmetic operations with integers, +using the e-TeX extension @code{\\numexpr} if it is available.") + (license license:lppl1.3c+))) + (define-public texlive-generic-listofitems (package (name "texlive-generic-listofitems") -- 2.31.1
guix-patches <at> gnu.org
:bug#48622
; Package guix-patches
.
(Mon, 24 May 2021 14:45:03 GMT) Full text and rfc822 format available.Message #53 received at 48622 <at> debbugs.gnu.org (full text, mbox):
From: Marius Bakke <marius <at> gnu.org> To: 48622 <at> debbugs.gnu.org Subject: [PATCH core-updates 16/29] gnu: Add texlive-generic-bigintcalc. Date: Mon, 24 May 2021 16:43:20 +0200
* gnu/packages/tex.scm (texlive-generic-bigintcalc): New public variable. --- gnu/packages/tex.scm | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm index d860d99e85..f25dc4ce74 100644 --- a/gnu/packages/tex.scm +++ b/gnu/packages/tex.scm @@ -7300,6 +7300,24 @@ It makes use of e-TeX’s facilities if they are available. The package may be used either with LaTeX or with plain TeX.") (license license:lppl1.3c+))) +(define-public texlive-generic-bigintcalc + (package + (inherit (simple-texlive-package + "texlive-generic-bigintcalc" + '("/doc/latex/bigintcalc/README.md" + "/tex/generic/bigintcalc/") + (base32 + "19grk4p1dh566hgpzhnjyjnrw57hpjijcpr7ci401n9jszcc1xkz") + #:trivial? #t)) + (propagated-inputs + `(("texlive-latex-pdftexcmds" ,texlive-latex-pdftexcmds))) + (home-page "https://www.ctan.org/pkg/bigintcalc") + (synopsis "Integer calculations on very large numbers") + (description + "This package provides expandable arithmetic operations with big +integers that can exceed TeX's number limits.") + (license license:lppl1.3c+))) + (define-public texlive-generic-infwarerr (package (inherit (simple-texlive-package -- 2.31.1
guix-patches <at> gnu.org
:bug#48622
; Package guix-patches
.
(Mon, 24 May 2021 14:45:04 GMT) Full text and rfc822 format available.Message #56 received at 48622 <at> debbugs.gnu.org (full text, mbox):
From: Marius Bakke <marius <at> gnu.org> To: 48622 <at> debbugs.gnu.org Subject: [PATCH core-updates 17/29] gnu: Add texlive-generic-bitset. Date: Mon, 24 May 2021 16:43:21 +0200
* gnu/packages/tex.scm (texlive-generic-bitset): New public variable. --- gnu/packages/tex.scm | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm index f25dc4ce74..6c5840fc7d 100644 --- a/gnu/packages/tex.scm +++ b/gnu/packages/tex.scm @@ -7318,6 +7318,27 @@ be used either with LaTeX or with plain TeX.") integers that can exceed TeX's number limits.") (license license:lppl1.3c+))) +(define-public texlive-generic-bitset + (package + (inherit (simple-texlive-package + "texlive-generic-bitset" + '("/doc/latex/bitset/README.md" + "/tex/generic/bitset/") + (base32 + "0inj6qpzizvsbxdfsaijnl4iq976kyrnchnm3gc1kc2w389zrn1l") + #:trivial? #t)) + (propagated-inputs + `(("texlive-generic-infwarerr" ,texlive-generic-infwarerr) + ("texlive-generic-intcalc" ,texlive-generic-intcalc) + ("texlive-generic-bigintcalc" ,texlive-generic-bigintcalc))) + (home-page "https://www.ctan.org/pkg/bitset") + (synopsis "Handle bit-vector datatype") + (description + "This package defines and implements the data type bit set, a vector +of bits. The size of the vector may grow dynamically. Individual bits +can be manipulated.") + (license license:lppl1.3c+))) + (define-public texlive-generic-infwarerr (package (inherit (simple-texlive-package -- 2.31.1
guix-patches <at> gnu.org
:bug#48622
; Package guix-patches
.
(Mon, 24 May 2021 14:45:04 GMT) Full text and rfc822 format available.Message #59 received at 48622 <at> debbugs.gnu.org (full text, mbox):
From: Marius Bakke <marius <at> gnu.org> To: 48622 <at> debbugs.gnu.org Subject: [PATCH core-updates 18/29] gnu: Add texlive-generic-etexcmds. Date: Mon, 24 May 2021 16:43:22 +0200
* gnu/packages/tex.scm (texlive-generic-etexcmds): New public variable. --- gnu/packages/tex.scm | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm index 6c5840fc7d..3cc345e018 100644 --- a/gnu/packages/tex.scm +++ b/gnu/packages/tex.scm @@ -7339,6 +7339,27 @@ of bits. The size of the vector may grow dynamically. Individual bits can be manipulated.") (license license:lppl1.3c+))) +(define-public texlive-generic-etexcmds + (package + (inherit (simple-texlive-package + "texlive-generic-etexcmds" + '("/doc/latex/etexcmds/README.md" + "/tex/generic/etexcmds/") + (base32 + "11y6pnlq13bp0ybi7c82g8ds8085zv1zaslgqv3dzhgi3dklpc0c") + #:trivial? #t)) + (propagated-inputs + `(("texlive-generic-infwarerr" ,texlive-generic-infwarerr) + ("texlive-generic-iftex" ,texlive-generic-iftex))) + (home-page "https://www.ctan.org/pkg/etexcmds") + (synopsis "Avoid name clashes with e-TeX commands") + (description + "New primitive commands are introduced in e-TeX; sometimes the names +collide with existing macros. This package solves the name clashes by +adding a prefix to e-TeX’s commands. For example, ε-TeX’s +@code{\\unexpanded} is provided as @code{\\etex <at> unexpanded}.") + (license license:lppl1.3c+))) + (define-public texlive-generic-infwarerr (package (inherit (simple-texlive-package -- 2.31.1
guix-patches <at> gnu.org
:bug#48622
; Package guix-patches
.
(Mon, 24 May 2021 14:45:05 GMT) Full text and rfc822 format available.Message #62 received at 48622 <at> debbugs.gnu.org (full text, mbox):
From: Marius Bakke <marius <at> gnu.org> To: 48622 <at> debbugs.gnu.org Subject: [PATCH core-updates 19/29] gnu: Add texlive-generic-gettitlestring. Date: Mon, 24 May 2021 16:43:23 +0200
* gnu/packages/tex.scm (texlive-generic-gettitlestring): New public variable. --- gnu/packages/tex.scm | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm index 3cc345e018..3e40144ab7 100644 --- a/gnu/packages/tex.scm +++ b/gnu/packages/tex.scm @@ -7360,6 +7360,23 @@ adding a prefix to e-TeX’s commands. For example, ε-TeX’s @code{\\unexpanded} is provided as @code{\\etex <at> unexpanded}.") (license license:lppl1.3c+))) +(define-public texlive-generic-gettitlestring + (package + (inherit (simple-texlive-package + "texlive-generic-gettitlestring" + '("/doc/latex/gettitlestring/" + "/tex/generic/gettitlestring/") + (base32 + "1p4hg9mac03rzvj9dw0ws3zdh55fy1ns954f912algw9f2aq4xgp") + #:trivial? #t)) + (home-page "https://www.ctan.org/pkg/gettitlestring") + (synopsis "Clean up title references") + (description + "This package provides commands for cleaning up the title string +(such as removing @code{\\label} commands) for packages that typeset such +strings.") + (license license:lppl1.3c+))) + (define-public texlive-generic-infwarerr (package (inherit (simple-texlive-package -- 2.31.1
guix-patches <at> gnu.org
:bug#48622
; Package guix-patches
.
(Mon, 24 May 2021 14:45:05 GMT) Full text and rfc822 format available.Message #65 received at 48622 <at> debbugs.gnu.org (full text, mbox):
From: Marius Bakke <marius <at> gnu.org> To: 48622 <at> debbugs.gnu.org Subject: [PATCH core-updates 20/29] gnu: Add texlive-generic-kvdefinekeys. Date: Mon, 24 May 2021 16:43:24 +0200
* gnu/packages/tex.scm (texlive-generic-kvdefinekeys): New public variable. --- gnu/packages/tex.scm | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm index 3e40144ab7..946fc43082 100644 --- a/gnu/packages/tex.scm +++ b/gnu/packages/tex.scm @@ -7409,6 +7409,21 @@ complete implementations.") using the e-TeX extension @code{\\numexpr} if it is available.") (license license:lppl1.3c+))) +(define-public texlive-generic-kvdefinekeys + (package + (inherit (simple-texlive-package + "texlive-generic-kvdefinekeys" + '("/tex/generic/kvdefinekeys/") + (base32 + "12nn74skhwiszbdhawqds31caz6d59a5pjmwar0r8lmk4f1jr3xh") + #:trivial? #t)) + (home-page "https://www.ctan.org/pkg/kvdefinekeys") + (synopsis "Define keys for use in the @code{kvsetkeys} package") + (description + "This package provides the @code{\\kv <at> define <at> key} (analogous to +keyval’s @code{\\define <at> key}, to define keys for use by @code{kvsetkeys}.") + (license license:lppl1.3c+))) + (define-public texlive-generic-listofitems (package (name "texlive-generic-listofitems") -- 2.31.1
guix-patches <at> gnu.org
:bug#48622
; Package guix-patches
.
(Mon, 24 May 2021 14:45:06 GMT) Full text and rfc822 format available.Message #68 received at 48622 <at> debbugs.gnu.org (full text, mbox):
From: Marius Bakke <marius <at> gnu.org> To: 48622 <at> debbugs.gnu.org Subject: [PATCH core-updates 21/29] gnu: Add texlive-generic-kvsetkeys. Date: Mon, 24 May 2021 16:43:25 +0200
* gnu/packages/tex.scm (texlive-generic-kvsetkeys): New public variable. --- gnu/packages/tex.scm | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm index 946fc43082..bf716bfe7f 100644 --- a/gnu/packages/tex.scm +++ b/gnu/packages/tex.scm @@ -7424,6 +7424,23 @@ using the e-TeX extension @code{\\numexpr} if it is available.") keyval’s @code{\\define <at> key}, to define keys for use by @code{kvsetkeys}.") (license license:lppl1.3c+))) +(define-public texlive-generic-kvsetkeys + (package + (inherit (simple-texlive-package + "texlive-generic-kvsetkeys" + '("/tex/generic/kvsetkeys/") + (base32 + "149vpmv4vms269dzq4sghlngg380sasvxnb3sx9rfs7d9j0finvi") + #:trivial? #t)) + (home-page "https://www.ctan.org/pkg/kvsetkeys") + (synopsis "Key value parser with default handler support") + (description + "This package provides @code{\\kvsetkeys}, a variant of @code{\\setkeys} +from the @code{keyval} package. Users can specify a handler that deals with +unknown options. Active commas and equal signs may be used, and only one +level of curly braces are removed from the values.") + (license license:lppl1.3c+))) + (define-public texlive-generic-listofitems (package (name "texlive-generic-listofitems") -- 2.31.1
guix-patches <at> gnu.org
:bug#48622
; Package guix-patches
.
(Mon, 24 May 2021 14:45:06 GMT) Full text and rfc822 format available.Message #71 received at 48622 <at> debbugs.gnu.org (full text, mbox):
From: Marius Bakke <marius <at> gnu.org> To: 48622 <at> debbugs.gnu.org Subject: [PATCH core-updates 22/29] gnu: Add texlive-latex-kvoptions. Date: Mon, 24 May 2021 16:43:26 +0200
* gnu/packages/tex.scm (texlive-latex-kvoptions): New public variable. --- gnu/packages/tex.scm | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm index bf716bfe7f..64d6298e0f 100644 --- a/gnu/packages/tex.scm +++ b/gnu/packages/tex.scm @@ -5145,6 +5145,25 @@ transliterate semitic languages; patches to make (La)TeX formulae embeddable in SGML; use maths minus in text as appropriate; simple Young tableaux.") (license license:gpl2))) +(define-public texlive-latex-kvoptions + (package + (inherit (simple-texlive-package + "texlive-latex-kvoptions" + (list "/doc/latex/kvoptions/" + "/tex/latex/kvoptions/") + (base32 + "04v733njj6ynf1prj5rxljqbjq925jyycdprc78n7g01knn13wgr") + #:trivial? #t)) + (propagated-inputs + `(("texlive-generic-kvsetkeys" ,texlive-generic-kvsetkeys) + ("texlive-generic-ltxcmds" ,texlive-generic-ltxcmds))) + (home-page "https://www.ctan.org/pkg/kvoptions") + (synopsis "Key/value format for package options") + (description + "This package provides facilities for using key-value format in +package options.") + (license license:lppl1.3c+))) + (define-public texlive-fonts-ec (package (name "texlive-fonts-ec") -- 2.31.1
guix-patches <at> gnu.org
:bug#48622
; Package guix-patches
.
(Mon, 24 May 2021 14:45:06 GMT) Full text and rfc822 format available.Message #74 received at 48622 <at> debbugs.gnu.org (full text, mbox):
From: Marius Bakke <marius <at> gnu.org> To: 48622 <at> debbugs.gnu.org Subject: [PATCH core-updates 23/29] gnu: Add texlive-generic-pdfescape. Date: Mon, 24 May 2021 16:43:27 +0200
* gnu/packages/tex.scm (texlive-generic-pdfescape): New public variable. --- gnu/packages/tex.scm | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm index 64d6298e0f..d42aa6084f 100644 --- a/gnu/packages/tex.scm +++ b/gnu/packages/tex.scm @@ -7510,6 +7510,22 @@ a separate namespace and also makes them available for other formats such as plain TeX.") (license license:lppl1.3c+))) +(define-public texlive-generic-pdfescape + (package + (inherit (simple-texlive-package + "texlive-generic-pdfescape" + '("/tex/generic/pdfescape/") + (base32 + "1vbdjmm9bi9ngzz2z1b8jnf6nzf9xsaj5pvyswg13y4dr00mnz6n") + #:trivial? #t)) + (home-page "https://www.ctan.org/pkg/pdfescape") + (synopsis "pdfTeX's escape features for plain TeX") + (description + "This package implements pdfTeX's escape features (@code{\\pdfescapehex}, +@code{\\pdfunescapehex}, @code{\\pdfescapename}, @code{\\pdfescapestring}) +using TeX or e-TeX.") + (license license:lppl1.3c+))) + (define-public texlive-latex-readarray (package (name "texlive-latex-readarray") -- 2.31.1
guix-patches <at> gnu.org
:bug#48622
; Package guix-patches
.
(Mon, 24 May 2021 14:45:07 GMT) Full text and rfc822 format available.Message #77 received at 48622 <at> debbugs.gnu.org (full text, mbox):
From: Marius Bakke <marius <at> gnu.org> To: 48622 <at> debbugs.gnu.org Subject: [PATCH core-updates 24/29] gnu: Add texlive-generic-uniquecounter. Date: Mon, 24 May 2021 16:43:28 +0200
* gnu/packages/tex.scm (texlive-generic-uniquecounter): New public variable. --- gnu/packages/tex.scm | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm index d42aa6084f..20eb7b6f0e 100644 --- a/gnu/packages/tex.scm +++ b/gnu/packages/tex.scm @@ -7526,6 +7526,26 @@ as plain TeX.") using TeX or e-TeX.") (license license:lppl1.3c+))) +(define-public texlive-generic-uniquecounter + (package + (inherit (simple-texlive-package + "texlive-generic-uniquecounter" + '("/doc/latex/uniquecounter/" + "/tex/generic/uniquecounter/") + (base32 + "1bjh8vwiqlkmjqndnh4xp116524x4m3hdcyq2s231jiqy8il8dcc") + #:trivial? #t)) + (propagated-inputs + `(("texlive-generic-bigintcalc" ,texlive-generic-bigintcalc) + ("texlive-generic-infwarerr" ,texlive-generic-infwarerr))) + (home-page "https://www.ctan.org/pkg/uniquecounter") + (synopsis "Unlimited unique counter") + (description + "This package provides a kind of counter that provides unique number +values. Several counters can be created with different names. The numeric +values are not limited.") + (license license:lppl1.3c+))) + (define-public texlive-latex-readarray (package (name "texlive-latex-readarray") -- 2.31.1
guix-patches <at> gnu.org
:bug#48622
; Package guix-patches
.
(Mon, 24 May 2021 14:45:08 GMT) Full text and rfc822 format available.Message #80 received at 48622 <at> debbugs.gnu.org (full text, mbox):
From: Marius Bakke <marius <at> gnu.org> To: 48622 <at> debbugs.gnu.org Subject: [PATCH core-updates 25/29] gnu: Add texlive-latex-rerunfilecheck. Date: Mon, 24 May 2021 16:43:29 +0200
* gnu/packages/tex.scm (texlive-latex-rerunfilecheck): New public variable. --- gnu/packages/tex.scm | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm index 20eb7b6f0e..4ebc2512b2 100644 --- a/gnu/packages/tex.scm +++ b/gnu/packages/tex.scm @@ -3173,6 +3173,28 @@ arrows; record information about document class(es) used; and many more.") (define-public texlive-latex-oberdiek (deprecated-package "texlive-latex-oberdiek" texlive-oberdiek)) +(define-public texlive-latex-rerunfilecheck + (package + (inherit (simple-texlive-package + "texlive-latex-rerunfilecheck" + '("/doc/latex/rerunfilecheck/" + "/tex/latex/rerunfilecheck/") + (base32 + "1myz0d5bxhxvl4220ikywh921qld8n324kk9kscqbc5iw4063g56") + #:trivial? #t)) + (propagated-inputs + `(("texlive-generic-infwarerr" ,texlive-generic-infwarerr) + ("texlive-generic-uniquecounter" ,texlive-generic-uniquecounter) + ("texlive-latex-atveryend" ,texlive-latex-atveryend) + ("texlive-latex-kvoptions" ,texlive-latex-kvoptions) + ("texlive-latex-pdftexcmds" ,texlive-latex-pdftexcmds))) + (home-page "https://www.ctan.org/pkg/rerunfilecheck") + (synopsis "Checksum based rerun checks on auxiliary files") + (description + "This package provides additional rerun warnings if some auxiliary +files have changed. It is based on MD5 checksum, provided by pdfTeX.") + (license license:lppl1.3c+))) + (define-public texlive-latex-tools (package (name "texlive-latex-tools") -- 2.31.1
guix-patches <at> gnu.org
:bug#48622
; Package guix-patches
.
(Mon, 24 May 2021 14:45:08 GMT) Full text and rfc822 format available.Message #83 received at 48622 <at> debbugs.gnu.org (full text, mbox):
From: Marius Bakke <marius <at> gnu.org> To: 48622 <at> debbugs.gnu.org Subject: [PATCH core-updates 26/29] gnu: texlive-base: Propagate texlive-kpathsea. Date: Mon, 24 May 2021 16:43:30 +0200
* gnu/packages/tex.scm (texlive-base)[propagated-inputs]: Add TEXLIVE-KPATHSEA. --- gnu/packages/tex.scm | 1 + 1 file changed, 1 insertion(+) diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm index 4ebc2512b2..2b1edf8ebc 100644 --- a/gnu/packages/tex.scm +++ b/gnu/packages/tex.scm @@ -3835,6 +3835,7 @@ part of the LaTeX required set of packages.") texlive-fonts-latex texlive-metafont texlive-latex-base + texlive-kpathsea ;for mktex.opt ;; LaTeX packages from the "required" set. texlive-latex-amsmath texlive-amscls -- 2.31.1
guix-patches <at> gnu.org
:bug#48622
; Package guix-patches
.
(Mon, 24 May 2021 14:45:08 GMT) Full text and rfc822 format available.Message #86 received at 48622 <at> debbugs.gnu.org (full text, mbox):
From: Marius Bakke <marius <at> gnu.org> To: 48622 <at> debbugs.gnu.org Subject: [PATCH core-updates 27/29] gnu: texlive-hyperref: Don't propagate texlive-oberdiek. Date: Mon, 24 May 2021 16:43:31 +0200
* gnu/packages/tex.scm (texlive-hyperref)[propagated-inputs]: Remove TEXLIVE-OBERDIEK. Add TEXLIVE-GENERIC-ATBEGSHI, TEXLIVE-GENERIC-BITSET, TEXLIVE-GENERIC-ETEXCMDS, TEXLIVE-GENERIC-GETTITLESTRING, TEXLIVE-GENERIC-IFTEX, TEXLIVE-GENERIC-INFWARERR, TEXLIVE-GENERIC-INTCALC, TEXLIVE-GENERIC-KVDEFINEKEYS, TEXLIVE-GENERIC-LTXCMDS, TEXLIVE-GENERIC-PDFESCAPE, TEXLIVE-LATEX-AUXHOOK, TEXLIVE-LATEX-ATVERYEND, TEXLIVE-LATEX-HYCOLOR, TEXLIVE-LATEX-KVOPTIONS, TEXLIVE-LATEX-LETLTXMACRO, TEXLIVE-LATEX-PDFTEXCMDS, TEXLIVE-LATEX-REFCOUNT, and TEXLIVE-LATEX-RERUNFILECHECK. --- gnu/packages/tex.scm | 20 +++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-) diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm index 2b1edf8ebc..c99b7dce33 100644 --- a/gnu/packages/tex.scm +++ b/gnu/packages/tex.scm @@ -3119,7 +3119,25 @@ XML, using UTF-8 or a suitable 8-bit encoding.") (add-after 'unpack 'chdir (lambda _ (chdir "source/latex/hyperref") #t)))))) (propagated-inputs - `(("texlive-oberdiek" ,texlive-oberdiek) ; for ltxcmds.sty + `(("texlive-generic-atbegshi" ,texlive-generic-atbegshi) + ("texlive-generic-bitset" ,texlive-generic-bitset) + ("texlive-generic-etexcmds" ,texlive-generic-etexcmds) + ("texlive-generic-gettitlestring" ,texlive-generic-gettitlestring) + ("texlive-generic-iftex" ,texlive-generic-iftex) + ("texlive-generic-infwarerr" ,texlive-generic-infwarerr) + ("texlive-generic-intcalc" ,texlive-generic-intcalc) + ("texlive-generic-kvdefinekeys" ,texlive-generic-kvdefinekeys) + ("texlive-generic-kvsetkeys" ,texlive-generic-kvsetkeys) + ("texlive-generic-ltxcmds" ,texlive-generic-ltxcmds) + ("texlive-generic-pdfescape" ,texlive-generic-pdfescape) + ("texlive-latex-auxhook" ,texlive-latex-auxhook) + ("texlive-latex-atveryend" ,texlive-latex-atveryend) + ("texlive-latex-hycolor" ,texlive-latex-hycolor) + ("texlive-latex-kvoptions" ,texlive-latex-kvoptions) + ("texlive-latex-letltxmacro" ,texlive-latex-letltxmacro) + ("texlive-latex-pdftexcmds" ,texlive-latex-pdftexcmds) + ("texlive-latex-refcount" ,texlive-latex-refcount) + ("texlive-latex-rerunfilecheck" ,texlive-latex-rerunfilecheck) ("texlive-latex-url" ,texlive-latex-url))) (home-page "https://www.ctan.org/pkg/hyperref") (synopsis "Extensive support for hypertext in LaTeX") -- 2.31.1
guix-patches <at> gnu.org
:bug#48622
; Package guix-patches
.
(Mon, 24 May 2021 14:45:09 GMT) Full text and rfc822 format available.Message #89 received at 48622 <at> debbugs.gnu.org (full text, mbox):
From: Marius Bakke <marius <at> gnu.org> To: 48622 <at> debbugs.gnu.org Subject: [PATCH core-updates 28/29] gnu: texlive-graphics-def: Propagate missing dependency. Date: Mon, 24 May 2021 16:43:32 +0200
* gnu/packages/tex.scm (texlive-graphics-def)[propagated-inputs]: New field. Add TEXLIVE-LATEX-EPSTOPDF-PKG. --- gnu/packages/tex.scm | 2 ++ 1 file changed, 2 insertions(+) diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm index c99b7dce33..ea89036e7f 100644 --- a/gnu/packages/tex.scm +++ b/gnu/packages/tex.scm @@ -2923,6 +2923,8 @@ verbatim source).") (base32 "125lm2m9813p29yl7am21kgqdpigyqvrjarg73jpaczifbbbqklf") #:trivial? #t)) + (propagated-inputs + `(("texlive-latex-epstopdf-pkg" ,texlive-latex-epstopdf-pkg))) (home-page "https://www.ctan.org/pkg/latex-graphics") (synopsis "Color and graphics option files") (description -- 2.31.1
guix-patches <at> gnu.org
:bug#48622
; Package guix-patches
.
(Mon, 24 May 2021 14:45:09 GMT) Full text and rfc822 format available.Message #92 received at 48622 <at> debbugs.gnu.org (full text, mbox):
From: Marius Bakke <marius <at> gnu.org> To: 48622 <at> debbugs.gnu.org Subject: [PATCH core-updates 29/29] gnu: dblatex: Remove unused TeX inputs. Date: Mon, 24 May 2021 16:43:33 +0200
* gnu/packages/docbook.scm (dblatex)[inputs]: Remove TEXLIVE-LATEX-EEPIC, TEXLIVE-LATEX-ESO-PIC, TEXLIVE-LATEX-OBERDIEK, TEXLIVE-LATEX-URL, and TEXLIVE-FONTS-EC from updmap.cfg. --- gnu/packages/docbook.scm | 5 ----- 1 file changed, 5 deletions(-) diff --git a/gnu/packages/docbook.scm b/gnu/packages/docbook.scm index f0497410b6..9f47dadd5d 100644 --- a/gnu/packages/docbook.scm +++ b/gnu/packages/docbook.scm @@ -408,8 +408,6 @@ the in DocBook SGML DTDs.") texlive-latex-bookmark texlive-latex-changebar texlive-latex-colortbl - texlive-latex-eepic - texlive-latex-eso-pic texlive-latex-fancybox texlive-latex-fancyhdr texlive-latex-fancyvrb @@ -419,16 +417,13 @@ the in DocBook SGML DTDs.") texlive-latex-jknapltx texlive-latex-listings texlive-latex-multirow - texlive-latex-oberdiek texlive-latex-overpic texlive-latex-pdfpages texlive-latex-refcount texlive-latex-subfigure texlive-latex-titlesec - texlive-latex-url texlive-latex-wasysym - texlive-fonts-ec texlive-fonts-rsfs texlive-fonts-stmaryrd -- 2.31.1
guix-patches <at> gnu.org
:bug#48622
; Package guix-patches
.
(Mon, 24 May 2021 20:10:02 GMT) Full text and rfc822 format available.Message #95 received at 48622 <at> debbugs.gnu.org (full text, mbox):
From: Marius Bakke <marius <at> gnu.org> To: 48622 <at> debbugs.gnu.org Subject: [PATCH core-updates 30/29] gnu: Add texlive-tex-gyre. Date: Mon, 24 May 2021 22:09:16 +0200
* gnu/packages/tex.scm (texlive-tex-gyre): New public variable. --- gnu/packages/tex.scm | 40 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 40 insertions(+) diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm index ea89036e7f..85d8f0b732 100644 --- a/gnu/packages/tex.scm +++ b/gnu/packages/tex.scm @@ -942,6 +942,46 @@ font from Adobe's basic set.") ;; No license version specified. (license license:gpl3+))) +(define-public texlive-tex-gyre + (package + (inherit (simple-texlive-package + "texlive-tex-gyre" + '("/doc/fonts/tex-gyre/GUST-FONT-LICENSE.txt" + "/fonts/afm/public/tex-gyre/" + "/fonts/enc/dvips/tex-gyre/" + "/fonts/map/dvips/tex-gyre/" + "/fonts/opentype/public/tex-gyre/" + ;;"/fonts/opentype/public/tex-gyre-math/" + "/fonts/tfm/public/tex-gyre/" + "/fonts/type1/public/tex-gyre/" + "/tex/latex/tex-gyre/") + (base32 + "1ldnlmclghm3gnyv02r8a6cqybygz2ifq07mhykhf43h1pw3aq7k") + #:trivial? #t)) + (home-page "https://ctan.org/pkg/tex-gyre") + (synopsis "TeX fonts extending URW fonts") + (description + "The TeX-GYRE bundle consist of multiple font families: +@itemize @bullet +@item Adventor, based on the URW Gothic L family of fonts; +@item Bonum, based on the URW Bookman L family; +@item Chorus, based on URW Chancery L Medium Italic; +@item Cursor, based on URW Nimbus Mono L; +@item Heros, based on URW Nimbus Sans L; +@item Pagella, based on URW Palladio L; +@item Schola, based on the URW Century Schoolbook L family; +@item Termes, based on the URW Nimbus Roman No9 L family of fonts. +@end itemize + +The constituent standard faces of each family have been greatly extended +(though Chorus omits Greek support and has no small-caps family). Each +family is available in Adobe Type 1 and Open Type formats, and LaTeX +support (for use with a variety of encodings) is provided.") + ;; The GUST font license (GFL) is legally identical to the LaTeX Project + ;; Public License (LPPL), version 1.3c or later, but comes with an + ;; additional but not legally binding clause. + (license license:lppl1.3c+))) + (define-public texlive-lm (package (inherit (simple-texlive-package -- 2.31.1
guix-patches <at> gnu.org
:bug#48622
; Package guix-patches
.
(Mon, 24 May 2021 20:10:02 GMT) Full text and rfc822 format available.Message #98 received at 48622 <at> debbugs.gnu.org (full text, mbox):
From: Marius Bakke <marius <at> gnu.org> To: 48622 <at> debbugs.gnu.org Subject: [PATCH core-updates 31/29] gnu: Add texlive-latex-etoc. Date: Mon, 24 May 2021 22:09:17 +0200
* gnu/packages/tex.scm (texlive-latex-etoc): New public variable. --- gnu/packages/tex.scm | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm index 85d8f0b732..a6b905ff8c 100644 --- a/gnu/packages/tex.scm +++ b/gnu/packages/tex.scm @@ -4234,6 +4234,37 @@ for a variety of alignment purposes, as is evidenced by the examples in also provided.") (license license:lppl1.3+))) +(define-public texlive-latex-etoc + (package + (inherit (simple-texlive-package + "texlive-latex-etoc" + '("/doc/latex/etoc/README.md" + "/doc/latex/etoc/etoc.pdf" + "/tex/latex/etoc/") + (base32 + "0i4fgqzqajirjyih6gbx890l17y648mdfqm09v3iz4af0dz4mbdy") + #:trivial? #t)) + (home-page "https://www.ctan.org/pkg/etoc") + (synopsis "Completely customisable TOCs") + (description + "This package gives the user complete control of how the entries of +the table of contents should be constituted from the name, number, and page +number of each sectioning unit. The layout is controlled by the definition +of ‘line styles’ for each sectioning level used in the document. + +The package provides its own custom line styles (which may be used as +examples), and continues to support the standard formatting inherited from +the LaTeX document classes, but the package can also allow the user to +delegate the details to packages dealing with list making environments (such +as enumitem). The package’s default global style typesets tables of contents +in a multi-column format, with either a standard heading, or a ruled title +(optionally with a frame around the table). + +The @code{\\tableofcontents} command may be used arbitrarily many times in +the same document, while @code{\\localtableofcontents} provides a ‘local’ +table of contents.") + (license license:lppl1.3c+))) + (define-public texlive-latex-expdlist (package (name "texlive-latex-expdlist") -- 2.31.1
guix-patches <at> gnu.org
:bug#48622
; Package guix-patches
.
(Mon, 24 May 2021 20:10:03 GMT) Full text and rfc822 format available.Message #101 received at 48622 <at> debbugs.gnu.org (full text, mbox):
From: Marius Bakke <marius <at> gnu.org> To: 48622 <at> debbugs.gnu.org Subject: [PATCH core-updates 32/29] gnu: Add texlive-latex-hanging. Date: Mon, 24 May 2021 22:09:18 +0200
* gnu/packages/tex.scm (texlive-latex-hanging): New public variable. --- gnu/packages/tex.scm | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm index a6b905ff8c..e0e0220d87 100644 --- a/gnu/packages/tex.scm +++ b/gnu/packages/tex.scm @@ -4322,6 +4322,22 @@ but non-expandable ones.") (define-public texlive-latex-filemod (deprecated-package "texlive-latex-filemod" texlive-filemod)) +(define-public texlive-latex-hanging + (package + (inherit (simple-texlive-package + "texlive-latex-hanging" + '("/tex/latex/hanging/") + (base32 + "0s86yaxyfv9zxf4svwg9s13by9vrw38apfg0hsfchsimsdd6gsbb") + #:trivial? #t)) + (home-page "https://www.ctan.org/pkg/hanging") + (synopsis "Typeset hanging paragraphs") + (description + "The @code{hanging} package facilitates the typesetting of hanging +paragraphs. The package also enables typesetting with hanging punctuation, +by making punctuation characters active.") + (license license:lppl1.3c+))) + (define-public texlive-latex-ifplatform (package (name "texlive-latex-ifplatform") -- 2.31.1
guix-patches <at> gnu.org
:bug#48622
; Package guix-patches
.
(Mon, 24 May 2021 20:10:03 GMT) Full text and rfc822 format available.Message #104 received at 48622 <at> debbugs.gnu.org (full text, mbox):
From: Marius Bakke <marius <at> gnu.org> To: 48622 <at> debbugs.gnu.org Subject: [PATCH core-updates 33/29] gnu: Add texlive-latex-newunicodechar. Date: Mon, 24 May 2021 22:09:19 +0200
* gnu/packages/tex.scm (texlive-latex-newunicodechar): New public variable. --- gnu/packages/tex.scm | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm index e0e0220d87..e1636f972f 100644 --- a/gnu/packages/tex.scm +++ b/gnu/packages/tex.scm @@ -4387,6 +4387,22 @@ that are compatible with @code{natbib}: @code{plainnat}, @code{unsrtnat}, designed from the start to be compatible with @code{natbib}.") (license license:lppl))) +(define-public texlive-latex-newunicodechar + (package + (inherit (simple-texlive-package + "texlive-latex-newunicodechar" + '("/doc/latex/newunicodechar/" "/tex/latex/newunicodechar/") + (base32 + "0pwx3ylhvk5hxjnalas00grrbwla79j424i27hrm0zgflq7wsbrj") + #:trivial? #t)) + (home-page "https://www.ctan.org/pkg/newunicodechar") + (synopsis "Definitions of the meaning of Unicode characters") + (description + "This package provides a friendly interface for defining the meaning of +Unicode characters. The document should be processed by (pdf)LaTeX with the +Unicode option of @code{inputenc} or @code{inputenx}, or by XeLaTeX/LuaLaTeX.") + (license license:lppl1.3c+))) + (define-public texlive-latex-pdftexcmds (package (inherit (simple-texlive-package -- 2.31.1
guix-patches <at> gnu.org
:bug#48622
; Package guix-patches
.
(Mon, 24 May 2021 20:10:04 GMT) Full text and rfc822 format available.Message #107 received at 48622 <at> debbugs.gnu.org (full text, mbox):
From: Marius Bakke <marius <at> gnu.org> To: 48622 <at> debbugs.gnu.org Subject: [PATCH core-updates 34/29] gnu: Add texlive-latex-stackengine. Date: Mon, 24 May 2021 22:09:20 +0200
* gnu/packages/tex.scm (texlive-latex-stackengine): New public variable. --- gnu/packages/tex.scm | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm index e1636f972f..7db63f356a 100644 --- a/gnu/packages/tex.scm +++ b/gnu/packages/tex.scm @@ -4522,6 +4522,23 @@ recent classes such as powerdot or beamer, both of which are tuned to (define-public texlive-latex-seminar (deprecated-package "texlive-latex-seminar" texlive-seminar)) +(define-public texlive-latex-stackengine + (package + (inherit (simple-texlive-package + "texlive-latex-stackengine" + (list "/doc/latex/stackengine/" + "/tex/latex/stackengine/") + (base32 + "1rbw3dmb6kl3wlnpxacr8cmp2ivac1kpnb33k7r5s3lp1q59ck38") + #:trivial? #t)) + (home-page "https://www.ctan.org/pkg/stackengine") + (synopsis "Customised stacking of objects") + (description + "The package provides a versatile way to stack objects vertically in a +variety of customizable ways. A number of useful macros are provided, all +of which make use of the @code{stackengine} core.") + (license license:lppl1.3+))) + (define-public texlive-latex-trimspaces (package (name "texlive-latex-trimspaces") -- 2.31.1
guix-patches <at> gnu.org
:bug#48622
; Package guix-patches
.
(Mon, 24 May 2021 20:10:04 GMT) Full text and rfc822 format available.Message #110 received at 48622 <at> debbugs.gnu.org (full text, mbox):
From: Marius Bakke <marius <at> gnu.org> To: 48622 <at> debbugs.gnu.org Subject: [PATCH core-updates 35/29] gnu: Add texlive-latex-tocloft. Date: Mon, 24 May 2021 22:09:21 +0200
* gnu/packages/tex.scm (texlive-latex-tocloft): New public variable. --- gnu/packages/tex.scm | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm index 7db63f356a..f896725a82 100644 --- a/gnu/packages/tex.scm +++ b/gnu/packages/tex.scm @@ -4539,6 +4539,23 @@ variety of customizable ways. A number of useful macros are provided, all of which make use of the @code{stackengine} core.") (license license:lppl1.3+))) +(define-public texlive-latex-tocloft + (package + (inherit (simple-texlive-package + "texlive-latex-tocloft" + '("/doc/latex/tocloft/" "/tex/latex/tocloft/") + (base32 + "0mg3hpzq7wpm6mnnvb0rp3wby56zyxkyai8d2h3f4vk93zrc6awk") + #:trivial? #t)) + (home-page "https://www.ctan.org/pkg/tocloft") + (synopsis "Control table of contents") + (description + "This package provides control over the typography of the +@dfn{Table of Contents}, @dfn{List of Figures} and @dfn{List of Tables}, +and the ability to create new ‘List of ...’. The ToC @code{\\parskip} may +be changed. ") + (license license:lppl1.3c+))) + (define-public texlive-latex-trimspaces (package (name "texlive-latex-trimspaces") -- 2.31.1
guix-patches <at> gnu.org
:bug#48622
; Package guix-patches
.
(Mon, 24 May 2021 20:10:05 GMT) Full text and rfc822 format available.Message #113 received at 48622 <at> debbugs.gnu.org (full text, mbox):
From: Marius Bakke <marius <at> gnu.org> To: 48622 <at> debbugs.gnu.org Subject: [PATCH core-updates 36/29] gnu: texlive-latex-tools: Provide array-2016-10-06.sty. Date: Mon, 24 May 2021 22:09:22 +0200
* gnu/packages/tex.scm (texlive-latex-tools)[arguments]: Add phase that makes array.sty available with a different name. --- gnu/packages/tex.scm | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm index f896725a82..3cf4e0df23 100644 --- a/gnu/packages/tex.scm +++ b/gnu/packages/tex.scm @@ -3269,7 +3269,19 @@ files have changed. It is based on MD5 checksum, provided by pdfTeX.") (build-system texlive-build-system) (arguments '(#:tex-directory "latex/tools" - #:build-targets '("tools.ins"))) + #:build-targets '("tools.ins") + #:phases (modify-phases %standard-phases + (add-after 'install 'provide-array-2016-10-06.sty + (lambda* (#:key outputs #:allow-other-keys) + ;; XXX: array.sty does: + ;; "DeclareRelease{}{2016-10-06}{array-2016-10-06.sty}" + ;; ...which causes some users (hypre) to look for that + ;; file specifically. Provide it. + (with-directory-excursion (string-append + (assoc-ref outputs "out") + "/share/texmf-dist/tex" + "/latex/tools") + (symlink "array.sty" "array-2016-10-06.sty"))))))) (home-page "https://www.ctan.org/pkg/latex-tools") (synopsis "LaTeX standard tools bundle") (description -- 2.31.1
guix-patches <at> gnu.org
:bug#48622
; Package guix-patches
.
(Mon, 24 May 2021 20:10:05 GMT) Full text and rfc822 format available.Message #116 received at 48622 <at> debbugs.gnu.org (full text, mbox):
From: Marius Bakke <marius <at> gnu.org> To: 48622 <at> debbugs.gnu.org Subject: [PATCH core-updates 37/29] gnu: hypre: Update to 2020.0. Date: Mon, 24 May 2021 22:09:23 +0200
* gnu/packages/maths.scm (hypre): Update to 2020.0. [source](modules, snippet): Remove. [native-inputs]: Remove PERL, NETPBM and GHOSTSCRIPT. Add PYTHON, PYTHON-SPHINX and PYTHON-BREATHE. Add TEXLIVE-ADJUSTBOX, TEXLIVE-AMSFONTS, TEXLIVE-CAPTION, TEXLIVE-ETOOLBOX, TEXLIVE-JKNAPPEN, TEXLIVE-SECTSTY, TEXLIVE-TEX-GYRE, TEXLIVE-WASY, TEXLIVE-XCOLOR, TEXLIVE-GENERIC-LISTOFITEMS, TEXLIVE-GENERIC-ULEM, TEXLIVE-LATEX-CAPT-OF, TEXLIVE-LATEX-CMAP, TEXLIVE-LATEX-COLORTBL, TEXLIVE-LATEX-ETOC, TEXLIVE-LATEX-FANCYHDR, TEXLIVE-LATEX-FANCYVRB, TEXLIVE-LATEX-FLOAT, TEXLIVE-LATEX-FNCYCHAP, TEXLIVE-LATEX-FRAMED, TEXLIVE-LATEX-GEOMETRY, TEXLIVE-LATEX-HANGING, TEXLIVE-LATEX-MULTIROW, TEXLIVE-LATEX-NATBIB, TEXLIVE-LATEX-NEEDSPACE, TEXLIVE-LATEX-NEWUNICODECHAR, TEXLIVE-LATEX-PARSKIP, TEXLIVE-LATEX-STACKENGINE, TEXLIVE-LATEX-TABULARY, TEXLIVE-LATEX-TITLESEC, TEXLIVE-LATEX-TOCLOFT, TEXLIVE-LATEX-UPQUOTE, TEXLIVE-LATEX-VARWIDTH, TEXLIVE-LATEX-WASYSYM, and TEXLIVE-LATEX-WRAPFIG to TEXLIVE-UPDMAP.CFG. [arguments]: Adjust doc build target and installation phase. Remove trailing #t's. --- gnu/packages/maths.scm | 82 +++++++++++++++++++++++++++--------------- 1 file changed, 54 insertions(+), 28 deletions(-) diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index dff5180ae9..d7ba5fca0a 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -26,7 +26,7 @@ ;;; Copyright © 2018 Joshua Sierles, Nextjournal <joshua <at> nextjournal.com> ;;; Copyright © 2018 Nadya Voronova <voronovank <at> gmail.com> ;;; Copyright © 2018 Adam Massmann <massmannak <at> gmail.com> -;;; Copyright © 2018, 2020 Marius Bakke <mbakke <at> fastmail.com> +;;; Copyright © 2018, 2020, 2021 Marius Bakke <marius <at> gnu.org> ;;; Copyright © 2018 Eric Brown <brown <at> fastmail.com> ;;; Copyright © 2018 Julien Lepiller <julien <at> lepiller.eu> ;;; Copyright © 2018 Amin Bandali <bandali <at> gnu.org> @@ -135,6 +135,7 @@ #:use-module (gnu packages tbb) #:use-module (gnu packages scheme) #:use-module (gnu packages shells) + #:use-module (gnu packages sphinx) #:use-module (gnu packages tcl) #:use-module (gnu packages texinfo) #:use-module (gnu packages tex) @@ -4611,7 +4612,7 @@ set.") (define-public hypre (package (name "hypre") - (version "2.15.1") + (version "2.20.0") (source (origin (method git-fetch) @@ -4620,28 +4621,55 @@ set.") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "1lvh4ybqkriyqfg2zmic6mrg1981qv1i9vry1fdgsabn81hb71g4")) - (modules '((guix build utils))) - (snippet - '(begin - ;; Remove use of __DATE__ and __TIME__ for reproducibility; - ;; substitute the release date. - (substitute* "src/utilities/HYPRE_utilities.h" - (("Date Compiled: .*$") - "Date Compiled: Oct 19 2018 15:23:00 +0000\"\n")) - #t)))) + (base32 "14iqjwg5sv1qjn7c2cfv0xxmn9rwamjrhh9hgs8fjbywcbvrkjdi")))) (build-system gnu-build-system) - (outputs '("out" ; 6.1 MiB of headers and libraries - "doc")) ; 4.8 MiB of documentation + (outputs '("out" ;5.3 MiB of headers and libraries + "doc")) ;12 MiB of documentation (native-inputs `(("doc++" ,doc++) - ("netpbm" ,netpbm) - ("perl" ,perl) ; needed to run 'ppmquant' during tests - ("texlive" ,(texlive-updmap.cfg (list texlive-xypic - texlive-cm - texlive-latex-hyperref - texlive-bibtex))) - ("ghostscript" ,ghostscript))) + ("doxygen" ,doxygen) + ("python" ,python) + ("python-breathe" ,python-breathe) + ("python-sphinx" ,python-sphinx) + ("texlive" ,(texlive-updmap.cfg (list texlive-adjustbox + texlive-amsfonts + texlive-bibtex + texlive-caption + texlive-cm + texlive-etoolbox + texlive-jknappen + texlive-sectsty + texlive-tex-gyre + texlive-wasy + texlive-xcolor + texlive-xypic + texlive-generic-listofitems + texlive-generic-ulem + texlive-latex-capt-of + texlive-latex-cmap + texlive-latex-colortbl + texlive-latex-etoc + texlive-latex-fancyhdr + texlive-latex-fancyvrb + texlive-latex-float + texlive-latex-fncychap + texlive-latex-framed + texlive-latex-geometry + texlive-latex-hanging + texlive-latex-hyperref + texlive-latex-multirow + texlive-latex-natbib + texlive-latex-needspace + texlive-latex-newunicodechar + texlive-latex-parskip + texlive-latex-stackengine + texlive-latex-tabulary + texlive-latex-titlesec + texlive-latex-tocloft + texlive-latex-upquote + texlive-latex-varwidth + texlive-latex-wasysym + texlive-latex-wrapfig))))) (inputs `(("blas" ,openblas) ("lapack" ,lapack))) @@ -4671,7 +4699,7 @@ set.") configure-flags))))))) (add-after 'build 'build-docs (lambda _ - (invoke "make" "-Cdocs" "pdf" "html"))) + (invoke "make" "-C" "docs"))) (replace 'check (lambda _ (setenv "LD_LIBRARY_PATH" (string-append (getcwd) "/hypre/lib")) @@ -4682,8 +4710,7 @@ set.") (when (positive? size) (error (format #f "~a size ~d; error indication~%" filename size))))) - (find-files "test" ".*\\.err$")) - #t)) + (find-files "test" ".*\\.err$")))) (add-after 'install 'install-docs (lambda* (#:key outputs #:allow-other-keys) ;; Custom install because docs/Makefile doesn't honor ${docdir}. @@ -4692,10 +4719,9 @@ set.") (with-directory-excursion "docs" (for-each (lambda (base) (install-file (string-append base ".pdf") docdir) - (copy-recursively base docdir)) ; html docs - '("HYPRE_usr_manual" - "HYPRE_ref_manual"))) - #t)))))) + (copy-recursively (string-append base "-html") + (string-append docdir "/" base))) + '("usr-manual" "ref-manual"))))))))) (home-page "http://www.llnl.gov/casc/hypre/") (synopsis "Library of solvers and preconditioners for linear equations") (description -- 2.31.1
guix-patches <at> gnu.org
:bug#48622
; Package guix-patches
.
(Mon, 24 May 2021 20:14:01 GMT) Full text and rfc822 format available.Message #119 received at 48622 <at> debbugs.gnu.org (full text, mbox):
From: Marius Bakke <marius <at> gnu.org> To: 48622 <at> debbugs.gnu.org Subject: Re: [bug#48622] [PATCH core-updates 00/29] TeX Live 2020 Date: Mon, 24 May 2021 22:13:03 +0200
[Message part 1 (text/plain, inline)]
Marius Bakke <marius <at> gnu.org> skriver: > I haven't been able to test all the TeX users, as some are failing to > build on the 'core-updates' branch. But of those that do build, there > is only a single regression from 'master' (hypre). I sent a followup series that fixes HYPRE by updating and providing some new TeX Live inputs (it also needs 9b4f9039e8 from 'master'). Marius Bakke (8): gnu: Add texlive-tex-gyre. gnu: Add texlive-latex-etoc. gnu: Add texlive-latex-hanging. gnu: Add texlive-latex-newunicodechar. gnu: Add texlive-latex-stackengine. gnu: Add texlive-latex-tocloft. gnu: texlive-latex-tools: Provide array-2016-10-06.sty. gnu: hypre: Update to 2020.0. gnu/packages/maths.scm | 82 ++++++++++++++-------- gnu/packages/tex.scm | 151 ++++++++++++++++++++++++++++++++++++++++- 2 files changed, 204 insertions(+), 29 deletions(-)
[signature.asc (application/pgp-signature, inline)]
Marius Bakke <marius <at> gnu.org>
:Marius Bakke <marius <at> gnu.org>
:Message #124 received at 48622-done <at> debbugs.gnu.org (full text, mbox):
From: Marius Bakke <marius <at> gnu.org> To: 48622-done <at> debbugs.gnu.org Subject: Re: [bug#48622] [PATCH core-updates 00/29] TeX Live 2020 Date: Sun, 06 Jun 2021 00:26:04 +0200
[Message part 1 (text/plain, inline)]
Marius Bakke <marius <at> gnu.org> skriver: > Here it comes... The much rumored TeX Live 2020 update! And final > GCC 10 blocker. Pushed as 683eb7c5b1..f72a1253a1 ! For those following along at home, 7a06061662 (gnu: texlive-base: Propagate texlive-kpathsea.) does not look correct to me, but let's address that separately. Patches that switch to GCC 10 will follow shortly.
[signature.asc (application/pgp-signature, inline)]
Debbugs Internal Request <help-debbugs <at> gnu.org>
to internal_control <at> debbugs.gnu.org
.
(Sun, 04 Jul 2021 11:24:06 GMT) Full text and rfc822 format available.
GNU bug tracking system
Copyright (C) 1999 Darren O. Benham,
1997,2003 nCipher Corporation Ltd,
1994-97 Ian Jackson.