[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
01/01: Merge remote-tracking branch 'origin/master' into core-updates-fr
|
From: |
guix-commits |
|
Subject: |
01/01: Merge remote-tracking branch 'origin/master' into core-updates-frozen. |
|
Date: |
Tue, 12 Oct 2021 13:47:16 -0400 (EDT) |
mothacehe pushed a commit to branch core-updates-frozen
in repository guix.
commit a1eca979fb8da842e73c42f4f53be29b169810f2
Merge: 48d86a9 371aa57
Author: Mathieu Othacehe <othacehe@gnu.org>
AuthorDate: Tue Oct 12 16:50:47 2021 +0000
Merge remote-tracking branch 'origin/master' into core-updates-frozen.
.gitignore | 1 +
Makefile.am | 11 +-
NEWS | 18 +-
doc/contributing.texi | 52 +-
doc/guix-cookbook.texi | 8 +-
doc/guix.texi | 886 +-
doc/he-config-bare-bones.scm | 24 +
doc/htmlxref.cnf | 76 +-
etc/committer.scm.in | 26 +-
etc/completion/bash/guix | 58 +-
etc/disarchive-manifest.scm | 2 +-
etc/guix-gc.service.in | 20 +
etc/guix-gc.timer | 15 +
etc/guix-install.sh | 8 +-
etc/news.scm | 132 +
gnu/build/file-systems.scm | 318 +-
gnu/build/linux-boot.scm | 97 +-
gnu/ci.scm | 47 +-
gnu/home.scm | 106 +
gnu/home/services.scm | 525 +
gnu/home/services/fontutils.scm | 65 +
gnu/home/services/mcron.scm | 115 +
gnu/home/services/shells.scm | 633 ++
gnu/home/services/shepherd.scm | 134 +
gnu/home/services/symlink-manager.scm | 247 +
gnu/home/services/utils.scm | 105 +
gnu/home/services/xdg.scm | 477 +
gnu/image.scm | 13 +-
gnu/installer.scm | 1 +
gnu/installer/newt/partition.scm | 2 +-
gnu/installer/parted.scm | 18 +-
gnu/local.mk | 54 +-
gnu/packages/admin.scm | 67 +-
gnu/packages/agda.scm | 50 +-
gnu/packages/algebra.scm | 21 +-
gnu/packages/android.scm | 12 +-
gnu/packages/astronomy.scm | 69 +-
gnu/packages/audio.scm | 52 +-
gnu/packages/autotools.scm | 14 +
gnu/packages/aux-files/linux-libre/5.13-arm.conf | 10037 -----------------
gnu/packages/aux-files/linux-libre/5.13-arm64.conf | 10391 ------------------
gnu/packages/aux-files/linux-libre/5.13-i686.conf | 10883 ------------------
.../aux-files/linux-libre/5.13-x86_64.conf | 10953 -------------------
gnu/packages/backup.scm | 4 +-
gnu/packages/bioconductor.scm | 173 +-
gnu/packages/bioinformatics.scm | 163 +-
gnu/packages/bootloaders.scm | 5 +-
gnu/packages/browser-extensions.scm | 39 +-
gnu/packages/build-tools.scm | 2 +-
gnu/packages/c.scm | 15 +-
gnu/packages/ccache.scm | 21 +-
gnu/packages/check.scm | 95 +-
gnu/packages/chemistry.scm | 62 +
gnu/packages/chromium.scm | 113 +-
gnu/packages/ci.scm | 8 +-
gnu/packages/cluster.scm | 28 +-
gnu/packages/code.scm | 3 +-
gnu/packages/compression.scm | 29 +-
gnu/packages/convmv.scm | 2 +-
gnu/packages/coq.scm | 1 +
gnu/packages/cpp.scm | 23 +-
gnu/packages/cran.scm | 648 +-
gnu/packages/crates-io.scm | 1494 ++-
gnu/packages/crypto.scm | 7 +-
gnu/packages/cups.scm | 4 +-
gnu/packages/cvassistant.scm | 2 +-
gnu/packages/cybersecurity.scm | 4 +-
gnu/packages/databases.scm | 57 +-
gnu/packages/debian.scm | 64 +
gnu/packages/dhall.scm | 14 +-
gnu/packages/diffoscope.scm | 51 +-
gnu/packages/dns.scm | 116 +-
gnu/packages/easyrpg.scm | 4 +-
gnu/packages/education.scm | 13 +-
gnu/packages/elixir.scm | 4 +-
gnu/packages/elm.scm | 15 +-
gnu/packages/emacs-xyz.scm | 730 +-
gnu/packages/emacs.scm | 2 +-
gnu/packages/emulators.scm | 90 +-
gnu/packages/engineering.scm | 298 +-
gnu/packages/enlightenment.scm | 4 +-
gnu/packages/erlang.scm | 4 +-
gnu/packages/esolangs.scm | 2 +-
gnu/packages/file-systems.scm | 18 +-
gnu/packages/file.scm | 2 +-
gnu/packages/finance.scm | 73 +-
gnu/packages/flashing-tools.scm | 7 +-
gnu/packages/fonts.scm | 6 +-
gnu/packages/fontutils.scm | 21 +-
gnu/packages/freedesktop.scm | 18 +-
gnu/packages/game-development.scm | 169 +-
gnu/packages/games.scm | 179 +-
gnu/packages/genealogy.scm | 4 +-
gnu/packages/geo.scm | 182 +-
gnu/packages/gimp.scm | 93 +-
gnu/packages/gl.scm | 1 -
gnu/packages/gnome-xyz.scm | 6 +-
gnu/packages/gnome.scm | 75 +-
gnu/packages/gnupg.scm | 31 +-
gnu/packages/gnuzilla.scm | 22 +-
gnu/packages/golang.scm | 29 +
gnu/packages/gps.scm | 17 +-
gnu/packages/graphics.scm | 4 +-
gnu/packages/graphviz.scm | 8 +-
gnu/packages/gstreamer.scm | 16 +-
gnu/packages/gtk.scm | 13 +
gnu/packages/guile-xyz.scm | 238 +-
gnu/packages/hardware.scm | 109 +
gnu/packages/haskell-apps.scm | 135 +-
gnu/packages/haskell-check.scm | 297 +-
gnu/packages/haskell-crypto.scm | 51 +-
gnu/packages/haskell-web.scm | 272 +-
gnu/packages/haskell-xyz.scm | 3776 ++++---
gnu/packages/haskell.scm | 26 +-
gnu/packages/idris.scm | 11 +-
gnu/packages/image-processing.scm | 2 +-
gnu/packages/image-viewers.scm | 37 +-
gnu/packages/irc.scm | 52 +-
gnu/packages/java.scm | 21 +-
gnu/packages/javascript.scm | 11 +-
gnu/packages/julia-jll.scm | 43 +
gnu/packages/julia-xyz.scm | 639 +-
gnu/packages/kde.scm | 73 +-
gnu/packages/less.scm | 4 +-
gnu/packages/linux.scm | 616 +-
gnu/packages/lisp-xyz.scm | 185 +-
gnu/packages/lisp.scm | 5 +-
gnu/packages/llvm.scm | 62 +-
gnu/packages/lxqt.scm | 7 +-
gnu/packages/machine-learning.scm | 184 +-
gnu/packages/mail.scm | 44 +-
gnu/packages/man.scm | 4 +-
gnu/packages/maths.scm | 252 +-
gnu/packages/matrix.scm | 5 +-
gnu/packages/messaging.scm | 36 +-
gnu/packages/minetest.scm | 2 +-
gnu/packages/monitoring.scm | 24 +-
gnu/packages/mpd.scm | 4 +-
gnu/packages/music.scm | 84 +-
gnu/packages/nano.scm | 4 +-
gnu/packages/networking.scm | 67 +-
gnu/packages/node-xyz.scm | 60 +-
gnu/packages/ocaml.scm | 222 +-
gnu/packages/ocr.scm | 2 +-
gnu/packages/package-management.scm | 175 +-
gnu/packages/parallel.scm | 4 +-
gnu/packages/password-utils.scm | 2 +-
.../cabal-install-base16-bytestring1.0.patch | 29 +
gnu/packages/patches/cabal-install-ghc8.10.patch | 393 +
.../patches/ceph-fix-snappy-breaking-change.patch | 13 +
.../patches/clang-10.0-libc-search-path.patch | 93 +-
.../patches/clang-11.0-libc-search-path.patch | 101 +-
.../patches/clang-12-tools-extra-directory.patch | 16 -
.../patches/clang-12.0-libc-search-path.patch | 84 +
.../patches/clang-7.0-libc-search-path.patch | 82 +-
.../patches/clang-8.0-libc-search-path.patch | 94 +
.../patches/clang-9.0-libc-search-path.patch | 90 +-
...scope-fix-test_item3_deflate_llvm_bitcode.patch | 28 +
.../patches/ganeti-deterministic-manual.patch | 16 -
gnu/packages/patches/ganeti-drbd-compat.patch | 166 -
gnu/packages/patches/ganeti-haskell-compat.patch | 18 +
gnu/packages/patches/ganeti-os-disk-size.patch | 17 -
.../patches/ghc-diff-swap-cover-args.patch | 20 -
.../patches/ghc-haddock-api-fix-haddock.patch | 54 -
gnu/packages/patches/ghc-hpack-fix-tests.patch | 193 -
.../ghc-language-haskell-extract-ghc-8.10.patch | 27 +
.../patches/ghc-microlens-aeson-fix-tests.patch | 27 -
.../patches/ghc-pandoc-fix-html-tests.patch | 92 -
.../patches/ghc-pandoc-fix-latex-test.patch | 31 -
gnu/packages/patches/hedgewars-network-bsd.patch | 150 +
gnu/packages/patches/hexchat-add-libera-chat.patch | 76 -
.../patches/idris-build-with-haskeline-0.8.patch | 85 +
.../patches/idris-build-with-megaparsec-9.patch | 27 +
.../patches/libcacard-unknown-variable.patch | 50 -
.../patches/minetest-add-MINETEST_MOD_PATH.patch | 2 +-
gnu/packages/patches/ngless-unliftio.patch | 66 +
gnu/packages/patches/nnpack-system-libraries.patch | 205 +
gnu/packages/patches/ntfs-3g-CVE-2019-9755.patch | 72 -
.../patches/ocaml-cairo2-caml_ba_array-fix.patch | 68 -
gnu/packages/patches/php-bug-74093-test.patch | 48 +
gnu/packages/patches/pigx-bsseq-no-citeproc.patch | 33 +
.../patches/pigx-chipseq-no-citeproc.patch | 33 +
gnu/packages/patches/pigx-rnaseq-no-citeproc.patch | 33 +
.../patches/pigx-sars-cov2-ww-no-citeproc.patch | 33 +
.../patches/pigx-scrnaseq-no-citeproc.patch | 33 +
.../patches/ppsspp-disable-upgrade-and-gold.patch | 4 +-
.../patches/purescript-relax-dependencies.patch | 40 -
.../patches/python-pytorch-system-libraries.patch | 38 +-
.../sbcl-burgled-batteries3-fix-signals.patch | 70 +
.../patches/sbcl-png-fix-sbcl-compatibility.patch | 60 +
.../patches/ungoogled-chromium-ffmpeg-compat.patch | 68 +
.../patches/ungoogled-chromium-system-nspr.patch | 54 +
.../patches/webkitgtk-bind-all-fonts.patch | 2 +-
.../patches/xgboost-use-system-dmlc-core.patch | 34 +
gnu/packages/patchutils.scm | 26 +-
gnu/packages/patool.scm | 118 +
gnu/packages/pdf.scm | 4 +-
gnu/packages/photo.scm | 26 +-
gnu/packages/php.scm | 1 +
gnu/packages/purescript.scm | 97 +-
gnu/packages/pv.scm | 23 +-
gnu/packages/python-check.scm | 105 +-
gnu/packages/python-crypto.scm | 41 +-
gnu/packages/python-science.scm | 72 +-
gnu/packages/python-web.scm | 7 +-
gnu/packages/python-xyz.scm | 837 +-
gnu/packages/python.scm | 2 -
gnu/packages/radio.scm | 81 +
gnu/packages/rsync.scm | 8 +-
gnu/packages/ruby.scm | 14 +-
gnu/packages/rust-apps.scm | 86 +-
gnu/packages/samba.scm | 36 +-
gnu/packages/sdl.scm | 37 +-
gnu/packages/search.scm | 34 +-
gnu/packages/serialization.scm | 35 +-
gnu/packages/shells.scm | 4 +-
gnu/packages/spice.scm | 7 +-
gnu/packages/ssh.scm | 34 +-
gnu/packages/sssd.scm | 62 +
gnu/packages/statistics.scm | 535 +-
gnu/packages/storage.scm | 5 +-
gnu/packages/sync.scm | 14 +-
gnu/packages/syndication.scm | 24 +-
gnu/packages/telephony.scm | 6 +-
gnu/packages/terminals.scm | 9 +-
gnu/packages/tex.scm | 2 +-
gnu/packages/text-editors.scm | 8 +-
gnu/packages/tls.scm | 12 +-
gnu/packages/toys.scm | 8 +-
gnu/packages/tryton.scm | 4350 +++++++-
gnu/packages/unicode.scm | 2 +-
gnu/packages/upnp.scm | 4 +-
gnu/packages/version-control.scm | 7 +-
gnu/packages/video.scm | 61 +-
gnu/packages/vim.scm | 14 +-
gnu/packages/virtualization.scm | 235 +-
gnu/packages/vpn.scm | 34 +-
gnu/packages/web-browsers.scm | 28 +-
gnu/packages/web.scm | 34 +-
gnu/packages/webkit.scm | 4 +-
gnu/packages/wget.scm | 6 +-
gnu/packages/wm.scm | 51 +-
gnu/packages/xdisorg.scm | 19 +-
gnu/packages/xfce.scm | 23 +-
gnu/packages/xorg.scm | 14 +-
gnu/platform.scm | 38 +
gnu/platforms/arm.scm | 36 +
gnu/platforms/hurd.scm | 28 +
gnu/services/configuration.scm | 90 +-
gnu/services/dns.scm | 4 -
gnu/services/ganeti.scm | 4 +
gnu/services/sound.scm | 2 +-
gnu/services/web.scm | 3 +-
gnu/system.scm | 3 +-
gnu/system/file-systems.scm | 20 +-
gnu/system/image.scm | 51 +-
gnu/system/images/hurd.scm | 8 +-
gnu/system/images/novena.scm | 6 +-
gnu/system/images/pine64.scm | 6 +-
gnu/system/images/pinebook-pro.scm | 6 +-
gnu/system/images/rock64.scm | 8 +-
gnu/system/linux-initrd.scm | 19 +-
gnu/system/uuid.scm | 9 +-
gnu/tests/ganeti.scm | 31 +-
gnu/tests/install.scm | 74 +
guix/build-system/linux-module.scm | 4 +
guix/build-system/renpy.scm | 1 +
guix/build/download.scm | 22 +-
guix/build/emacs-utils.scm | 2 +-
guix/build/haskell-build-system.scm | 46 +-
guix/build/linux-module-build-system.scm | 35 +-
guix/build/renpy-build-system.scm | 2 +-
guix/build/syscalls.scm | 29 +-
guix/channels.scm | 9 +-
guix/cpio.scm | 21 +-
guix/discovery.scm | 32 +-
guix/extracting-download.scm | 179 +
guix/git.scm | 92 +-
guix/graph.scm | 45 +-
guix/import/crate.scm | 8 +-
guix/import/git.scm | 225 +
guix/import/go.scm | 13 +-
guix/import/hackage.scm | 11 +-
guix/import/minetest.scm | 73 +-
guix/import/pypi.scm | 20 +-
guix/import/stackage.scm | 111 +-
guix/packages.scm | 23 +-
guix/scripts/graph.scm | 11 +-
guix/scripts/home.scm | 524 +
guix/scripts/home/import.scm | 243 +
guix/scripts/publish.scm | 82 +-
guix/scripts/system.scm | 7 +-
guix/self.scm | 13 +-
guix/swh.scm | 52 +-
guix/tests/git.scm | 7 +-
nix/local.mk | 5 +-
po/guix/POTFILES.in | 24 +
tests/channels.scm | 47 +
tests/git.scm | 28 +
tests/go.scm | 6 +-
tests/graph.scm | 21 +-
tests/guix-home.sh | 131 +
tests/import-git.scm | 245 +
tests/lint.scm | 23 +-
tests/minetest.scm | 169 +-
tests/opam.scm | 85 +-
tests/pypi.scm | 106 +-
307 files changed, 25078 insertions(+), 48671 deletions(-)
diff --cc doc/guix.texi
index d92c857,7a4b2c0..ab7082c
--- a/doc/guix.texi
+++ b/doc/guix.texi
@@@ -96,7 -96,8 +96,9 @@@ Copyright @copyright{} 2021 Domagoj Sto
Copyright @copyright{} 2021 Hui Lu@*
Copyright @copyright{} 2021 pukkamustard@*
Copyright @copyright{} 2021 Alice Brenon@*
+Copyright @copyright{} 2021 Josselin Poiret@*
+ Copyright @copyright{} 2021 Andrew Tropin@*
+ Copyright @copyright{} 2021 Sarah Morgensen@*
Permission is granted to copy, distribute and/or modify this document
under the terms of the GNU Free Documentation License, Version 1.3 or
diff --cc etc/news.scm
index b4a0806,47b4437..d3a5686
--- a/etc/news.scm
+++ b/etc/news.scm
@@@ -22,32 -23,138 +23,163 @@@
(channel-news
(version 0)
+ (entry (commit "a2324d8b56eabf8117bca220a507cc791edffd2e")
+ (title
+ (en "Guix Home is a part of GNU Guix")
+ (de "Guix Home ist jetzt Teil von GNU Guix")
+ (ru "Guix Home теперь поставляется в составе GNU Guix"))
+ (body
+ (en "Guix Home splitted out from rde project and now is a part of
+ Guix proper. It is available as a @emph{technology preview} and thus subject
+ to change.
+
+ The new @command{guix home} command with its actions allows users to
+ manage their packages and configurations (aka. dotfiles) in a declarative way,
+ similar to how many people manage their system with @command{guix system}.
+
+ Take a look at available actions and arguments:
+ @example
+ guix home --help
+ @end example
+
+ See @command{info \"(guix) Home Configuration\"} for more information.")
+ (de "Guix Home ist aus dem rde-Projekt ins offizielle Guix übernommen
+ worden. Es ist als @emph{Technologievorschau} bereits verfügbar, aber die
+ Schnittstelle kann sich in Zukunft noch ändern.
+
+ Der neue Befehl @command{guix home} ermöglicht es, die Pakete und
+ Konfigurationsdateien (Dotfiles) für ein Benutzerkonto im deklarativen Stil zu
+ verwalten. Es ist analog dazu, wie man @command{guix system} benutzen kann, um
+ sein System zu verwalten.
+
+ Werfen Sie einen Blick auf die verfügbaren Aktionen und Argumente:
+ @example
+ guix home --help
+ @end example
+
+ Führen Sie für mehr Informationen @command{info \"(guix) Home Configuration\"}
+ aus.")
+ (ru "Guix Home отделился от проекта rde и теперь является частью
+ Guix. Новая команда @command{guix home} даёт возможность пользователям
+ управлять их пакетами и конфигурациями (дотфайлами) для них в декларативном
+ стиле, аналогично тому, как многие люди управляют своими системами с помощью
+ @command{guix system}.
+
+ Чтобы получить список доступных действий и аргументов:
+ @example
+ guix home --help
+ @end example
+
+ Смотрите @command{info \"(guix) Home Configuration\"} для получения более
+ детальных сведений.")))
+
+ (entry (commit "5b32ad4f6f555d305659cee825879df075b06331")
+ (title
+ (en "New @option{--max-depth} option for @command{guix graph}")
+ (de "Neue Option @option{--max-depth} für @command{guix graph}")
+ (fr "Nouvelle option @option{--max-depth} pour @command{guix
graph}"))
+ (body
+ (en "The @command{guix graph} command has a new @option{--max-depth}
+ (or @option{-M}) option, which allows you to restrict a graph to the given
+ depth---very useful when visualizing large graphs. For example, the command
+ below displays, using the @code{xdot} package, the dependency graph of
+ LibreOffice, including only nodes that are at most at distance 2 of
+ LibreOffice itself:
+
+ @example
+ guix graph -M 2 libreoffice | xdot -
+ @end example
+
+ See @command{info \"(guix) Invoking guix graph\"} for more information.")
+ (de "Der Befehl @command{guix graph} verfügt über eine neue
+ Befehlszeilenoption @option{--max-depth} (oder @option{-M}), mit der
+ Sie einen Graphen auf die angegebene Tiefe einschränken. Das ist vor
+ allem bei großen Graphen nützlich; zum Beispiel zeigt der folgende
+ Befehl, unter Verwendung des Pakets @code{xdot}, den
+ Abhängigkeitsgraphen von LibreOffice unter Ausschluss der Knoten, die
+ eine Distanz größer als 2 von LibreOffice selbst haben:
+
+ @example
+ guix graph -M 2 libreoffice | xdot -
+ @end example
+
+ Führen Sie @code{info \"(guix.de) Aufruf von guix graph\"} aus, um mehr zu
+ erfahren.")
+ (fr "La commande @command{guix graph} dispose d'une nouvelle option
+ @option{--max-depth} (ou @option{-M}) pour restreindre la profondeur d'un
+ graphe---très utile pour visualiser des gros graphes. Par exemple, la
+ commande ci-dessous affiche, en utilisant @code{xdot}, le graphe de dépendance
+ de LibreOffice en n'incluant que les nœuds qui sont au plus à distance 2 de
+ LibreOffice soi-même :
+
+ @example
+ guix graph -M 2 libreoffice | xdot -
+ @end example
+
+ Voir @command{info \"(guix.fr) Invoquer guix graph\"} pour plus
+ d'informations.")))
+
+ (entry (commit "05f44c2d858a1e7b13c90362c35fa86bdc4d5a24")
+ (title
+ (en "Channel clones fall back to Software Heritage")
+ (de "Zum Klonen von Kanälen wird notfalls auf Software Heritage
zurückgegriffen")
+ (fr "Les clones de canaux peuvent recourir à Software Heritage"))
+ (body
+ (en "When @command{guix time-machine} or @command{guix pull} fetches
+ a channel pinned to a specific commit, it now automatically falls back to
+ cloning it from the Software Heritage archive if the original URL is
+ unreachable. This contributes to long-term reproducibility. See
+ @command{info \"(guix) Replicating Guix\"}.
+
+ Automatic fallback also works for other Git clones made on your behalf, such
+ as when using @option{--with-commit} and related package transformation
+ options.")
+ (de "Wenn bei @command{guix time-machine} oder @command{guix
+ pull} ein bestimmter Commit eines Kanals bezogen werden soll, wird
+ jetzt für den Fall, dass die ursprüngliche URL unerreichbar ist,
+ automatisch vom Software-Heritage-Archiv geklont. Das trägt zur
+ langfristigen Reproduzierbarkeit bei. Siehe @command{info \"(guix.de)
+ Guix nachbilden\"}.
+
+ Der automatische Rückgriff auf Software Heritage findet auch
+ Verwendung bei anderen Arten von Git-Klon, die Guix durchführt, z.B.@:
+ wenn Sie @option{--with-commit} und ähnliche Paketumwandlungsoptionen
+ einsetzen.")
+ (fr "Quand la commande @command{guix time-machine} ou @command{guix
+ pull} récupère un canal fixé à une révision spécifique, elle est maintenant
+ capable de le cloner depuis l'archive Software Heritage si l'URL initiale
+ n'est plus disponible. Cela contribue à la reproductibilité à long terme.
+ Voir @command{info \"(guix.fr) Répliquer Guix\"}.
+
+ Ce recours à Software Heritage fonctionne aussi pour les autres clones Git que
+ Guix peut faire, comme lorsqu'on utilise @option{--with-commit} et les options
+ de transformation de paquet similaires.")))
+ (entry (commit "f23803af2018a148fb088f2516d79c20d6bf95f0")
+ (title
+ (en "Input labels can now be omitted in package definitions"))
+ (body
+ (en "If you have written package definitions before, you may know
+that package inputs required a bit of boilerplate: each input needs to have an
+associated label (a string), which you can refer to in ``build-side code''.
+
+Input labels are now unnecessary, meaning that you can write code like:
+
+@lisp
+(package
+ ;; @dots{}
+ (inputs (list libunistring libffi libgc)))
+@end lisp
+
+Notice that the @code{inputs} field is simplified compared to the ``old
+style''. When needed, you can now use g-expressions (gexps) to refer to
+another package in build-side code. Additionally, the new
+@code{modify-inputs} macro facilitates common operations on inputs---deleting,
+replacing, adding inputs.
+
+To ease transition to the ``new style'', a new @command{guix style} command is
+provided. Run @command{info \"(guix) Invoking guix style\"} for more
info.")))
+
(entry (commit "82daab42811a2e3c7684ebdf12af75ff0fa67b99")
(title
(en "New @samp{deb} format for the @command{guix pack} command")
diff --cc gnu/local.mk
index dfb9e50,34218ec..a2201a5
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@@ -910,7 -924,7 +927,8 @@@ dist_patch_DATA =
%D%/packages/patches/cdparanoia-fpic.patch \
%D%/packages/patches/cdrtools-3.01-mkisofs-isoinfo.patch \
%D%/packages/patches/ceph-disable-cpu-optimizations.patch \
+ %D%/packages/patches/cheese-vala-update.patch \
+ %D%/packages/patches/ceph-fix-snappy-breaking-change.patch \
%D%/packages/patches/chez-scheme-build-util-paths-backport.patch \
%D%/packages/patches/chmlib-inttypes.patch \
%D%/packages/patches/cl-asdf-config-directories.patch \
@@@ -1048,11 -1063,10 +1068,9 @@@
%D%/packages/patches/fuse-overlapping-headers.patch
\
%D%/packages/patches/fxdiv-system-libraries.patch \
%D%/packages/patches/gajim-honour-GAJIM_PLUGIN_PATH.patch \
- %D%/packages/patches/ganeti-deterministic-manual.patch \
%D%/packages/patches/ganeti-disable-version-symlinks.patch \
- %D%/packages/patches/ganeti-drbd-compat.patch \
+ %D%/packages/patches/ganeti-haskell-compat.patch \
%D%/packages/patches/ganeti-haskell-pythondir.patch \
- %D%/packages/patches/ganeti-os-disk-size.patch \
- %D%/packages/patches/ganeti-preserve-PYTHONPATH.patch \
%D%/packages/patches/ganeti-shepherd-master-failover.patch \
%D%/packages/patches/ganeti-shepherd-support.patch \
%D%/packages/patches/gash-utils-ls-test.patch \
@@@ -1108,13 -1118,10 +1126,8 @@@
%D%/packages/patches/geoclue-config.patch \
%D%/packages/patches/ghc-8.0-fall-back-to-madv_dontneed.patch \
%D%/packages/patches/ghc-testsuite-dlopen-pie.patch \
- %D%/packages/patches/ghc-diff-swap-cover-args.patch \
- %D%/packages/patches/ghc-haddock-api-fix-haddock.patch \
- %D%/packages/patches/ghc-hpack-fix-tests.patch \
- %D%/packages/patches/ghc-microlens-aeson-fix-tests.patch \
+ %D%/packages/patches/ghc-language-haskell-extract-ghc-8.10.patch \
%D%/packages/patches/ghc-monad-par-fix-tests.patch \
- %D%/packages/patches/ghc-pandoc-fix-html-tests.patch \
- %D%/packages/patches/ghc-pandoc-fix-latex-test.patch \
- %D%/packages/patches/ghostscript-CVE-2020-15900.patch \
- %D%/packages/patches/ghostscript-freetype-compat.patch \
%D%/packages/patches/ghostscript-no-header-id.patch \
%D%/packages/patches/ghostscript-no-header-uuid.patch \
%D%/packages/patches/ghostscript-no-header-creationdate.patch \
@@@ -1494,14 -1516,14 +1508,15 @@@
%D%/packages/patches/nettle-3.5-CVE-2021-3580-pt2.patch \
%D%/packages/patches/nfs4-acl-tools-0.3.7-fixpaths.patch \
%D%/packages/patches/ngircd-handle-zombies.patch \
+ %D%/packages/patches/ngless-unliftio.patch \
%D%/packages/patches/network-manager-plugin-path.patch \
%D%/packages/patches/nginx-socket-cloexec.patch \
+ %D%/packages/patches/nnpack-system-libraries.patch \
%D%/packages/patches/nsis-env-passthru.patch \
%D%/packages/patches/nsis-source-date-epoch.patch \
+ %D%/packages/patches/nss-getcwd-nonnull.patch \
%D%/packages/patches/nss-increase-test-timeout.patch \
%D%/packages/patches/nss-3.56-pkgconfig.patch \
- %D%/packages/patches/ntfs-3g-CVE-2019-9755.patch \
%D%/packages/patches/nvi-assume-preserve-path.patch \
%D%/packages/patches/nvi-dbpagesize-binpower.patch \
%D%/packages/patches/nvi-db4.patch \
diff --cc gnu/packages/admin.scm
index aad8586,850372b..d0283a5
--- a/gnu/packages/admin.scm
+++ b/gnu/packages/admin.scm
@@@ -3103,9 -3087,8 +3102,8 @@@ done with the @code{auditctl} utility."
"install-nping")
(make ndiff "install-ndiff")
(wrap-program (string-append ndiff "/bin/ndiff")
- `("PYTHONPATH" prefix
+ `("GUIX_PYTHONPATH" prefix
- (,(python-path ndiff)))))
- #t))
+ (,(python-path ndiff)))))))
;; These are the tests that do not require network access.
(replace 'check
(lambda _ (invoke "make"
diff --cc gnu/packages/android.scm
index 448e2df,016943e..dad1114
--- a/gnu/packages/android.scm
+++ b/gnu/packages/android.scm
@@@ -4,14 -4,12 +4,13 @@@
;;; Copyright © 2016, 2020 Marius Bakke <mbakke@fastmail.com>
;;; Copyright © 2017 Julien Lepiller <julien@lepiller.eu>
;;; Copyright © 2017 Hartmut Goebel <h.goebel@crazy-compilers.com>
- ;;; Copyright © 2017, 2021 Maxim Cournoyer <maxim.cournoyer@gmail.com>
- ;;; Copyright © 2018, 2019, 2020 Tobias Geerinckx-Rice <me@tobias.gr>
-;;; Copyright © 2017, 2020 Maxim Cournoyer <maxim.cournoyer@gmail.com>
++;;; Copyright © 2017, 2020, 2021 Maxim Cournoyer <maxim.cournoyer@gmail.com>
+ ;;; Copyright © 2018–2021 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2018 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2019, 2020 Andreas Enge <andreas@enge.fr>
;;; Copyright © 2019 Ricardo Wurmus <rekado@elephly.net>
- ;;; Copyright © 2020 Maxim Cournoyer <maxim.cournoyer@gmail.com>
;;; Copyright © 2020 Sergey Trofimov <sarg@sarg.org.ru>
+;;; Copyright © 2021 Guillaume Le Vaillant <glv@posteo.net>
;;;
;;; This file is part of GNU Guix.
;;;
diff --cc gnu/packages/bioinformatics.scm
index d91ff13,7dec74f..7b41c06
--- a/gnu/packages/bioinformatics.scm
+++ b/gnu/packages/bioinformatics.scm
@@@ -10558,10 -10682,12 +10615,12 @@@ in an easily configurable manner."
(lambda* (#:key inputs #:allow-other-keys)
(setenv "TZ" "UTC+1")
(setenv "TZDIR"
- (string-append (assoc-ref inputs "tzdata")
- "/share/zoneinfo")))))))
+ (search-input-directory inputs
+ "share/zoneinfo")))))))
(native-inputs
- `(("tzdata" ,tzdata)))
+ `(("tzdata" ,tzdata)
+ ("automake" ,automake)
+ ("autoconf" ,autoconf)))
(inputs
`(("coreutils" ,coreutils)
("sed" ,sed)
diff --cc gnu/packages/check.scm
index 7b08f55,4701d61..c839f83
--- a/gnu/packages/check.scm
+++ b/gnu/packages/check.scm
@@@ -969,21 -948,20 +969,29 @@@ standard library."
(define-public python-pytest
(package
(name "python-pytest")
- (version "6.2.1")
- (version "5.3.5")
++ (version "6.2.4")
(source
(origin
(method url-fetch)
(uri (pypi-uri "pytest" version))
(sha256
(base32
- "01n3jny7m05r6g7gphbkj2xdms75ql93x69crd377hlvi6qikr36"))))
- "139i9cjhrv5aici3skq8iihvfb3lq0d8xb5j7qycr2hlk8cfjpqd"))))
++ "0jy5f83la1864ss42dhsi1mcm5nl79d8bjg7wk474nlw1c5avg2h"))))
(build-system python-build-system)
(arguments
`(#:phases
(modify-phases %standard-phases
++ (add-after 'unpack 'fix-version
++ ;; The version string is usually derived via setuptools-scm, but
++ ;; without the git metadata available, the version string is set to
++ ;; '0.0.0'.
++ (lambda _
++ (substitute* "setup.py"
++ (("setup\\(\\)")
++ (format #f "setup(version=~s)" ,version)))))
(replace 'check
(lambda* (#:key (tests? #t) #:allow-other-keys)
+ (setenv "TERM" "dumb") ;attempt disabling markup tests
(if tests?
(invoke "pytest" "-vv" "-k"
(string-append
diff --cc gnu/packages/chromium.scm
index 2b018d9,2b3f54e..534b9a4
--- a/gnu/packages/chromium.scm
+++ b/gnu/packages/chromium.scm
@@@ -854,8 -875,8 +875,8 @@@
("gdk-pixbuf" ,gdk-pixbuf)
("glib" ,glib)
("gtk+" ,gtk+)
- ("harfbuzz" ,harfbuzz)
+ ("harfbuzz" ,harfbuzz-3.0)
- ("icu4c" ,icu4c-69)
+ ("icu4c" ,icu4c)
("lcms" ,lcms)
("libevent" ,libevent)
("libffi" ,libffi)
diff --cc gnu/packages/emacs-xyz.scm
index 618a302,375e0ca..17dc6b4
--- a/gnu/packages/emacs-xyz.scm
+++ b/gnu/packages/emacs-xyz.scm
@@@ -23766,11 -23856,10 +23849,10 @@@ processes for Emacs"
(chmod "src/elisp/treemacs-customization.el" #o644)
(emacs-substitute-variables
"src/elisp/treemacs-customization.el"
("treemacs-python-executable"
- (string-append (assoc-ref inputs "python") "/bin/python3")))
+ (search-input-file inputs "/bin/python3")))
(chmod "src/elisp/treemacs-async.el" #o644)
(substitute* "src/elisp/treemacs-async.el"
- (("src/scripts") (string-append "share/" ,name "/scripts"))))
- #t))
+ (("src/scripts") (string-append "share/" ,name
"/scripts"))))))
(add-after 'install 'install-data
(lambda* (#:key outputs #:allow-other-keys)
(let ((out (assoc-ref outputs "out")))
diff --cc gnu/packages/file.scm
index 6fb9824,f811ba7..1c330e5
--- a/gnu/packages/file.scm
+++ b/gnu/packages/file.scm
@@@ -1,10 -1,8 +1,10 @@@
;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2013 Andreas Enge <andreas@enge.fr>
;;; Copyright © 2014, 2015 Mark H Weaver <mhw@netris.org>
- ;;; Copyright © 2016, 2017 Efraim Flashner <efraim@flashner.co.il>
+ ;;; Copyright © 2016, 2017, 2018 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2018 Tobias Geerinckx-Rice <me@tobias.gr>
+;;; Copyright © 2018 Efraim Flashner <efraim@flashner.co.il>
+;;; Copyright © 2020 Michael Rohleder <mike@rohleder.de>
;;;
;;; This file is part of GNU Guix.
;;;
diff --cc gnu/packages/fontutils.scm
index 8e0980d,2d7213f..2d24e9f
--- a/gnu/packages/fontutils.scm
+++ b/gnu/packages/fontutils.scm
@@@ -855,8 -808,10 +855,8 @@@ maintain the Noto Fonts project."
(file-name (git-file-name name version))
(sha256
(base32
- "00rwh5qfayihrq0wjx8pxqw5ah6g5ym6raxvdbqb6g6rk7m2j423"))))
+ "0z4bqap88pydkgcxrsvm3fmcyhi9x7z8knliarvdcvqlk7qnyzfh"))))
(build-system meson-build-system)
- (arguments
- `(#:meson ,meson-0.55))
(native-inputs
`(("check" ,check)
("gcc" ,gcc-10) ;TODO: Remove when the default compiler is > GCC 7.
diff --cc gnu/packages/freedesktop.scm
index 50364a5,5141259..52bdcae
--- a/gnu/packages/freedesktop.scm
+++ b/gnu/packages/freedesktop.scm
@@@ -22,11 -22,8 +22,10 @@@
;;; Copyright © 2020 Nicolò Balzarotti <nicolo@nixo.xyz>
;;; Copyright © 2020 Anders Thuné <asse.97@gmail.com>
;;; Copyright © 2020 Raghav Gururajan <raghavgururajan@disroot.org>
- ;;; Copyright © 2021 Brendan Tildesley <mail@brendan.scot>
;;; Copyright © 2021 pineapples <guixuser6392@protonmail.com>
+;;; Copyright © 2021 Sarah Morgensen <iskarian@mgsn.dev>
;;; Copyright © 2021 Robby Zambito <contact@robbyzambito.me>
+;;; Copyright © 2021 Maxime Devos <maximedevos@telenet.be>
;;;
;;; This file is part of GNU Guix.
;;;
diff --cc gnu/packages/games.scm
index 958a552,3b8946e..62dc30a
--- a/gnu/packages/games.scm
+++ b/gnu/packages/games.scm
@@@ -42,9 -42,10 +42,10 @@@
;;; Copyright © 2019 Julien Lepiller <julien@lepiller.eu>
;;; Copyright © 2019, 2020 Jesse Gibbons <jgibbons2357+guix@gmail.com>
;;; Copyright © 2019 Dan Frumin <dfrumin@cs.ru.nl>
-;;; Copyright © 2019, 2020 Guillaume Le Vaillant <glv@posteo.net>
+;;; Copyright © 2019, 2020, 2021 Guillaume Le Vaillant <glv@posteo.net>
;;; Copyright © 2019, 2020 Timotej Lazar <timotej.lazar@araneo.si>
;;; Copyright © 2019 Josh Holland <josh@inv.alid.pw>
+ ;;; Copyright © 2019 Pkill -9 <pkill9@runbox.com>
;;; Copyright © 2017, 2019 Hartmut Goebel <h.goebel@crazy-compilers.com>
;;; Copyright © 2020 Alberto Eleuterio Flores Guerrero
<barbanegra+guix@posteo.mx>
;;; Copyright © 2020 Naga Malleswari <nagamalli@riseup.net>
diff --cc gnu/packages/geo.scm
index 12108f6,f460e08..938720f
--- a/gnu/packages/geo.scm
+++ b/gnu/packages/geo.scm
@@@ -1259,13 -1418,9 +1404,13 @@@ map display. Downloads map data from
("libnova" ,libnova)
("libpng" ,libpng)
("openjpeg" ,openjpeg)
- ("proj.4" ,proj.4)
+ ("proj" ,proj)
("qtbase" ,qtbase-5)
("zlib" ,zlib)))
+ (native-search-paths
+ (list (search-path-specification
+ (variable "XDG_DATA_DIRS")
+ (files '("share")))))
(synopsis "Weather Forecast Visualization")
(description
"XyGrib is a Grib file reader and visualizes meteorological data
providing
diff --cc gnu/packages/gimp.scm
index 50024e0,ae59385..5f949a5
--- a/gnu/packages/gimp.scm
+++ b/gnu/packages/gimp.scm
@@@ -182,14 -187,14 +187,16 @@@ of a larger interface."
"/babl-" version ".tar.xz")))
(sha256
(base32
- "1w68h81kqkqnziixrx21qs0gfv2z79651h19sxn226xdb58mjgqb"))))
+ "0fbh2ss1dy3sba4xjmfm4vxxjmx9a6rzgba9ycjygchbm957y3ag"))))
(build-system meson-build-system)
(arguments
- `(#:meson ,meson-0.55))
+ `(#:configure-flags
+ (list "-Denable-gir=false"
+ "-Dwith-docs=false")))
(native-inputs
- `(("pkg-config" ,pkg-config)))
+ `(("gobject-introspection" ,gobject-introspection)
+ ("pkg-config" ,pkg-config)
+ ("vala" ,vala)))
(propagated-inputs
;; Propagated to satisfy ‘babl.pc’.
`(("lcms" ,lcms)))
@@@ -222,11 -227,10 +229,11 @@@ provided, as well as a framework to ad
"/gegl-" version ".tar.xz")))
(sha256
(base32
- "1pd8xkx70k0fsi1hrzrmaify7112wjmxzk0p6bi6js89yhn7h4n1"))))
+ "18cg566lplw7y7dn5v05pal24vxbfiic6097a40gnxdgkxmkr3k6"))))
(build-system meson-build-system)
(arguments
- `(#:meson ,meson-0.55
+ `(#:configure-flags
+ (list "-Dintrospection=false")
#:phases
(modify-phases %standard-phases
(add-after 'unpack 'extend-test-time-outs
diff --cc gnu/packages/gnome.scm
index be127a0,3a682ba..5d36068
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@@ -60,10 -60,7 +60,11 @@@
;;; Copyright © 2020, 2021 Sébastien Lerique <sl@eauchat.org>
;;; Copyright © 2021 Trevor Hass <thass@okstate.edu>
;;; Copyright © 2021 Solene Rapenne <solene@perso.pw>
+;;; Copyright © 2021 Guillaume Le Vaillant <glv@posteo.net>
+;;; Copyright © 2021 Felix Gruber <felgru@posteo.net>
+;;; Copyright © 2021 Maxime Devos <maximedevos@telenet.be>
+;;; Copyright © 2021 Josselin Poiret <josselin.poiret@protonmail.ch>
+ ;;; Copyright © 2021 Mathieu Othacehe <othacehe@gnu.org>
;;;
;;; This file is part of GNU Guix.
;;;
@@@ -12498,45 -12336,31 +12504,74 @@@ world."
Document Analysis and Recognition program.")
(license license:gpl3+)))
+(define-public libadwaita
+ (let ((commit "8d66b987a19979d9d7b85dacc6bad5ce0c8743fe")
+ (revision "1"))
+ (package
+ (name "libadwaita")
+ (version (git-version "0.0.1" revision commit))
+ (source (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://gitlab.gnome.org/GNOME/libadwaita.git";)
+ (commit commit)))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "0i3wav6jsyi4w4i2r1rad769m5y5s9djj4zqb7dfyh0bad24ba3q"))))
+ (build-system meson-build-system)
+ (arguments
+ `(#:phases
+ (modify-phases %standard-phases
+ (add-before 'check 'pre-check
+ (lambda* (#:key inputs #:allow-other-keys)
+ ;; Tests require a running X server.
+ (system "Xvfb :1 &")
+ (setenv "DISPLAY" ":1"))))))
+ (native-inputs
+ `(("sassc" ,sassc)
+ ("glib:bin" ,glib "bin")
+ ("gtk-doc" ,gtk-doc/stable)
+ ("pkg-config" ,pkg-config)
+ ("vala" ,vala)
+ ("xvfb" ,xorg-server-for-tests)))
+ (inputs
+ `(("gtk" ,gtk)
+ ("gobject-introspection" ,gobject-introspection)
+ ("libportal" ,libportal)))
+ (home-page "https://gnome.pages.gitlab.gnome.org/libadwaita/";)
+ (synopsis "Building blocks for GNOME applications")
+ (description
+ "@code(libadwaita) offers widgets and objects to build GNOME
+applications scaling from desktop workstations to mobile phones. It is the
+successor of @code{libhandy} for GTK4.")
+ (license license:lgpl2.1+))))
++
+ (define-public gnome-power-manager
+ (package
+ (name "gnome-power-manager")
+ (version "3.32.0")
+ (source (origin
+ (method url-fetch)
+ (uri (string-append "mirror://gnome/sources/" name "/"
+ (version-major+minor version) "/"
+ name "-" version ".tar.xz"))
+ (sha256
+ (base32
+ "0drfn3wcc8l4n07qwv6p0rw2dwcd00hwzda282q62l6sasks2b2g"))))
+ (build-system meson-build-system)
+ (inputs
+ `(("upower" ,upower)
+ ("gtk+" ,gtk+)
+ ("gsettings-desktop-schemas" ,gsettings-desktop-schemas)
+ ("adwaita-icon-theme" ,adwaita-icon-theme)))
+ (native-inputs
+ `(("desktop-file-utils" ,desktop-file-utils)
+ ("glib:bin" ,glib "bin")
+ ("gettext" ,gettext-minimal)
+ ("pkg-config" ,pkg-config)))
+ (home-page "https://gitlab.gnome.org/GNOME/gnome-power-manager";)
+ (synopsis "Power management daemon for the GNOME desktop")
+ (description "@code{gnome-power-manager} is a tool for viewing present and
+ historical battery usage and related statistics.")
+ (license license:gpl2)))
diff --cc gnu/packages/gps.scm
index 19f8a73,de8ff13..674f19a
--- a/gnu/packages/gps.scm
+++ b/gnu/packages/gps.scm
@@@ -282,10 -280,9 +280,9 @@@ such as elevation, speed, heart rate, p
":")))
(for-each (lambda (script)
(wrap-program (string-append out "/bin/" script)
- `("PYTHONPATH" ":" prefix (,pythonpath))))
+ `("GUIX_PYTHONPATH" ":" prefix (,pythonpath))))
'("gegps" "gpscat" "gpsfake" "gpsprof"
- "ubxtool" "xgps" "xgpsspeed" "zerk")))
- #t)))))
+ "ubxtool" "xgps" "xgpsspeed" "zerk"))))))))
(synopsis "GPS service daemon")
(description
"@code{gpsd} is a service daemon that monitors one or more GPSes or AIS
diff --cc gnu/packages/image-viewers.scm
index de83084,0bd53aa..dc23420
--- a/gnu/packages/image-viewers.scm
+++ b/gnu/packages/image-viewers.scm
@@@ -20,7 -20,7 +20,8 @@@
;;; Copyright © 2021 Stefan Reichör <stefan@xsteve.at>
;;; Copyright © 2021 Raghav Gururajan <rg@raghavgururajan.name>
;;; Copyright © 2021 jgart <jgart@dismail.de>
+;;; Copyright © 2021 Guillaume Le Vaillant <glv@posteo.net>
+ ;;; Copyright © 2021 Zheng Junjie <873216071@qq.com>
;;;
;;; This file is part of GNU Guix.
;;;
diff --cc gnu/packages/ocaml.scm
index ccbc6dd,025bac6..48fbea7
--- a/gnu/packages/ocaml.scm
+++ b/gnu/packages/ocaml.scm
@@@ -1400,24 -1403,12 +1405,11 @@@ other XUnit testing frameworks."
(arguments
`(#:phases
(modify-phases %standard-phases
- (delete 'configure)
- (add-after 'install 'install-camlzip
- (lambda* (#:key outputs #:allow-other-keys)
- (let* ((out (assoc-ref outputs "out"))
- (dir (string-append out "/lib/ocaml/site-lib/camlzip")))
- (mkdir-p dir)
- (call-with-output-file (string-append dir "/META")
- (lambda (port)
- (format port "version=\"1.06\"\n")
- (format port "requires=\"unix\"\n")
- (format port "archive(byte)=\"zip.cma\"\n")
- (format port "archive(native)=\"zip.cmxa\"\n")
- (format port "archive(native,plugin)=\"zip.cmxs\"\n")
- (format port "directory=\"../zip\"\n")))))))
+ (delete 'configure))
#:install-target "install-findlib"
#:make-flags
- (list "all" "allopt"
- (string-append "INSTALLDIR=" (assoc-ref %outputs "out")
- "/lib/ocaml"))))
+ ,#~(list "all" "allopt"
+ (string-append "INSTALLDIR=" #$output "/lib/ocaml"))))
(home-page "https://github.com/xavierleroy/camlzip";)
(synopsis "Provides easy access to compressed files")
(description "Provides easy access to compressed files in ZIP, GZIP and
diff --cc gnu/packages/python-xyz.scm
index 9821e92,d8a2f08..719096d
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@@ -25246,10 -25735,11 +25692,11 @@@ By default it uses the open Python vuln
(propagated-inputs
`(("wheel" ,python-wheel)))
(native-inputs
- `(("texlive" ,(texlive-union (list texlive-amsfonts/patched
+ `(("texlive" ,(texlive-updmap.cfg (list texlive-amsfonts
texlive-fonts-ec
- texlive-iftex
- texlive-latex-hyperref
- texlive-latex-oberdiek
++ texlive-generic-iftex
+ texlive-hyperref
+ texlive-oberdiek
texlive-lm
texlive-xcolor)))))
(arguments
diff --cc gnu/packages/python.scm
index 08d7c2f,6fa0987..92f4273
--- a/gnu/packages/python.scm
+++ b/gnu/packages/python.scm
@@@ -26,13 -26,12 +26,12 @@@
;;; Copyright © 2016, 2017 Nikita <nikita@n0.is>
;;; Copyright © 2016 Dylan Jeffers <sapientech@sapientech@openmailbox.org>
;;; Copyright © 2016 David Craven <david@craven.ch>
-;;; Copyright © 2016, 2017, 2018, 2019, 2020 Marius Bakke
<mbakke@fastmail.com>
+;;; Copyright © 2016, 2017, 2018, 2019, 2020, 2021 Marius Bakke
<marius@gnu.org>
;;; Copyright © 2016, 2017 Stefan Reichör <stefan@xsteve.at>
- ;;; Copyright © 2016 Dylan Jeffers <sapientech@sapientech@openmailbox.org>
;;; Copyright © 2016, 2017 Alex Vong <alexvong1995@gmail.com>
;;; Copyright © 2016, 2017, 2018 Arun Isaac <arunisaac@systemreboot.net>
-;;; Copyright © 2016, 2017, 2018 Julien Lepiller <julien@lepiller.eu>
;;; Copyright © 2016–2018, 2021 Tobias Geerinckx-Rice <me@tobias.gr>
+;;; Copyright © 2016, 2017, 2018, 2021 Julien Lepiller <julien@lepiller.eu>
;;; Copyright © 2016, 2017 Thomas Danckaert <post@thomasdanckaert.be>
;;; Copyright © 2017 Carlo Zancanaro <carlo@zancanaro.id.au>
;;; Copyright © 2017 Frederick M. Muriithi <fredmanglis@gmail.com>
diff --cc gnu/packages/ruby.scm
index 9dfa504,e9db2cf..332a03f
--- a/gnu/packages/ruby.scm
+++ b/gnu/packages/ruby.scm
@@@ -1151,21 -1149,14 +1151,13 @@@ structure. Supports custom object form
"03a11clhycyn0jhc7g9davpqd83sn60jqwjy1y145ag9sq6sp935"))))
(build-system ruby-build-system)
(arguments
- `(#:phases
+ `(#:tests? #f ; Disable tests since they depend on pandoc behavior
+ ; and there are no upstream releases.
+ #:phases
(modify-phases %standard-phases
- (add-after 'unpack 'disable-failing-tests
- ;; TODO: Remove this phase after ghc-pandoc gets upgraded to 2.9.2+
- ;; (see: https://github.com/xwmx/pandoc-ruby/issues/39).
- (lambda _
- (substitute* "test/test_conversions.rb"
- (("next if from == to.*" all)
- (string-append
- all
- " next if ['plain', 'beamer'].include? to\n")))
- #t))
(add-after 'unpack 'patch-pandoc-path
(lambda* (#:key inputs #:allow-other-keys)
- (let ((pandoc (string-append (assoc-ref inputs "pandoc")
- "/bin/pandoc")))
+ (let ((pandoc (search-input-file inputs "/bin/pandoc")))
(substitute* "lib/pandoc-ruby.rb"
(("@@pandoc_path = 'pandoc'")
(format #f "@@pandoc_path = '~a'" pandoc)))
diff --cc gnu/packages/spice.scm
index b21394e,9c88b63..94976ab
--- a/gnu/packages/spice.scm
+++ b/gnu/packages/spice.scm
@@@ -342,13 -334,23 +342,12 @@@ resolution scaling on graphical consol
(method url-fetch)
(uri (string-append
"https://gitlab.freedesktop.org/spice/libcacard/uploads/";
- "9d8f24b131bcbbd7846727ea92952cb5"
+ "13b249e695a0d9aa7cb501b1a85ebab1"
"/libcacard-" version ".tar.xz"))
- (patches (search-patches "libcacard-unknown-variable.patch"))
(sha256
(base32
- "0azj3rqr2smg0lai24xrn3zr628xmjfrzcggay877zrr64ybj1c0"))))
+ "1rrjlclm6ad63gah1fa4yfwrz4z6vgq2yrybbvzvvdbxrgl4vgzv"))))
(build-system meson-build-system)
- (arguments
- '(#:tests? #f ; TODO Tests require gnutls built with
- ; p11-kit
- #:phases
- (modify-phases %standard-phases
- (add-after 'unpack 'patch-tests
- (lambda* (#:key inputs #:allow-other-keys)
- (substitute* "tests/setup-softhsm2.sh"
- (("\\/usr\\/lib64\\/pkcs11\\/libsofthsm2\\.so")
- (string-append (assoc-ref inputs "softhsm")
- "/lib/softhsm/libsofthsm2.so"))))))))
(propagated-inputs
`(("glib" ,glib) ; Requires: in the pkg-config file
("nss" ,nss) ; Requires.private: in the pkg-config
diff --cc gnu/packages/syndication.scm
index dc577b8,fef315c..7f2153f
--- a/gnu/packages/syndication.scm
+++ b/gnu/packages/syndication.scm
@@@ -1,8 -1,7 +1,8 @@@
;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2016, 2017, 2019, 2020, 2021 Efraim Flashner
<efraim@flashner.co.il>
- ;;; Copyright © 2018, 2019 Tobias Geerinckx-Rice <me@tobias.gr>
+ ;;; Copyright © 2018, 2019, 2021 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2020 Vinicius Monego <monego@posteo.net>
+;;; Copyright © 2021 Felix Gruber <felgru@posteo.net>
;;;
;;; This file is part of GNU Guix.
;;;
diff --cc gnu/packages/video.scm
index 452974d,fcac369..2830aaa
--- a/gnu/packages/video.scm
+++ b/gnu/packages/video.scm
@@@ -53,7 -52,7 +52,8 @@@
;;; Copyright © 2021 Maxim Cournoyer <maxim.cournoyer@gmail.com>
;;; Copyright © 2020 Hartmut Goebel <h.goebel@crazy-compilers.com>
;;; Copyright © 2021 Raghav Gururajan <rg@raghavgururajan.name>
+;;; Copyright © 2021 Thiago Jung Bauermann <bauermann@kolabnow.com>
+ ;;; Copyright © 2021 Petr Hodina <phodina@protonmail.com>
;;;
;;; This file is part of GNU Guix.
;;;
diff --cc gnu/packages/virtualization.scm
index 8e6c9ed,e5da1b5..eeb06b7
--- a/gnu/packages/virtualization.scm
+++ b/gnu/packages/virtualization.scm
@@@ -449,11 -524,10 +523,9 @@@ firmware blobs. You ca
(file-name (git-file-name name version))
(patches (search-patches "ganeti-shepherd-support.patch"
"ganeti-shepherd-master-failover.patch"
- "ganeti-deterministic-manual.patch"
- "ganeti-drbd-compat.patch"
- "ganeti-os-disk-size.patch"
+ "ganeti-haskell-compat.patch"
"ganeti-haskell-pythondir.patch"
- "ganeti-disable-version-symlinks.patch"
- "ganeti-preserve-PYTHONPATH.patch"))))
+
"ganeti-disable-version-symlinks.patch"))))
(build-system gnu-build-system)
(arguments
`(#:imported-modules (,@%gnu-build-system-modules
@@@ -1385,12 -1614,10 +1574,11 @@@ domains, their live performance and res
;; /usr/include/..., which obviously does not exist.
(let* ((file "google/protobuf/descriptor.proto")
(target (string-append "images/" file))
- (source (string-append (assoc-ref inputs "protobuf")
- "/include/" file)))
+ (source (search-input-file
+ inputs
+ (string-append "include/" file))))
(delete-file target)
- (symlink source target)
- #t)))
+ (symlink source target))))
(add-after 'install 'wrap
(lambda* (#:key inputs outputs #:allow-other-keys)
;; Make sure 'crit' runs with the correct PYTHONPATH.
@@@ -1400,10 -1627,14 +1588,14 @@@
(string-take (string-take-right
(assoc-ref inputs
"python") 5) 3)
"/site-packages:"
- (getenv "PYTHONPATH"))))
+ (or (getenv "GUIX_PYTHONPATH") ""))))
(wrap-program (string-append out "/bin/crit")
- `("GUIX_PYTHONPATH" ":" prefix (,path))))
- #t)))))
- `("PYTHONPATH" ":" prefix (,path))))))
++ `("GUIX_PYTHONPATH" ":" prefix (,path))))))
+ (add-after 'install 'delete-static-libraries
+ ;; Not building/installing these at all doesn't seem to be
supported.
+ (lambda* (#:key outputs #:allow-other-keys)
+ (let ((out (assoc-ref outputs "out")))
+ (for-each delete-file (find-files out "\\.a$"))))))))
(inputs
`(("protobuf" ,protobuf)
("python" ,python-2)
diff --cc gnu/packages/vpn.scm
index 852d003,4624e2b..67ef4a4
--- a/gnu/packages/vpn.scm
+++ b/gnu/packages/vpn.scm
@@@ -1058,16 -1053,17 +1056,18 @@@ WireGuard was added to Linux 5.6."
(lambda* (#:key inputs outputs #:allow-other-keys)
(let* ((out (assoc-ref outputs "out"))
(inputs-sbin (map (lambda (input)
- (string-append (assoc-ref inputs
input) "/sbin"))
- (list "resolvconf" "iproute" "procps"
- "iptables")))
- (coreutils (string-append (assoc-ref inputs "coreutils")
- "/bin")))
+ (string-append (assoc-ref inputs
input)
+ "/sbin"))
+ (list "iproute"
+ "iptables"
+ "procps"
+ "resolvconf")))
+ (coreutils (string-append (assoc-ref inputs "coreutils")
+ "/bin")))
(wrap-program (string-append out "/bin/wg-quick")
+ #:sh (search-input-file inputs "bin/bash")
`("PATH" ":" prefix ,(append inputs-sbin
- (list coreutils))))
- #t))))))
+ (list coreutils))))))))))
(inputs
`(("resolvconf" ,openresolv)
("coreutils" ,coreutils)
diff --cc guix/build-system/linux-module.scm
index 7bafee5,548ed7a..0eab919
--- a/guix/build-system/linux-module.scm
+++ b/guix/build-system/linux-module.scm
@@@ -1,7 -1,7 +1,8 @@@
;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2019 Danny Milosavljevic <dannym@scratchpost.org>
;;; Copyright © 2020 Mathieu Othacehe <m.othacehe@gmail.com>
+;;; Copyright © 2021 Ludovic Courtès <ludo@gnu.org>
+ ;;; Copyright © 2021 Tobias Geerinckx-Rice <me@tobias.gr>
;;;
;;; This file is part of GNU Guix.
;;;
@@@ -150,14 -149,16 +151,15 @@@
(build (if target linux-module-build-cross linux-module-build))
(arguments (strip-keyword-arguments private-keywords arguments))))
-(define* (linux-module-build store name inputs
+(define* (linux-module-build name inputs
#:key
- target
+ source target
(search-paths '())
(tests? #t)
- (phases '(@ (guix build
linux-module-build-system)
- %standard-phases))
+ (phases '%standard-phases)
(outputs '("out"))
(make-flags ''())
+ (parallel-build? #t)
(system (%current-system))
(source-directory ".")
(guile #f)
@@@ -168,36 -169,50 +170,37 @@@
(guix build utils))))
"Build SOURCE using LINUX, and with INPUTS."
(define builder
- `(begin
- (use-modules ,@modules)
- (linux-module-build #:name ,name
- #:source ,(match (assoc-ref inputs "source")
- (((? derivation? source))
- (derivation->output-path source))
- ((source)
- source)
- (source
- source))
- #:source-directory ,source-directory
- #:search-paths ',(map search-path-specification->sexp
- search-paths)
- #:phases ,phases
- #:system ,system
- #:target ,target
- #:arch ,(system->arch (or target system))
- #:tests? ,tests?
- #:outputs %outputs
- #:make-flags ,make-flags
- #:parallel-build? ,parallel-build?
- #:inputs %build-inputs)))
+ (with-imported-modules imported-modules
+ #~(begin
+ (use-modules #$@(sexp->gexp modules))
+ (linux-module-build #:name #$name
+ #:source #+source
+ #:source-directory #$source-directory
+ #:search-paths '#$(sexp->gexp
+ (map
search-path-specification->sexp
+ search-paths))
+ #:phases #$phases
+ #:system #$system
+ #:target #$target
+ #:arch #$(system->arch (or target system))
+ #:tests? #$tests?
+ #:outputs #$(outputs->gexp outputs)
+ #:make-flags #$make-flags
++ #:parallel-build? #$parallel-build?
+ #:inputs #$(input-tuples->gexp inputs)))))
- (define guile-for-build
- (match guile
- ((? package?)
- (package-derivation store guile system #:graft? #f))
- (#f ; the default
- (let* ((distro (resolve-interface '(gnu packages commencement)))
- (guile (module-ref distro 'guile-final)))
- (package-derivation store guile system #:graft? #f)))))
-
- (build-expression->derivation store name builder
- #:system system
- #:inputs inputs
- #:modules imported-modules
- #:outputs outputs
- #:guile-for-build guile-for-build
- #:substitutable? substitutable?))
+ (mlet %store-monad ((guile (package->derivation (or guile (default-guile))
+ system #:graft? #f)))
+ (gexp->derivation name builder
+ #:system system
+ #:guile-for-build guile
+ #:substitutable? substitutable?)))
(define* (linux-module-build-cross
- store name
+ name
#:key
- target native-drvs target-drvs
+ source target
+ build-inputs target-inputs host-inputs
(guile #f)
(outputs '("out"))
(make-flags ''())
diff --cc guix/build-system/renpy.scm
index 0ee73ec,5ed59bf..f107095
--- a/guix/build-system/renpy.scm
+++ b/guix/build-system/renpy.scm
@@@ -1,6 -1,5 +1,7 @@@
;;; GNU Guix --- Functional package management for GNU
+;;; Copyright © 2021 Leo Prikler <leo.prikler@student.tugraz.at>
+;;; Copyright © 2021 Ludovic Courtès <ludo@gnu.org>
+ ;;; Copyright © 2021 Liliana Marie Prikler <liliana.prikler@gmail.com>
;;;
;;; This file is part of GNU Guix.
;;;