[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: |
Wed, 18 Nov 2020 18:10:08 -0500 (EST) |
mbakke pushed a commit to branch staging
in repository guix.
commit 35ed83beae51c05069ed6754dd26cf0f549808ab
Merge: 38f4c54 0305bc9
Author: Marius Bakke <marius@gnu.org>
AuthorDate: Thu Nov 19 00:04:32 2020 +0100
Merge branch 'master' into staging
.dir-locals.el | 38 +-
Makefile.am | 23 +-
NEWS | 4 +
build-aux/update-guix-package.scm | 73 ++-
doc/contributing.texi | 11 +-
doc/guix.texi | 57 +-
etc/guix-daemon.cil.in | 180 +++++-
gnu/bootloader.scm | 125 +++-
gnu/bootloader/grub.scm | 33 +-
gnu/installer/parted.scm | 27 +-
gnu/installer/utils.scm | 14 +
gnu/local.mk | 6 +-
gnu/packages/admin.scm | 72 ++-
gnu/packages/assembly.scm | 14 +-
gnu/packages/audio.scm | 8 +-
gnu/packages/authentication.scm | 6 +-
gnu/packages/backup.scm | 4 +-
gnu/packages/bittorrent.scm | 14 +-
gnu/packages/bootloaders.scm | 34 +-
gnu/packages/build-tools.scm | 5 +-
gnu/packages/c.scm | 6 +-
gnu/packages/compression.scm | 23 +-
gnu/packages/cpp.scm | 15 +-
gnu/packages/crypto.scm | 18 +-
gnu/packages/cups.scm | 52 +-
gnu/packages/databases.scm | 15 +-
gnu/packages/disk.scm | 4 +-
gnu/packages/djvu.scm | 48 ++
gnu/packages/education.scm | 4 +-
gnu/packages/emacs-xyz.scm | 80 ++-
gnu/packages/embedded.scm | 9 +-
gnu/packages/finance.scm | 18 +-
gnu/packages/game-development.scm | 9 +-
gnu/packages/games.scm | 9 +-
gnu/packages/glib.scm | 14 +-
gnu/packages/gnome.scm | 20 +-
gnu/packages/gnu-pw-mgr.scm | 8 +-
gnu/packages/gnupg.scm | 4 +-
gnu/packages/gnuzilla.scm | 20 +-
gnu/packages/graphics.scm | 4 +-
gnu/packages/javascript.scm | 4 +-
gnu/packages/lua.scm | 9 +-
gnu/packages/mail.scm | 178 +++++-
gnu/packages/maths.scm | 9 +-
gnu/packages/monitoring.scm | 4 +-
gnu/packages/networking.scm | 32 +-
gnu/packages/node.scm | 4 +-
gnu/packages/ocaml.scm | 4 +-
gnu/packages/package-management.scm | 16 +-
.../patches/bitcoin-core-python-compat.patch | 28 -
gnu/packages/patches/gcc-6-fix-buffer-size.patch | 15 +
gnu/packages/patches/gcc-6-fix-isl-includes.patch | 16 +
gnu/packages/patches/glib-appinfo-watch.patch | 92 +++
gnu/packages/patches/icecat-makeicecat.patch | 4 +-
.../scribus-1.5.5-poppler-0.86-build-fix.patch | 642 ---------------------
gnu/packages/patches/tomb-fix-errors-on-open.patch | 25 -
gnu/packages/pdf.scm | 4 +-
gnu/packages/python-web.scm | 33 +-
gnu/packages/python-xyz.scm | 153 ++++-
gnu/packages/radio.scm | 4 +-
gnu/packages/scribus.scm | 9 +-
gnu/packages/version-control.scm | 10 +
gnu/packages/video.scm | 22 +-
gnu/packages/virtualization.scm | 13 +-
gnu/packages/vpn.scm | 9 +-
gnu/packages/web.scm | 4 +-
gnu/packages/xdisorg.scm | 4 +-
gnu/packages/xorg.scm | 22 +-
gnu/services/base.scm | 6 +
gnu/services/cups.scm | 2 +-
gnu/services/shepherd.scm | 13 +-
gnu/services/vpn.scm | 6 +-
gnu/system/image.scm | 4 +-
gnu/system/vm.scm | 72 ---
guix/scripts/build.scm | 4 +-
guix/scripts/pack.scm | 5 +
guix/scripts/publish.scm | 28 +-
guix/scripts/pull.scm | 2 +-
guix/scripts/refresh.scm | 2 +-
guix/scripts/system.scm | 21 +-
guix/self.scm | 10 +-
guix/utils.scm | 6 +
po/guix/POTFILES.in | 20 +
tests/build-utils.scm | 4 +-
84 files changed, 1546 insertions(+), 1156 deletions(-)
diff --cc gnu/packages/databases.scm
index a6c8179,79bc173..a831692
--- a/gnu/packages/databases.scm
+++ b/gnu/packages/databases.scm
@@@ -1307,8 -1323,7 +1307,7 @@@ organized in a hash table or B+ tree."
(native-inputs `(("bc" ,bc)
("bash:include" ,bash "include")
- ("check" ,check)
+ ("check" ,check-0.14)
- ("libuuid" ,util-linux)
("pkg-config" ,pkg-config)))
;; TODO: Add more optional inputs.