[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
01/01: Merge branch 'master' into staging
|
From: |
guix-commits |
|
Subject: |
01/01: Merge branch 'master' into staging |
|
Date: |
Mon, 16 May 2022 05:30:55 -0400 (EDT) |
efraim pushed a commit to branch staging
in repository guix.
commit e5e0e283ffd92f153303401c39dfcc1d8dde4f96
Merge: 7c204281ff 40a729a0e6
Author: Efraim Flashner <efraim@flashner.co.il>
AuthorDate: Mon May 16 10:55:46 2022 +0300
Merge branch 'master' into staging
doc/guix.texi | 372 +-
.../text-mode/guix-commit-message-remove-package | 13 +
gnu/local.mk | 10 +-
gnu/packages/admin.scm | 32 +-
gnu/packages/agda.scm | 39 +-
gnu/packages/android.scm | 22 +-
gnu/packages/benchmark.scm | 24 +-
gnu/packages/bioinformatics.scm | 5 +-
gnu/packages/c.scm | 32 +
gnu/packages/check.scm | 312 +-
gnu/packages/chez.scm | 426 ++-
gnu/packages/chromium.scm | 6 +-
gnu/packages/ci.scm | 8 +-
gnu/packages/cmake.scm | 12 +-
gnu/packages/commencement.scm | 1 -
gnu/packages/crates-io.scm | 140 +-
gnu/packages/crypto.scm | 28 +-
gnu/packages/curl.scm | 12 +-
gnu/packages/databases.scm | 165 +-
gnu/packages/diffoscope.scm | 11 +-
gnu/packages/disk.scm | 33 +-
gnu/packages/documentation.scm | 57 +
gnu/packages/emacs-xyz.scm | 18 +-
gnu/packages/emacs.scm | 463 ++-
gnu/packages/embedded.scm | 10 +-
gnu/packages/engineering.scm | 5 +-
gnu/packages/file-systems.scm | 4 +-
gnu/packages/fonts.scm | 97 +-
gnu/packages/fontutils.scm | 767 ++++-
gnu/packages/gnome-xyz.scm | 2 +
gnu/packages/gnome.scm | 7 +-
gnu/packages/graphics.scm | 135 +
gnu/packages/guile-xyz.scm | 52 +-
gnu/packages/haskell-apps.scm | 15 +-
gnu/packages/java.scm | 55 +-
gnu/packages/javascript.scm | 33 +-
gnu/packages/jupyter.scm | 329 +-
gnu/packages/linux.scm | 72 +-
gnu/packages/llvm.scm | 6 +-
gnu/packages/machine-learning.scm | 77 +-
gnu/packages/mail.scm | 10 +-
gnu/packages/markup.scm | 4 +-
gnu/packages/matrix.scm | 2 +-
gnu/packages/mpd.scm | 4 +-
gnu/packages/ncdu.scm | 4 +-
gnu/packages/package-management.scm | 60 +-
gnu/packages/parallel.scm | 4 +-
gnu/packages/patches/emacs-exec-path.patch | 12 +-
.../patches/emacs-ignore-empty-xim-styles.patch | 24 -
.../patches/emacs-yasnippet-fix-tests.patch | 95 +
gnu/packages/patches/isc-dhcp-gcc-compat.patch | 72 -
.../libxmlb-install-xb-tool-into-bindir.patch | 100 +
.../patches/python-debugpy-unbundle-pydevd.patch | 254 ++
.../python-ipython-documentation-chars.patch | 18 +
.../python-ipython-documentation-repro.patch | 25 +
.../patches/python-mypy-use-sys-path.patch | 130 +
.../patches/racket-enable-scheme-backport.patch | 465 ---
.../racket-gui-tethered-launcher-backport.patch | 26 -
gnu/packages/pdf.scm | 216 +-
gnu/packages/python-build.scm | 8 +-
gnu/packages/python-check.scm | 164 +-
gnu/packages/python-crypto.scm | 30 +-
gnu/packages/python-science.scm | 172 +-
gnu/packages/python-web.scm | 601 +++-
gnu/packages/python-xyz.scm | 3562 +++++++++++++-------
gnu/packages/qt.scm | 7 +-
gnu/packages/racket.scm | 107 +-
gnu/packages/rdf.scm | 13 +-
gnu/packages/ruby.scm | 385 +++
gnu/packages/shells.scm | 22 +-
gnu/packages/sphinx.scm | 302 +-
gnu/packages/syncthing.scm | 4 +-
gnu/packages/terminals.scm | 42 +-
gnu/packages/tex.scm | 744 +++-
gnu/packages/time.scm | 39 +-
gnu/packages/tls.scm | 15 +-
gnu/packages/version-control.scm | 77 +-
gnu/packages/video.scm | 4 +-
gnu/packages/vpn.scm | 20 +-
gnu/packages/web.scm | 96 +-
gnu/packages/xml.scm | 34 +-
gnu/packages/xorg.scm | 7 +-
guix/download.scm | 5 +
guix/search-paths.scm | 26 +
84 files changed, 8556 insertions(+), 3362 deletions(-)
diff --cc gnu/packages/python-xyz.scm
index f6c4ca076f,199fcf5fb8..bdd9810aa5
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@@ -13036,37 -13826,39 +13831,39 @@@ time."
;; Required, even if [serve] is not used.
python-tornado-6
;; Required at runtime for `jupyter nbconvert --to=pdf`.
- (texlive-updmap.cfg (list texlive-adjustbox
- texlive-amsfonts
- texlive-booktabs
- texlive-caption
- texlive-enumitem
+ texlive-adjustbox
+ texlive-booktabs
+ texlive-caption
+ texlive-enumitem
+ texlive-fontspec
+ texlive-generic-iftex
+ texlive-grffile
+ texlive-hyperref
+ texlive-latex-fancyvrb
+ texlive-latex-float
+ texlive-latex-geometry
+ texlive-latex-jknapltx
+ texlive-latex-ms
+ texlive-latex-parskip
+ texlive-latex-trimspaces
+ texlive-latex-upquote
+ texlive-stringenc
+ texlive-tcolorbox
+ texlive-titling
+ texlive-tools
+ texlive-ulem
+ texlive-unicode-math
+ texlive-xcolor
+ (texlive-updmap.cfg (list texlive-amsfonts
++ texlive-amsmath
texlive-eurosym
texlive-fonts-rsfs
- texlive-generic-iftex
texlive-jknappen
- texlive-amsmath
- texlive-latex-fancyvrb
- texlive-latex-float
- texlive-fontspec
- texlive-latex-geometry
- texlive-grffile
- texlive-hyperref
- texlive-latex-jknapltx
- texlive-latex-ms
- texlive-oberdiek
- texlive-latex-parskip
- texlive-latex-trimspaces
- texlive-latex-upquote
- texlive-latex-amsmath
texlive-latex-ucs
texlive-lm
+ texlive-lm-math
texlive-mathpazo
- texlive-stringenc
- texlive-tcolorbox
- texlive-titling
- texlive-tools
- texlive-ulem
- texlive-xcolor
+ texlive-oberdiek
texlive-zapfding))))
(home-page "https://jupyter.org";)
(synopsis "Converting Jupyter Notebooks")
diff --cc gnu/packages/tex.scm
index b214344667,818316a4e5..de5d5f925b
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@@ -3905,8 -4213,90 +4062,67 @@@ what has to be done for each language
polyglossia package rather than Babel.")
(license license:lppl1.3+))))
-(define-public texlive-babel/fixed
- (package
- (inherit texlive-babel)
- (name "texlive-babel-fixed")
- (arguments
- (substitute-keyword-arguments (package-arguments texlive-babel)
- ((#:phases phases)
- `(modify-phases ,phases
- (add-before 'copy-files 'unchdir
- (lambda _
- (chdir "../../..")))
- (add-after 'copy-files 'delete-extra-files
- (lambda* (#:key outputs #:allow-other-keys)
- (delete-file-recursively
- (string-append (assoc-ref outputs "out")
- "/share/texmf-dist/source/latex/babel/build"))
- (delete-file
- (string-append (assoc-ref outputs "out")
-
"/share/texmf-dist/tex/generic/babel/bbind.ist"))
- (delete-file
- (string-append (assoc-ref outputs "out")
-
"/share/texmf-dist/tex/generic/babel/bbglo.ist"))))))))))
-
(define-deprecated-package texlive-latex-babel texlive-babel)
+ (define-public texlive-cs
+ (package
+ (inherit (simple-texlive-package
+ "texlive-cs"
+ (list
+ "fonts/enc/dvips/cs/"
+ "fonts/map/dvips/cs/"
+ "fonts/source/public/cs/"
+ ;; TODO: Remove these pre-built files after the manual
+ ;; build below is fixed.
+ ;; The font fails to build from the Metafont sources, with
+ ;; errors such as:
+ ;; This is METAFONT, Version 2.71828182 (TeX Live 2021/GNU
Guix) [...]
+ ;; (./csaccent.mf
+ ;; >> cap_curve#-dot_size#
+ ;; ! Unknown relation will be considered false.
+ ;; <to be read again>
+ "fonts/tfm/cs/cs-a35/"
+ "fonts/tfm/cs/cs-charter/"
+ "fonts/tfm/public/cs/"
+ "fonts/type1/public/cs/"
+ "fonts/vf/cs/cs-a35/")
+ (base32 "1ww5lrqja051fh0ygmfdyy5a6bhwq9k5zv857vwiqf5syvw5djps")
+ #:trivial? #t))
+ (home-page "http://petr.olsak.net/cstex/";)
+ (synopsis "Czech/Slovak-tuned Computer Modern fonts")
+ (description "This package provides Czech/Slovak-tuned Computer Modern
+ fonts in the Metafont format; Type 1 format versions (csfonts-t1) are also
+ available.")
+ (license license:gpl2+))) ;see fonts/source/public/cs/cscode.mf
+
+ ;;; Note: if this package is modified, its name must be changed to comply with
+ ;;; its license.
+ (define-public texlive-csplain
+ (package
+ (inherit (simple-texlive-package
+ "texlive-csplain"
+ (list "tex/csplain/base/")
+ (base32 "0cgrwc8lgf2x2hq6bb4kqxw597card985zdd9ipn7k98mmwrxhz3")
+ #:trivial? #t))
+ (home-page "http://petr.olsak.net/csplain-e.html";)
+ (synopsis "Plain TeX multilanguage support")
+ (description "CSplain is a small extension of basic Plain TeX macros from
+ which the formats @code{csplain} and @code{pdfcsplain} can be generated. It
+ supports: hyphenation of words for 50+ languages, simple and powerful font
+ loading system (various sizes of fonts), TeX, pdfTeX, XeTeX and LuaTeX
+ engines, math fonts simply loaded with full amstex-like features, three
+ internal encodings (IL2 for Czech/Slovak languages, T1 for many languages with
+ latin alphabet and Unicode in new TeX engines), natural UTF-8 input in pdfTeX
+ using encTeX without any active characters, Czech and Slovak special
+ typesetting features. An important part of the package is OPmac, which
+ implements most of LaTeX's features (sectioning, font selection, color, hyper
+ reference and URLs, bibliography, index, table of contents, tables, etc.) by
+ Plain TeX macros. The OPmac macros can generate a bibliography without any
+ external program.")
+ ;; This custom permissive license includes as a redistribution condition
+ ;; that says the package must be renamed from 'csplain' if it is modified.
+ (license (license:non-copyleft "file:///tex/csplain/base/csplain.ini"))))
+
(define-public texlive-generic-babel-english
(package
(name "texlive-generic-babel-english")