[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
01/03: Merge branch 'master' into core-updates
|
From: |
guix-commits |
|
Subject: |
01/03: Merge branch 'master' into core-updates |
|
Date: |
Sat, 22 May 2021 11:31:52 -0400 (EDT) |
mbakke pushed a commit to branch core-updates
in repository guix.
commit 4ea6852c5ff1606cf6848f3ddbb669120b228c13
Merge: fcf45f8 d4ffa96
Author: Marius Bakke <marius@gnu.org>
AuthorDate: Sat May 22 17:21:57 2021 +0200
Merge branch 'master' into core-updates
Makefile.am | 9 +-
README | 2 +-
ROADMAP | 2 +-
doc/contributing.texi | 2 +-
doc/guix.texi | 113 +-
gnu/local.mk | 11 +-
gnu/packages/admin.scm | 18 +-
gnu/packages/algebra.scm | 4 +-
gnu/packages/aspell.scm | 4 +
gnu/packages/aux-files/linux-libre/5.11-arm.conf | 9944 -----------------
gnu/packages/aux-files/linux-libre/5.11-arm64.conf | 10153 -----------------
gnu/packages/aux-files/linux-libre/5.11-i686.conf | 10792 ------------------
.../aux-files/linux-libre/5.11-x86_64.conf | 10828 -------------------
gnu/packages/backup.scm | 10 +-
gnu/packages/benchmark.scm | 39 +
gnu/packages/bioconductor.scm | 4 +-
gnu/packages/bioinformatics.scm | 8 +-
gnu/packages/c.scm | 41 +-
gnu/packages/check.scm | 54 +-
gnu/packages/code.scm | 56 +-
gnu/packages/compression.scm | 16 +-
gnu/packages/cran.scm | 244 +-
gnu/packages/databases.scm | 33 +-
gnu/packages/disk.scm | 1 +
gnu/packages/dlang.scm | 11 +
gnu/packages/dns.scm | 4 +-
gnu/packages/documentation.scm | 44 +-
gnu/packages/emacs-xyz.scm | 239 +-
gnu/packages/embedded.scm | 25 +-
gnu/packages/emulators.scm | 9 +-
gnu/packages/engineering.scm | 8 +
gnu/packages/fabric-management.scm | 6 +-
gnu/packages/file-systems.scm | 83 +
gnu/packages/finance.scm | 41 +-
gnu/packages/fonts.scm | 20 +
gnu/packages/game-development.scm | 56 +-
gnu/packages/games.scm | 74 +-
gnu/packages/gcc.scm | 4 +-
gnu/packages/glib.scm | 4 +-
gnu/packages/gnome.scm | 4 +-
gnu/packages/graph.scm | 61 +
gnu/packages/graphics.scm | 1 +
gnu/packages/graphviz.scm | 10 +
gnu/packages/gtk.scm | 6 +-
gnu/packages/guile-xyz.scm | 38 +-
gnu/packages/hurd.scm | 1 -
gnu/packages/jose.scm | 13 +-
gnu/packages/julia-xyz.scm | 712 +-
gnu/packages/libreoffice.scm | 8 +-
gnu/packages/linux.scm | 115 +-
gnu/packages/lisp-xyz.scm | 380 +-
gnu/packages/lisp.scm | 4 +-
gnu/packages/mail.scm | 4 +-
gnu/packages/maths.scm | 59 +-
gnu/packages/music.scm | 29 +-
gnu/packages/networking.scm | 114 +-
gnu/packages/ntp.scm | 11 +
gnu/packages/package-management.scm | 10 +-
gnu/packages/patches/autotrace-glib-compat.patch | 50 +
.../patches/disarchive-cross-compilation.patch | 77 +
gnu/packages/patches/graphviz-CVE-2020-18032.patch | 49 +
gnu/packages/patches/libblockdev-glib-compat.patch | 61 +
.../patches/libxml2-xpath0-Add-option-xpath0.patch | 129 +
.../patches/mercurial-hg-extension-path.patch | 29 +
gnu/packages/patches/pinball-const-fix.patch | 11 -
gnu/packages/patches/pinball-cstddef.patch | 38 -
.../patches/pinball-missing-separators.patch | 101 -
gnu/packages/patches/pinball-src-deps.patch | 24 -
gnu/packages/patches/pinball-system-ltdl.patch | 24 +-
.../patches/rxvt-unicode-escape-sequences.patch | 35 -
gnu/packages/patches/ucx-tcp-iface-ioctl.patch | 43 +-
gnu/packages/perl-compression.scm | 6 +-
gnu/packages/perl-web.scm | 5 +-
gnu/packages/perl.scm | 118 +-
gnu/packages/python-check.scm | 19 +
gnu/packages/python-xyz.scm | 84 +-
gnu/packages/qt.scm | 51 +
gnu/packages/radio.scm | 116 +-
gnu/packages/re2c.scm | 4 +-
gnu/packages/rust.scm | 10 +
gnu/packages/sdl.scm | 4 +-
gnu/packages/security-token.scm | 11 +-
gnu/packages/statistics.scm | 77 +-
gnu/packages/version-control.scm | 71 +-
gnu/packages/video.scm | 12 +-
gnu/packages/vim.scm | 38 +
gnu/packages/virtualization.scm | 27 +-
gnu/packages/web-browsers.scm | 17 +-
gnu/packages/web.scm | 4 +-
gnu/packages/wm.scm | 6 +-
gnu/packages/xdisorg.scm | 26 +-
gnu/packages/xfce.scm | 8 +-
gnu/packages/xml.scm | 33 +-
gnu/services/configuration.scm | 45 +-
gnu/services/networking.scm | 135 +-
gnu/system/vm.scm | 5 -
guix/inferior.scm | 22 +
guix/scripts/challenge.scm | 3 +-
guix/scripts/discover.scm | 18 +-
guix/scripts/publish.scm | 30 +-
guix/substitutes.scm | 6 +-
guix/ui.scm | 34 +-
tests/inferior.scm | 20 +
tests/publish.scm | 32 +-
tests/services/configuration.scm | 29 +-
105 files changed, 3510 insertions(+), 42883 deletions(-)
diff --cc gnu/local.mk
index d62dd6a,9dac7ea..ad88955
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@@ -946,9 -945,9 +947,10 @@@ dist_patch_DATA =
%D%/packages/patches/desmume-gcc7-fixes.patch \
%D%/packages/patches/dfu-programmer-fix-libusb.patch \
%D%/packages/patches/diffutils-gets-undeclared.patch \
+ %D%/packages/patches/disarchive-cross-compilation.patch \
%D%/packages/patches/dkimproxy-add-ipv6-support.patch \
%D%/packages/patches/docbook-xsl-nonrecursive-string-subst.patch \
+ %D%/packages/patches/docbook-xsl-support-old-url.patch \
%D%/packages/patches/doc++-include-directives.patch \
%D%/packages/patches/doc++-segfault-fix.patch \
%D%/packages/patches/docker-fix-tests.patch \
@@@ -1245,8 -1272,10 +1248,9 @@@
%D%/packages/patches/java-xerces-xjavac_taskdef.patch \
%D%/packages/patches/jfsutils-add-sysmacros.patch \
%D%/packages/patches/jfsutils-include-systypes.patch \
- %D%/packages/patches/jsoncpp-fix-inverted-case.patch \
%D%/packages/patches/julia-SOURCE_DATE_EPOCH-mtime.patch \
%D%/packages/patches/kdbusaddons-kinit-file-name.patch \
+ %D%/packages/patches/libblockdev-glib-compat.patch \
%D%/packages/patches/libffi-3.3-powerpc-fixes.patch \
%D%/packages/patches/libffi-float128-powerpc64le.patch \
%D%/packages/patches/libvirt-add-install-prefix.patch \
@@@ -1386,8 -1417,10 +1391,9 @@@
%D%/packages/patches/mcrypt-CVE-2012-4527.patch \
%D%/packages/patches/libmemcached-build-with-gcc7.patch \
%D%/packages/patches/libmhash-hmac-fix-uaf.patch \
+ %D%/packages/patches/mercurial-hg-extension-path.patch \
%D%/packages/patches/mesa-skip-tests.patch \
%D%/packages/patches/mescc-tools-boot.patch \
- %D%/packages/patches/meson-for-build-rpath.patch \
%D%/packages/patches/metabat-fix-compilation.patch \
%D%/packages/patches/mhash-keygen-test-segfault.patch \
%D%/packages/patches/mingw-w64-6.0.0-gcc.patch \
diff --cc gnu/packages/admin.scm
index 60a624f,001c6db..531686f
--- a/gnu/packages/admin.scm
+++ b/gnu/packages/admin.scm
@@@ -1,8 -1,8 +1,8 @@@
;;; GNU Guix --- Functional package management for GNU
-;;; Copyright © 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020 Ludovic
Courtès <ludo@gnu.org>
+;;; Copyright © 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020, 2021
Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2013 Cyril Roelandt <tipecaml@gmail.com>
;;; Copyright © 2014, 2015, 2016, 2018, 2019, 2020 Mark H Weaver
<mhw@netris.org>
- ;;; Copyright © 2014, 2015, 2016, 2017, 2018, 2020 Eric Bavier
<bavier@posteo.net>
+ ;;; Copyright © 2014, 2015, 2016, 2017, 2018, 2020, 2021 Eric Bavier
<bavier@posteo.net>
;;; Copyright © 2015, 2016 Taylan Ulrich Bayırlı/Kammer
<taylanbayirli@gmail.com>
;;; Copyright © 2015 Alex Sassmannshausen <alex.sassmannshausen@gmail.com>
;;; Copyright © 2015 Eric Dvorsak <eric@dvorsak.fr>
diff --cc gnu/packages/databases.scm
index 3a9c8c7,d18fb89..bc508aa
--- a/gnu/packages/databases.scm
+++ b/gnu/packages/databases.scm
@@@ -1029,7 -1035,8 +1029,8 @@@ and high-availability (HA)."
(define-public postgresql-13
(package
(name "postgresql")
+ (replacement postgresql-13.3)
- (version "13.1")
+ (version "13.2")
(source (origin
(method url-fetch)
(uri (string-append "https://ftp.postgresql.org/pub/source/v";
diff --cc gnu/packages/rust.scm
index 636420e,56e6e72..2d29c2a
--- a/gnu/packages/rust.scm
+++ b/gnu/packages/rust.scm
@@@ -845,8 -1464,15 +845,18 @@@ safety and thread safety guarantees."
(rust-bootstrapped-package rust-1.50 "1.51.0"
"0ixqkqglv3isxbvl4ldr4byrkx692wghsz3fasy1pn5kr2prnsvs"))
+ (define-public rust-1.52
+ (let ((base-rust
+ (rust-bootstrapped-package rust-1.51 "1.52.1"
+ "165zs3xzp9dravybwslqs1qhn35agp6wacmzpymqg3qfdni26vrs")))
+ (package
+ (inherit base-rust)
+ (inputs
+ (alist-replace "llvm" (list llvm-12)
+ (package-inputs base-rust))))))
+
-;; TODO(staging): Bump this variable to the latest packaged rust.
-(define-public rust rust-1.45)
+;;; Note: Only the latest versions of Rust are supported and tested. The
+;;; intermediate rusts are built for bootstrapping purposes and should not
+;;; be relied upon. This is to ease maintenance and reduce the time
+;;; required to build the full Rust bootstrap chain.
+(define-public rust rust-1.49)