[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
01/01: Merge remote-tracking branch 'origin/master' into core-updates
|
From: |
guix-commits |
|
Subject: |
01/01: Merge remote-tracking branch 'origin/master' into core-updates |
|
Date: |
Mon, 20 Mar 2023 13:50:14 -0400 (EDT) |
andreas pushed a commit to branch core-updates
in repository guix.
commit ccb62d8feb50e2859d7c41429a9e3d9e0fe30bfe
Merge: 098bd280f8 f80215c7c4
Author: Andreas Enge <andreas@enge.fr>
AuthorDate: Mon Mar 20 18:21:47 2023 +0100
Merge remote-tracking branch 'origin/master' into core-updates
.dir-locals.el | 4 +-
Makefile.am | 4 +
doc/contributing.texi | 12 +-
doc/guix.texi | 1787 +-
etc/news.scm | 16 +
etc/snippets/tempel/scheme-mode | 8 +-
etc/teams.scm.in | 14 +-
gnu/build/file-systems.scm | 1 +
gnu/home.scm | 17 +-
gnu/home/services/desktop.scm | 110 +-
gnu/home/services/media.scm | 68 +
gnu/home/services/messaging.scm | 66 +
gnu/home/services/sound.scm | 151 +
gnu/home/services/ssh.scm | 58 +-
gnu/local.mk | 36 +-
gnu/packages/abiword.scm | 64 +-
gnu/packages/admin.scm | 9 +-
gnu/packages/algebra.scm | 134 +-
gnu/packages/astronomy.scm | 175 +-
gnu/packages/audio.scm | 111 +
gnu/packages/aux-files/linux-libre/6.2-arm.conf | 10724 ++++++
gnu/packages/aux-files/linux-libre/6.2-arm64.conf | 11276 ++++++
gnu/packages/aux-files/linux-libre/6.2-i686.conf | 11602 ++++++
gnu/packages/aux-files/linux-libre/6.2-x86_64.conf | 11764 +++++++
gnu/packages/backup.scm | 4 +-
gnu/packages/bioconductor.scm | 375 +-
gnu/packages/bioinformatics.scm | 484 +-
gnu/packages/bittorrent.scm | 4 +-
gnu/packages/bootloaders.scm | 52 +-
gnu/packages/bqn.scm | 7 +-
gnu/packages/build-tools.scm | 21 +-
gnu/packages/check.scm | 19 -
gnu/packages/commencement.scm | 1 +
gnu/packages/cran.scm | 1154 +-
gnu/packages/crates-io.scm | 124 +-
gnu/packages/cross-base.scm | 52 +-
gnu/packages/databases.scm | 247 +-
gnu/packages/dav.scm | 6 +-
gnu/packages/diffoscope.scm | 14 +-
gnu/packages/django.scm | 6 +-
gnu/packages/emacs-xyz.scm | 797 +-
gnu/packages/emacs.scm | 65 +-
gnu/packages/emulators.scm | 20 +-
gnu/packages/engineering.scm | 365 +-
gnu/packages/finance.scm | 15 +-
gnu/packages/firmware.scm | 13 +-
gnu/packages/fonts.scm | 54 +-
gnu/packages/freedesktop.scm | 159 +-
gnu/packages/game-development.scm | 5 +-
gnu/packages/games.scm | 235 +-
gnu/packages/gettext.scm | 1 -
gnu/packages/gimp.scm | 4 +-
gnu/packages/gnome.scm | 98 +-
gnu/packages/gnunet.scm | 6 +-
gnu/packages/gnuzilla.scm | 115 +-
gnu/packages/golang.scm | 22 +-
gnu/packages/gps.scm | 6 +-
gnu/packages/graph.scm | 38 +-
gnu/packages/gstreamer.scm | 75 +-
gnu/packages/gtk.scm | 5 +-
gnu/packages/guile-xyz.scm | 88 +-
gnu/packages/haskell-apps.scm | 4 +-
gnu/packages/hunspell.scm | 2 +-
gnu/packages/hurd.scm | 30 +-
gnu/packages/image-processing.scm | 36 +-
gnu/packages/image.scm | 35 +-
gnu/packages/java.scm | 53 +-
gnu/packages/julia-xyz.scm | 366 +
gnu/packages/kde-multimedia.scm | 4 +-
gnu/packages/kde.scm | 6 +-
gnu/packages/libevent.scm | 16 +
gnu/packages/libreoffice.scm | 29 +-
gnu/packages/linux.scm | 361 +-
gnu/packages/lisp-check.scm | 6 +-
gnu/packages/lisp-xyz.scm | 772 +-
gnu/packages/lisp.scm | 235 +-
gnu/packages/machine-learning.scm | 42 +
gnu/packages/markup.scm | 2 +-
gnu/packages/mastodon.scm | 6 +-
gnu/packages/mate.scm | 17 +
gnu/packages/maths.scm | 291 +-
gnu/packages/messaging.scm | 19 +-
gnu/packages/music.scm | 8 +-
gnu/packages/networking.scm | 128 +-
gnu/packages/ocaml.scm | 19 +-
gnu/packages/ocr.scm | 31 +-
gnu/packages/openpgp.scm | 65 +-
gnu/packages/package-management.scm | 22 +-
.../patches/boolector-find-googletest.patch | 204 +
.../patches/ccextractor-add-missing-header.patch | 33 +
.../patches/ccextractor-autoconf-tesseract.patch | 37 +
gnu/packages/patches/ccextractor-fix-ocr.patch | 29 +
.../patches/efibootmgr-remove-extra-decl.patch | 27 -
.../patches/emacs-helpful-fix-docstring-test.patch | 18 -
.../patches/evdi-fix-build-with-linux-6.2.patch | 72 +
.../flatpak-unset-gdk-pixbuf-for-sandbox.patch | 8 +-
.../patches/fluxbox-1.3.7-no-dynamic-cursor.patch | 163 +
.../patches/ipxe-reproducible-geniso.patch | 77 -
...17n-lib-1.8.0-use-pkg-config-for-freetype.patch | 125 +
.../patches/openbios-aarch64-riscv64-support.patch | 17 +
.../openjdk-10-hotspot-pointer-comparison.patch | 15 -
.../patches/openjdk-10-hotspot-stack-size.patch | 28 -
.../openjdk-9-hotspot-pointer-comparison.patch | 27 -
.../patches/openjdk-9-hotspot-stack-size.patch | 28 -
.../patches/python-hiredis-fix-header.patch | 49 +
.../python-hiredis-use-system-hiredis.patch | 82 +
.../patches/python-pillow-CVE-2022-45199.patch | 36 +
.../patches/retroarch-LIBRETRO_DIRECTORY.patch | 36 -
.../patches/rng-tools-revert-build-randstat.patch | 49 +
gnu/packages/patches/rnp-add-version.cmake.patch | 169 -
.../patches/rnp-disable-ruby-rnp-tests.patch | 26 -
gnu/packages/patches/rnp-unbundle-googletest.patch | 43 -
.../sbcl-eazy-gnuplot-skip-path-check.patch | 14 +
.../virtuoso-ose-remove-pre-built-jar-files.patch | 42 +-
.../widelands-add-missing-map-include.patch | 28 -
.../patches/widelands-system-wide_minizip.patch | 141 -
gnu/packages/patchutils.scm | 104 +-
gnu/packages/pdf.scm | 55 +
gnu/packages/perl.scm | 63 +-
gnu/packages/photo.scm | 2 +-
gnu/packages/php.scm | 2 +-
gnu/packages/pkg-config.scm | 5 +-
gnu/packages/prolog.scm | 4 +-
gnu/packages/pulseaudio.scm | 2 +-
gnu/packages/pumpio.scm | 6 +-
gnu/packages/python-web.scm | 180 +-
gnu/packages/python-xyz.scm | 197 +-
gnu/packages/qt.scm | 99 +-
gnu/packages/ruby.scm | 114 +-
gnu/packages/scheme.scm | 10 +-
gnu/packages/serialization.scm | 14 +
gnu/packages/shells.scm | 11 +-
gnu/packages/skribilo.scm | 5 +-
gnu/packages/sphinx.scm | 1 -
gnu/packages/statistics.scm | 162 +-
gnu/packages/suckless.scm | 140 +
gnu/packages/sugar.scm | 326 +-
gnu/packages/tex.scm | 44 +
gnu/packages/text-editors.scm | 4 +-
gnu/packages/tls.scm | 14 +-
gnu/packages/version-control.scm | 115 +-
gnu/packages/video.scm | 4 +-
gnu/packages/virtualization.scm | 4 +-
gnu/packages/web-browsers.scm | 8 +-
gnu/packages/web.scm | 210 +-
gnu/packages/wm.scm | 122 +-
gnu/packages/xdisorg.scm | 100 +-
gnu/packages/xfce.scm | 17 -
gnu/packages/zig.scm | 3 +
gnu/services.scm | 6 +-
gnu/services/base.scm | 116 +-
gnu/services/dbus.scm | 11 +-
gnu/services/desktop.scm | 112 +-
gnu/services/dict.scm | 6 +-
gnu/services/dns.scm | 128 +-
gnu/services/lirc.scm | 18 +-
gnu/services/mail.scm | 9 +-
gnu/services/networking.scm | 139 +-
gnu/services/sound.scm | 16 +-
gnu/services/spice.scm | 7 +-
gnu/services/ssh.scm | 74 +-
gnu/services/vpn.scm | 19 +-
gnu/services/xorg.scm | 47 +-
gnu/system.scm | 28 +-
gnu/system/examples/beaglebone-black.tmpl | 14 +-
gnu/system/file-systems.scm | 71 +-
gnu/system/hurd.scm | 2 +-
gnu/system/install.scm | 25 +-
gnu/system/shadow.scm | 17 +-
gnu/tests/base.scm | 2 +-
gnu/tests/docker.scm | 4 +-
gnu/tests/lightdm.scm | 6 +-
gnu/tests/mail.scm | 20 +-
gnu/tests/virtualization.scm | 4 +-
guix/android-repo-download.scm | 9 +-
guix/base32.scm | 1 -
guix/build-system/android-ndk.scm | 2 -
guix/build-system/ant.scm | 2 -
guix/build-system/asdf.scm | 2 -
guix/build-system/chicken.scm | 1 -
guix/build-system/clojure.scm | 2 -
guix/build-system/cmake.scm | 2 -
guix/build-system/copy.scm | 1 -
guix/build-system/dub.scm | 2 -
guix/build-system/dune.scm | 2 -
guix/build-system/emacs.scm | 2 -
guix/build-system/font.scm | 1 -
guix/build-system/glib-or-gtk.scm | 2 -
guix/build-system/gnu.scm | 1 -
guix/build-system/guile.scm | 3 +-
guix/build-system/haskell.scm | 1 -
guix/build-system/julia.scm | 2 -
guix/build-system/maven.scm | 1 -
guix/build-system/meson.scm | 1 -
guix/build-system/minify.scm | 2 -
guix/build-system/node.scm | 1 -
guix/build-system/ocaml.scm | 1 -
guix/build-system/perl.scm | 2 -
guix/build-system/pyproject.scm | 4 -
guix/build-system/python.scm | 3 -
guix/build-system/qt.scm | 1 -
guix/build-system/r.scm | 1 -
guix/build-system/rakudo.scm | 1 -
guix/build-system/rebar.scm | 2 -
guix/build-system/renpy.scm | 3 -
guix/build-system/ruby.scm | 2 -
guix/build-system/scons.scm | 1 -
guix/build-system/texlive.scm | 1 -
guix/build-system/trivial.scm | 2 -
guix/build-system/waf.scm | 3 -
guix/build/android-ndk-build-system.scm | 5 -
guix/build/chicken-build-system.scm | 1 -
guix/build/clojure-utils.scm | 1 -
guix/build/download-nar.scm | 74 +-
guix/build/gnu-dist.scm | 5 +-
guix/build/linux-module-build-system.scm | 4 -
guix/build/svn.scm | 1 -
guix/channels.scm | 4 -
guix/cvs-download.scm | 6 +-
guix/derivations.scm | 2 -
guix/discovery.scm | 1 -
guix/ftp-client.scm | 2 -
guix/git-authenticate.scm | 1 -
guix/git-download.scm | 49 +-
guix/git.scm | 2 -
guix/gnu-maintenance.scm | 3 -
guix/graph.scm | 1 -
guix/hg-download.scm | 7 +-
guix/import/cabal.scm | 1 -
guix/import/cpan.scm | 2 +-
guix/import/cran.scm | 4 -
guix/import/crate.scm | 3 -
guix/import/egg.scm | 4 -
guix/import/elm.scm | 11 -
guix/import/elpa.scm | 5 +-
guix/import/gem.scm | 1 -
guix/import/git.scm | 5 +-
guix/import/github.scm | 2 -
guix/import/gnome.scm | 2 -
guix/import/gnu.scm | 3 -
guix/import/go.scm | 8 -
guix/import/hexpm.scm | 9 -
guix/import/kde.scm | 1 -
guix/import/minetest.scm | 7 -
guix/import/opam.scm | 7 +-
guix/import/print.scm | 3 +-
guix/import/pypi.scm | 3 -
guix/import/test.scm | 2 -
guix/import/texlive.scm | 3 -
guix/import/utils.scm | 3 +-
guix/ipfs.scm | 5 -
guix/licenses.scm | 6 +
guix/lint.scm | 4 +-
guix/packages.scm | 24 +-
guix/pki.scm | 1 -
guix/read-print.scm | 34 +-
guix/records.scm | 1 -
guix/remote.scm | 2 -
guix/scripts.scm | 1 -
guix/scripts/archive.scm | 1 -
guix/scripts/build.scm | 3 -
guix/scripts/challenge.scm | 1 -
guix/scripts/deploy.scm | 1 -
guix/scripts/discover.scm | 1 -
guix/scripts/download.scm | 3 -
guix/scripts/edit.scm | 3 +-
guix/scripts/environment.scm | 24 +-
guix/scripts/graph.scm | 1 -
guix/scripts/hash.scm | 4 -
guix/scripts/home.scm | 2 -
guix/scripts/import.scm | 3 -
guix/scripts/offload.scm | 1 -
guix/scripts/pack.scm | 12 +-
guix/scripts/package.scm | 3 -
guix/scripts/publish.scm | 4 -
guix/scripts/pull.scm | 2 -
guix/scripts/refresh.scm | 3 -
guix/scripts/repl.scm | 2 -
guix/scripts/search.scm | 1 -
guix/scripts/show.scm | 1 -
guix/scripts/style.scm | 2 -
guix/scripts/substitute.scm | 4 -
guix/scripts/system.scm | 7 -
guix/scripts/time-machine.scm | 1 -
guix/search-paths.scm | 8 +
guix/self.scm | 1 -
guix/serialization.scm | 1 -
guix/status.scm | 1 -
guix/store.scm | 2 -
guix/store/database.scm | 2 -
guix/store/deduplication.scm | 2 -
guix/substitutes.scm | 9 -
guix/tests/gnupg.scm | 1 -
guix/tests/http.scm | 1 -
guix/ui.scm | 2 +-
guix/upstream.scm | 1 -
guix/utils.scm | 3 -
m4/guix.m4 | 2 +
po/doc/guix-cookbook.de.po | 2340 +-
po/doc/guix-cookbook.fr.po | 2331 +-
po/doc/guix-cookbook.ko.po | 2268 +-
po/doc/guix-cookbook.sk.po | 3578 +-
po/doc/guix-manual.de.po | 35186 +++++++++---------
po/doc/guix-manual.es.po | 35189 ++++++++++---------
po/doc/guix-manual.fr.po | 34890 +++++++++---------
po/doc/guix-manual.pt_BR.po | 33468 +++++++++---------
po/doc/guix-manual.ru.po | 34452 +++++++++---------
po/doc/guix-manual.zh_CN.po | 33313 +++++++++---------
po/guix/POTFILES.in | 2 +
po/guix/de.po | 8 +-
po/guix/it.po | 45 +-
po/guix/ja.po | 324 +-
po/guix/ka.po | 35 +-
po/guix/oc.po | 68 +-
po/guix/pt_BR.po | 60 +-
po/guix/ru.po | 14 +-
po/guix/sk.po | 461 +-
po/guix/zh_CN.po | 46 +-
po/packages/da.po | 11240 +++---
po/packages/de.po | 11169 +++---
po/packages/eo.po | 11215 +++---
po/packages/es.po | 11245 +++---
po/packages/fa.po | 11083 +++---
po/packages/fi.po | 11085 +++---
po/packages/fr.po | 11210 +++---
po/packages/hu.po | 11201 +++---
po/packages/it.po | 11098 +++---
po/packages/ko.po | 11094 +++---
po/packages/nl.po | 11090 +++---
po/packages/oc.po | 11098 +++---
po/packages/pl.po | 11104 +++---
po/packages/pt_BR.po | 11085 +++---
po/packages/sk.po | 11094 +++---
po/packages/sr.po | 11085 +++---
po/packages/tr.po | 11094 +++---
po/packages/uk.po | 11102 +++---
po/packages/vi.po | 11085 +++---
po/packages/zh_CN.po | 11190 +++---
tests/pack.scm | 279 +-
tests/packages.scm | 37 +-
tests/read-print.scm | 24 +
341 files changed, 290023 insertions(+), 211837 deletions(-)
diff --cc doc/guix.texi
index c59f0ccb4c,fa9ea5a6ec..b6363de578
--- a/doc/guix.texi
+++ b/doc/guix.texi
@@@ -36,7 -36,7 +36,7 @@@ Copyright @copyright{} 2016, 2017, 2018
Copyright @copyright{} 2016, 2017, 2018, 2019, 2020, 2021, 2022 Efraim
Flashner@*
Copyright @copyright{} 2016 John Darrington@*
Copyright @copyright{} 2016, 2017 Nikita Gillmann@*
- Copyright @copyright{} 2016, 2017, 2018, 2019, 2021, 2022 Jan Nieuwenhuizen@*
-Copyright @copyright{} 2016, 2017, 2018, 2019, 2020, 2023 Jan Nieuwenhuizen@*
++Copyright @copyright{} 2016, 2017, 2018, 2019, 2020, 2021, 2022, 2023 Jan
Nieuwenhuizen@*
Copyright @copyright{} 2016, 2017, 2018, 2019, 2020, 2021 Julien Lepiller@*
Copyright @copyright{} 2016 Alex ter Weele@*
Copyright @copyright{} 2016, 2017, 2018, 2019, 2020, 2021 Christopher Baines@*
diff --cc gnu/local.mk
index 045d5cb1ee,2abece0d2f..c7a37814d9
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@@ -10,8 -10,8 +10,8 @@@
# Copyright © 2016, 2017, 2018, 2019, 2020, 2021, 2022, 2023 Ricardo Wurmus
<rekado@elephly.net>
# Copyright © 2016 Ben Woodcroft <donttrustben@gmail.com>
# Copyright © 2016, 2017, 2018, 2019 Alex Vong <alexvong1995@gmail.com>
-# Copyright © 2016, 2017, 2018, 2019, 2020, 2021 Efraim Flashner
<efraim@flashner.co.il>
+# Copyright © 2016, 2017, 2018, 2019, 2020, 2021, 2022 Efraim Flashner
<efraim@flashner.co.il>
- # Copyright © 2016, 2017, 2018, 2019, 2020, 2021, 2022 Jan (janneke)
Nieuwenhuizen <janneke@gnu.org>
+ # Copyright © 2016, 2017, 2018, 2019, 2020, 2021, 2022, 2023 Jan (janneke)
Nieuwenhuizen <janneke@gnu.org>
# Copyright © 2017, 2018, 2019, 2020 Tobias Geerinckx-Rice <me@tobias.gr>
# Copyright © 2017, 2018 Clément Lassieur <clement@lassieur.org>
# Copyright © 2017, 2020 Mathieu Othacehe <m.othacehe@gmail.com>
@@@ -945,8 -952,10 +949,9 @@@ dist_patch_DATA =
%D%/packages/patches/binutils-loongson-workaround.patch \
%D%/packages/patches/binutils-mingw-w64-timestamp.patch \
%D%/packages/patches/binutils-mingw-w64-deterministic.patch \
- %D%/packages/patches/binutils-CVE-2021-45078.patch \
%D%/packages/patches/bloomberg-bde-cmake-module-path.patch \
%D%/packages/patches/bloomberg-bde-tools-fix-install-path.patch \
+ %D%/packages/patches/boolector-find-googletest.patch \
%D%/packages/patches/bpftrace-disable-bfd-disasm.patch \
%D%/packages/patches/breezy-fix-gio.patch \
%D%/packages/patches/byobu-writable-status.patch \
@@@ -956,8 -965,10 +961,11 @@@
%D%/packages/patches/calibre-no-updates-dialog.patch \
%D%/packages/patches/calibre-remove-test-sqlite.patch \
%D%/packages/patches/calibre-remove-test-unrar.patch \
+ %D%/packages/patches/camlboot-dynamically-allocate-stack-signal.patch
\
%D%/packages/patches/catdoc-CVE-2017-11110.patch \
+ %D%/packages/patches/ccextractor-add-missing-header.patch \
+ %D%/packages/patches/ccextractor-autoconf-tesseract.patch \
+ %D%/packages/patches/ccextractor-fix-ocr.patch \
%D%/packages/patches/chez-scheme-bin-sh.patch \
%D%/packages/patches/circos-remove-findbin.patch \
%D%/packages/patches/cdparanoia-fpic.patch \
@@@ -1555,6 -1568,8 +1562,7 @@@
%D%/packages/patches/mupen64plus-video-z64-glew-correct-path.patch \
%D%/packages/patches/musl-cross-locale.patch \
%D%/packages/patches/mutt-store-references.patch \
- %D%/packages/patches/m4-gnulib-libio.patch \
+ %D%/packages/patches/m17n-lib-1.8.0-use-pkg-config-for-freetype.patch
\
%D%/packages/patches/nautilus-extension-search-path.patch \
%D%/packages/patches/ncompress-fix-softlinks.patch \
%D%/packages/patches/ncftp-reproducible.patch \
diff --cc gnu/packages/gnuzilla.scm
index 5a1921c302,253b8c285c..45f474bee6
--- a/gnu/packages/gnuzilla.scm
+++ b/gnu/packages/gnuzilla.scm
@@@ -50,10 -50,10 +50,11 @@@
#:use-module (guix modules)
#:use-module (guix monads)
#:use-module (guix utils)
- #:use-module (guix build-system gnu)
#:use-module (guix build-system cargo)
+ #:use-module (guix build-system copy)
+ #:use-module (guix build-system gnu)
#:use-module (guix build-system trivial)
+ #:use-module (guix build-system mozilla)
#:use-module (gnu packages admin)
#:use-module (gnu packages audio)
#:use-module (gnu packages autotools)
diff --cc gnu/packages/java.scm
index aa80fa8cf9,7cf4a4fb4b..c914ccc18e
--- a/gnu/packages/java.scm
+++ b/gnu/packages/java.scm
@@@ -1491,11 -1470,7 +1482,9 @@@ blacklisted.certs.pem
(define-public openjdk16
(make-openjdk openjdk15 "16.0.2"
- "0587px2qbz07g3xi4a3ya6m630p72dvkxcn0bj1813pxnwvcgigz"))
+ "0587px2qbz07g3xi4a3ya6m630p72dvkxcn0bj1813pxnwvcgigz"
+ (source (origin
- (inherit (package-source base))
- (patches
- (search-patches "openjdk-10-hotspot-stack-size.patch"))))))
++ (inherit (package-source base))))))
(define-public openjdk17
(make-openjdk
diff --cc gnu/packages/tex.scm
index 7172944c70,0c4e545edf..7abf7f93da
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@@ -3656,108 -3508,107 +3656,152 @@@ arrows; record information about docume
(define-deprecated-package texlive-latex-oberdiek texlive-oberdiek)
+(define-public texlive-rerunfilecheck
+ (let ((template (simple-texlive-package
+ "texlive-rerunfilecheck"
+ (list "doc/latex/rerunfilecheck/"
+ "source/latex/rerunfilecheck/"
+ "tex/latex/rerunfilecheck/")
+ (base32
+ "0f53b6dlnlrxkzj7h7x750p0489i2gg3isfqn0dlpncpq23w1r36"))))
+ (package
+ (inherit template)
+ (outputs '("out" "doc"))
+ (arguments
+ (substitute-keyword-arguments (package-arguments template)
+ ((#:tex-directory _ '())
+ "latex/rerunfilecheck")
+ ((#:build-targets _ '())
+ #~(list "rerunfilecheck.dtx"))
+ ((#:phases phases)
+ #~(modify-phases #$phases
+ (add-after 'unpack 'chdir
+ (lambda _
+ (chdir "source/latex/rerunfilecheck")))
+ (replace 'copy-files
+ (lambda* (#:key inputs #:allow-other-keys)
+ (let ((origin (assoc-ref inputs "source"))
+ (source (string-append #$output
+ "/share/texmf-dist/source"))
+ (doc (string-append #$output:doc
+ "/share/texmf-dist/doc")))
+ (copy-recursively (string-append origin "/source") source)
+ (copy-recursively (string-append origin "/doc")
doc))))))))
+ (propagated-inputs
+ (list texlive-atveryend
+ texlive-infwarerr
+ texlive-kvoptions
+ texlive-pdftexcmds
+ texlive-uniquecounter))
+ (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-deprecated-package texlive-latex-rerunfilecheck
texlive-rerunfilecheck)
+
+ (define-public texlive-onedown
+ (let ((template
+ (simple-texlive-package
+ "texlive-onedown"
+ (list "doc/latex/onedown/"
+ "source/latex/onedown/"
+ "tex/latex/onedown/")
+ (base32
+ "04ih7i4v96ggwk4k1mpfx3dzcpi2siqablv93wryg7dk4cks5wkl"))))
+ (package
+ (inherit template)
+ (outputs '("doc" "out"))
+ (arguments
+ (substitute-keyword-arguments (package-arguments template)
+ ((#:tex-directory _ #t) "latex/onedown")
+ ((#:phases phases)
+ #~(modify-phases #$phases
+ (add-after 'unpack 'chdir
+ (lambda _ (chdir "source/latex/onedown/")))
+ (replace 'copy-files
+ (lambda* (#:key inputs #:allow-other-keys)
+ (let ((origin (assoc-ref inputs "source"))
+ (texmf (string-append #$output "/share/texmf-dist"))
+ (doc (string-append #$output:doc
+ "/share/texmf-dist/doc")))
+ (for-each
+ (lambda (directory)
+ (copy-recursively (string-append origin directory)
+ (string-append texmf directory)))
+ '("/source" "/tex/latex/onedown"))
+ (copy-recursively (string-append origin "/doc")
+ doc))))))))
+ (home-page "https://ctan.org/pkg/onedown";)
+ (synopsis "Typeset bridge diagrams")
+ (description
+ "This is a comprehensive package to draw all sorts of bridge diagrams,
+ including hands, bidding tables, trick tables, and expert quizzes.
+
+ It works for all font sizes. Different fonts for hands, bidding diagrams and
+ compass are possible. It also provides annotations to card and bidding
+ diagrams, automated check on consistency of suit and hands, and multilingual
+ output of bridge terms.")
+ (license license:lppl1.3+))))
+
-(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
- (list texlive-generic-infwarerr texlive-generic-uniquecounter
- texlive-latex-atveryend texlive-latex-kvoptions
- 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-tools
+ (let ((template (simple-texlive-package
+ "texlive-tools"
+ (list "doc/latex/tools/"
+ "source/latex/tools/"
+ "tex/latex/tools/")
+ (base32
+ "0c0ixkcvrlzx6sdj25ak3bx0j65qghf51w66yg5wlnpg08d3awrs"))))
+ (package
+ (inherit template)
+ (outputs '("out" "doc"))
+ (arguments
+ (substitute-keyword-arguments (package-arguments template)
+ ((#:tex-directory _ '())
+ "latex/tools")
+ ((#:build-targets _ '())
+ #~(list "tools.ins"))
+ ((#:phases phases)
+ #~(modify-phases #$phases
+ (add-after 'unpack 'chdir
+ (lambda _
+ (chdir "source/latex/tools")))
+ (replace 'copy-files
+ (lambda _
+ (let ((origin #$(package-source this-package))
+ (source (string-append #$output
+ "/share/texmf-dist/source"))
+ (doc (string-append #$output:doc
+ "/share/texmf-dist/doc")))
+ (copy-recursively (string-append origin "/source") source)
+ (copy-recursively (string-append origin "/doc") doc)
+ ;; These files are not generated.
+ (let ((directory "/tex/latex/tools"))
+ (with-directory-excursion (string-append origin
directory)
+ (for-each
+ (lambda (f)
+ (install-file f (string-append #$output
+ "/share/texmf-dist"
+ directory)))
+ '("array-2016-10-06.sty"
+ "array-2020-02-10.sty"
+ "multicol-2017-04-11.sty"
+ "varioref-2016-02-16.sty")))))))))))
+ (home-page
"https://www.ctan.org/tex-archive/macros/latex/required/tools/";)
+ (synopsis "LaTeX standard tools bundle")
+ (description "This package provides a collection of simple tools that
+are part of the LaTeX required tools distribution, comprising the packages:
+@code{afterpage}, @code{array}, @code{bm}, @code{calc}, @code{dcolumn},
+@code{delarray}, @code{enumerate}, @code{fileerr}, @code{fontsmpl},
+@code{ftnright}, @code{hhline}, @code{indentfirst}, @code{layout},
+@code{longtable}, @code{multicol}, @code{rawfonts}, @code{showkeys},
+@code{somedefs}, @code{tabularx}, @code{theorem}, @code{trace},
+@code{varioref}, @code{verbatim}, @code{xr}, and @code{xspace}.")
+ (license license:lppl1.3+))))
-(define-public texlive-latex-tools
- (package
- (name "texlive-latex-tools")
- (version (number->string %texlive-revision))
- (source (origin
- (method svn-fetch)
- (uri (texlive-ref "latex" "tools"))
- (file-name (string-append name "-" version "-checkout"))
- (sha256
- (base32
- "1vm5wfyd0vbmv31a29fc7k8y14xiw00msvdx9n7dzsn9zpfjflqs"))))
- (build-system texlive-build-system)
- (arguments
- '(#:tex-directory "latex/tools"
- #: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
- "This package is a collection of (variously) simple tools provided as
-part of the LaTeX required tools distribution, comprising the following
-packages: afterpage, array, bm, calc, dcolumn, delarray, enumerate, fileerr,
-fontsmpl, ftnright, hhline, indentfirst, layout, longtable, multicol,
-rawfonts, showkeys, somedefs, tabularx, theorem, trace, varioref, verbatim,
-xr, and xspace.")
- (license license:lppl1.3+)))
+(define-deprecated-package texlive-latex-tools texlive-tools)
(define-public texlive-url
(package
diff --cc gnu/packages/version-control.scm
index bd9fea1e9c,85291b12b7..dd5692527d
--- a/gnu/packages/version-control.scm
+++ b/gnu/packages/version-control.scm
@@@ -224,141 -224,140 +224,138 @@@ Python 3.3 and later, rather than on Py
(define-public git
(package
- (name "git")
- (version "2.39.1")
- (source (origin
- (method url-fetch)
- (uri (string-append "mirror://kernel.org/software/scm/git/git-"
- version ".tar.xz"))
- (sha256
- (base32
- "0qf1wly7zagg23svpv533va5v213y7y3lfw76ldkf35k8w48m8s0"))))
- (build-system gnu-build-system)
- (native-inputs
- `(("native-perl" ,perl)
- ;; Add bash-minimal explicitly to ensure it comes before
bash-for-tests,
- ;; see <https://bugs.gnu.org/39513>.
- ("bash" ,bash-minimal)
- ("bash-for-tests" ,bash)
- ("gettext" ,gettext-minimal)
- ;; To build the man pages from the git sources, we would need a
dependency
- ;; on a full XML tool chain, and building it actually takes ages. So
we
- ;; use this lazy approach and use released tarball.
- ("git-manpages"
- ,(origin
- (method url-fetch)
- (uri (string-append
- "mirror://kernel.org/software/scm/git/git-manpages-"
- version ".tar.xz"))
- (sha256
- (base32
- "0xf7ki90xw77nvmnkw50xaivyfi8jddfq0h8crzi7m9zjs7aa8mm"))))
- ;; For subtree documentation.
- ("asciidoc" ,asciidoc)
- ("docbook2x" ,docbook2x)
- ("docbook-xsl" ,docbook-xsl)
- ("libxslt" ,libxslt)
- ("pkg-config" ,pkg-config)
- ("texinfo" ,texinfo)
- ("xmlto" ,xmlto)))
- (inputs
- `(("curl" ,curl)
- ("expat" ,expat)
- ("openssl" ,openssl)
- ("perl" ,perl)
- ("python" ,python) ; for git-p4
- ("zlib" ,zlib)
+ (name "git")
+ (version "2.39.2")
+ (source (origin
+ (method url-fetch)
+ (uri (string-append "mirror://kernel.org/software/scm/git/git-"
+ version ".tar.xz"))
+ (sha256
+ (base32
+ "1mpjvhyw8mv2q941xny4d0gw3mb6b4bqaqbh73jd8b1v6zqpaps7"))))
+ (build-system gnu-build-system)
+ (native-inputs
+ `(("native-perl" ,perl)
+ ;; Add bash-minimal explicitly to ensure it comes before bash-for-tests,
+ ;; see <https://bugs.gnu.org/39513>.
+ ("bash" ,bash-minimal)
+ ("bash-for-tests" ,bash)
+ ("gettext" ,gettext-minimal)
+ ;; To build the man pages from the git sources, we would need a
dependency
+ ;; on a full XML tool chain, and building it actually takes ages. So we
+ ;; use this lazy approach and use released tarball.
+ ("git-manpages"
+ ,(origin
+ (method url-fetch)
+ (uri (string-append
+ "mirror://kernel.org/software/scm/git/git-manpages-"
+ version ".tar.xz"))
+ (sha256
+ (base32
+ "09cva868qb4705s884dzvbwkm78jlw4q8m6xj7nd7cwxy2i2ff8b"))))
+ ;; For subtree documentation.
+ ("asciidoc" ,asciidoc)
+ ("docbook-xsl" ,docbook-xsl)
+ ("xmlto" ,xmlto)
+ ("pkg-config" ,pkg-config)))
+ (inputs
+ `(("curl" ,curl)
+ ("expat" ,expat)
+ ("openssl" ,openssl)
+ ("perl" ,perl)
+ ("python" ,python) ; for git-p4
+ ("zlib" ,zlib)
- ;; For PCRE support in git grep (USE_LIBPCRE2).
- ("pcre" ,pcre2)
-
- ;; For 'gitweb.cgi'.
- ("perl-cgi" ,perl-cgi)
-
- ;; For 'git-svn'.
- ("subversion" ,subversion)
- ("perl-term-readkey" ,perl-term-readkey)
-
- ;; For 'git-send-email'.
- ("perl-authen-sasl" ,perl-authen-sasl)
- ("perl-net-smtp-ssl" ,perl-net-smtp-ssl)
- ("perl-io-socket-ssl" ,perl-io-socket-ssl)
-
- ;; For 'git gui', 'gitk', and 'git citool'.
- ("tcl" ,tcl)
- ("tk" ,tk)
-
- ;; For 'git-credential-libsecret'
- ("glib" ,glib)
- ("libsecret" ,libsecret)))
- (outputs '("out" ; the core
- "send-email" ; for git-send-email
- "svn" ; git-svn
- "credential-netrc" ; git-credential-netrc
- "credential-libsecret" ; git-credential-libsecret
- "subtree" ; git-subtree
- "gui")) ; gitk, git gui
- (arguments
- `(#:make-flags `("V=1" ;more verbose compilation
-
- ,(string-append "SHELL_PATH="
- (assoc-ref %build-inputs "bash")
- "/bin/sh")
-
- ;; Tests require a bash with completion support.
- ,(string-append "TEST_SHELL_PATH="
- (assoc-ref %build-inputs
"bash-for-tests")
- "/bin/bash")
-
- "USE_LIBPCRE2=yes"
-
- ;; By default 'make install' creates hard links for
- ;; things in 'libexec/git-core', which leads to huge
- ;; nars; see <https://bugs.gnu.org/21949>.
- "NO_INSTALL_HARDLINKS=indeed")
-
- ;; Make sure the full bash does not end up in the final closure.
- #:disallowed-references (,bash)
-
- #:test-target "test"
-
- ;; The explicit --with-tcltk forces the build system to hardcode the
- ;; absolute file name to 'wish'.
- #:configure-flags (list (string-append "--with-tcltk="
- (assoc-ref %build-inputs "tk")
- "/bin/wish8.6") ; XXX
- ,@(if (%current-target-system)
- git-cross-configure-flags
- '()))
-
- #:modules ((srfi srfi-1)
- (srfi srfi-26)
- ((guix build gnu-build-system) #:prefix gnu:)
- ,@%gnu-build-system-modules)
- #:phases
- (modify-phases %standard-phases
- ,@(if (%current-target-system)
- ;; The git build system assumes build == host
- `((add-after 'unpack 'use-host-uname_S
- (lambda _
- (substitute* "config.mak.uname"
- (("uname_S := .*" all)
- (if (equal? ,(%current-target-system) "i586-pc-gnu")
- "uname_S := GNU\n"
- all)))
- #t)))
- ;; We do not have bash-for-tests when cross-compiling.
- `((add-after 'unpack 'modify-PATH
- (lambda* (#:key inputs #:allow-other-keys)
- (let ((path (string-split (getenv "PATH") #\:))
- (bash-full (assoc-ref inputs "bash-for-tests")))
- ;; Drop the test bash from PATH so that (which "sh") and
- ;; similar does the right thing.
- (setenv "PATH" (string-join
- (remove (cut string-prefix? bash-full
<>) path)
- ":"))
- #t)))))
- ;; Add cross curl-config script to PATH when cross-compiling.
- ,@(if (%current-target-system)
- '((add-before 'configure 'add-cross-curl-config
+ ;; For PCRE support in git grep (USE_LIBPCRE2).
+ ("pcre" ,pcre2)
+
+ ;; For 'gitweb.cgi'.
+ ("perl-cgi" ,perl-cgi)
+
+ ;; For 'git-svn'.
+ ("subversion" ,subversion)
+ ("perl-term-readkey" ,perl-term-readkey)
+
+ ;; For 'git-send-email'.
+ ("perl-authen-sasl" ,perl-authen-sasl)
+ ("perl-net-smtp-ssl" ,perl-net-smtp-ssl)
+ ("perl-io-socket-ssl" ,perl-io-socket-ssl)
+
+ ;; For 'git gui', 'gitk', and 'git citool'.
+ ("tcl" ,tcl)
+ ("tk" ,tk)
+
+ ;; For 'git-credential-libsecret'
+ ("glib" ,glib)
+ ("libsecret" ,libsecret)))
+ (outputs '("out" ; the core
+ "send-email" ; for git-send-email
+ "svn" ; git-svn
+ "credential-netrc" ; git-credential-netrc
+ "credential-libsecret" ; git-credential-libsecret
+ "subtree" ; git-subtree
+ "gui")) ; gitk, git gui
+ (arguments
+ `(#:make-flags `("V=1" ;more verbose compilation
+
+ ,(string-append "SHELL_PATH="
+ (assoc-ref %build-inputs "bash")
+ "/bin/sh")
+
+ ;; Tests require a bash with completion support.
+ ,(string-append "TEST_SHELL_PATH="
+ (assoc-ref %build-inputs
"bash-for-tests")
+ "/bin/bash")
+
+ "USE_LIBPCRE2=yes"
+
+ ;; By default 'make install' creates hard links for
+ ;; things in 'libexec/git-core', which leads to huge
+ ;; nars; see <https://bugs.gnu.org/21949>.
+ "NO_INSTALL_HARDLINKS=indeed")
+
+ ;; Make sure the full bash does not end up in the final closure.
+ #:disallowed-references (,bash)
+
+ #:test-target "test"
+
+ ;; The explicit --with-tcltk forces the build system to hardcode the
+ ;; absolute file name to 'wish'.
+ #:configure-flags (list (string-append "--with-tcltk="
+ (assoc-ref %build-inputs "tk")
+ "/bin/wish8.6") ; XXX
+ ,@(if (%current-target-system)
+ git-cross-configure-flags
+ '()))
+
+ #:modules ((srfi srfi-1)
+ (srfi srfi-26)
+ ((guix build gnu-build-system) #:prefix gnu:)
+ ,@%gnu-build-system-modules)
+ #:phases
+ (modify-phases %standard-phases
+ ,@(if (%current-target-system)
+ ;; The git build system assumes build == host
+ `((add-after 'unpack 'use-host-uname_S
+ (lambda _
+ (substitute* "config.mak.uname"
+ (("uname_S := .*" all)
+ (if (equal? ,(%current-target-system) "i586-pc-gnu")
+ "uname_S := GNU\n"
+ all))))))
+ ;; We do not have bash-for-tests when cross-compiling.
+ `((add-after 'unpack 'modify-PATH
+ (lambda* (#:key inputs #:allow-other-keys)
+ (let ((path (string-split (getenv "PATH") #\:))
+ (bash-full (assoc-ref inputs "bash-for-tests")))
+ ;; Drop the test bash from PATH so that (which "sh")
and
+ ;; similar does the right thing.
+ (setenv "PATH" (string-join
+ (remove (cut string-prefix? bash-full
<>) path)
+ ":")))))))
+ ;; Add cross curl-config script to PATH when cross-compiling.
+ ,@(if (%current-target-system)
+ '((add-before 'configure 'add-cross-curl-config
(lambda* (#:key inputs #:allow-other-keys)
(setenv "PATH"
(string-append (assoc-ref inputs "curl") "/bin:"
diff --cc gnu/packages/wm.scm
index 310553406f,b55525b580..985c1ac56b
--- a/gnu/packages/wm.scm
+++ b/gnu/packages/wm.scm
@@@ -45,8 -45,8 +45,8 @@@
;;; Copyright © 2021 Sharlatan Hellseher <sharlatanus@gmail.com>
;;; Copyright © 2021 qblade <qblade@protonmail.com>
;;; Copyright © 2021 lasnesne <lasnesne@lagunposprasihopre.org>
-;;; Copyright © 2021 Petr Hodina <phodina@protonmail.com>
+;;; Copyright © 2021, 2022 Petr Hodina <phodina@protonmail.com>
- ;;; Copyright © 2021 jgart <jgart@dismail.de>
+ ;;; Copyright © 2021, 2023 jgart <jgart@dismail.de>
;;; Copyright © 2021 Disseminate Dissent <disseminatedissent@protonmail.com>
;;; Copyright © 2022 John Kehayias <john.kehayias@protonmail.com>
;;; Copyright © 2022 Gabriel Wicki <gabriel@erlikon.ch>