[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
01/01: Merge branch 'master' into ungrafting
|
From: |
guix-commits |
|
Subject: |
01/01: Merge branch 'master' into ungrafting |
|
Date: |
Mon, 21 Dec 2020 17:45:01 -0500 (EST) |
mbakke pushed a commit to branch ungrafting
in repository guix.
commit bbe4ed65ed5fe7dc8ed9d226042852387cee3b1e
Merge: 034cfbd f00e68a
Author: Marius Bakke <marius@gnu.org>
AuthorDate: Mon Dec 21 23:42:10 2020 +0100
Merge branch 'master' into ungrafting
.dir-locals.el | 1 +
Makefile.am | 13 +-
configure.ac | 2 +-
doc/contributing.texi | 46 +-
doc/guix.texi | 1 +
etc/git/pre-push | 33 +-
etc/guix-install.sh | 30 +-
gnu/bootloader/grub.scm | 21 +-
gnu/build/image.scm | 16 +-
gnu/build/install.scm | 3 +-
gnu/build/linux-boot.scm | 5 +-
gnu/build/linux-initrd.scm | 3 +-
gnu/build/vm.scm | 14 +-
gnu/local.mk | 11 +-
gnu/machine/ssh.scm | 3 +
gnu/packages/admin.scm | 19 +-
gnu/packages/algebra.scm | 10 +-
gnu/packages/assembly.scm | 4 +-
gnu/packages/audio.scm | 33 +-
gnu/packages/aux-files/guix.vim | 7 +
gnu/packages/aux-files/linux-libre/5.10-arm.conf | 9877 +++++++++++++++++
gnu/packages/aux-files/linux-libre/5.10-arm64.conf | 10037 +++++++++++++++++
gnu/packages/aux-files/linux-libre/5.10-i686.conf | 10732 +++++++++++++++++++
.../aux-files/linux-libre/5.10-x86_64.conf | 10726 ++++++++++++++++++
gnu/packages/benchmark.scm | 66 +
gnu/packages/bioconductor.scm | 573 +-
gnu/packages/bioinformatics.scm | 20 +-
gnu/packages/bootloaders.scm | 4 +-
gnu/packages/build-tools.scm | 44 +-
gnu/packages/c.scm | 75 +
gnu/packages/check.scm | 4 +-
gnu/packages/chez.scm | 31 +-
gnu/packages/compression.scm | 4 +-
gnu/packages/cpp.scm | 38 +
gnu/packages/cran.scm | 89 +
gnu/packages/crates-io.scm | 477 +-
gnu/packages/cups.scm | 40 +-
gnu/packages/databases.scm | 20 +-
gnu/packages/dns.scm | 8 +-
gnu/packages/ebook.scm | 2 +-
gnu/packages/education.scm | 4 +-
gnu/packages/electronics.scm | 4 +-
gnu/packages/emacs-xyz.scm | 393 +-
gnu/packages/embedded.scm | 102 +-
gnu/packages/emulators.scm | 169 +
gnu/packages/engineering.scm | 50 +-
gnu/packages/esolangs.scm | 51 +
gnu/packages/file-systems.scm | 36 +-
gnu/packages/finance.scm | 10 +-
gnu/packages/fonts.scm | 72 +-
gnu/packages/fpga.scm | 64 +
gnu/packages/games.scm | 6 +-
gnu/packages/geo.scm | 4 +-
gnu/packages/gimp.scm | 2 +-
gnu/packages/glib.scm | 4 +-
gnu/packages/gnome.scm | 14 +-
gnu/packages/gnuzilla.scm | 164 +-
gnu/packages/golang.scm | 52 +-
gnu/packages/icu4c.scm | 16 +
gnu/packages/java.scm | 2 +-
gnu/packages/kde-frameworks.scm | 59 +-
gnu/packages/kde-plasma.scm | 49 +-
gnu/packages/kde.scm | 80 +-
gnu/packages/libffi.scm | 26 +-
gnu/packages/linux.scm | 82 +-
gnu/packages/lisp-xyz.scm | 175 +-
gnu/packages/lisp.scm | 11 +-
gnu/packages/llvm.scm | 7 +-
gnu/packages/logging.scm | 4 +-
gnu/packages/maths.scm | 21 +-
gnu/packages/maven.scm | 2 +
gnu/packages/music.scm | 4 +-
gnu/packages/networking.scm | 126 +-
gnu/packages/ocaml.scm | 46 +
gnu/packages/openstack.scm | 57 +-
gnu/packages/package-management.scm | 12 +-
gnu/packages/pascal.scm | 2 +-
gnu/packages/password-utils.scm | 2 +-
.../patches/alsa-modular-synth-fix-vocoder.patch | 522 -
.../patches/aws-c-event-stream-cmake-prefix.patch | 13 +
.../patches/aws-checksums-cmake-prefix.patch | 13 +
.../patches/bear-disable-preinstall-tests.patch | 40 +
gnu/packages/patches/icecat-makeicecat.patch | 4 +-
.../patches/libffi-float128-powerpc64le.patch | 58 +
.../patches/purescript-relax-dependencies.patch | 28 +-
gnu/packages/patches/python-3.9-fix-tests.patch | 370 +
.../patches/rust-ndarray-remove-blas-src-dep.patch | 36 +
.../patches/sdcc-disable-non-free-code.patch | 721 +-
gnu/packages/patches/serf-python3.patch | 29 +
.../patches/sudo-fix-build-without-sendmail.patch | 45 -
gnu/packages/patchutils.scm | 4 +-
gnu/packages/perl.scm | 20 +-
gnu/packages/pulseaudio.scm | 8 +-
gnu/packages/purescript.scm | 7 +-
gnu/packages/python-check.scm | 27 +
gnu/packages/python-web.scm | 165 +-
gnu/packages/python-xyz.scm | 343 +-
gnu/packages/python.scm | 25 +
gnu/packages/sdcc.scm | 78 -
gnu/packages/sphinx.scm | 30 +
gnu/packages/terminals.scm | 106 +-
gnu/packages/time.scm | 19 +-
gnu/packages/tls.scm | 8 +-
gnu/packages/version-control.scm | 28 +-
gnu/packages/video.scm | 109 +-
gnu/packages/vim.scm | 13 +-
gnu/packages/vpn.scm | 9 +-
gnu/packages/web.scm | 31 +-
gnu/packages/webkit.scm | 4 +-
gnu/packages/wm.scm | 24 +
gnu/packages/xorg.scm | 2 +-
gnu/services/base.scm | 23 +-
gnu/system.scm | 59 +-
gnu/system/install.scm | 12 +-
gnu/system/linux-initrd.scm | 10 +-
gnu/tests/install.scm | 102 +
guix/avahi.scm | 14 +-
guix/build/store-copy.scm | 133 +-
guix/gexp.scm | 15 +-
guix/import/cran.scm | 7 +-
guix/import/elpa.scm | 189 +-
guix/inferior.scm | 11 +-
guix/monads.scm | 15 +-
guix/nar.scm | 8 +-
guix/progress.scm | 68 +-
guix/scripts/archive.scm | 2 +
guix/scripts/challenge.scm | 1 +
guix/scripts/discover.scm | 58 +-
guix/scripts/offload.scm | 12 +-
guix/scripts/pack.scm | 260 +-
guix/scripts/publish.scm | 26 -
guix/scripts/substitute.scm | 70 +-
guix/scripts/system.scm | 66 +-
guix/serialization.scm | 42 +-
guix/status.scm | 4 +
guix/store/database.scm | 58 +-
guix/store/deduplication.scm | 199 +-
nix/libstore/build.cc | 85 +-
tests/boot-parameters.scm | 30 +-
tests/cve-sample.json | 2 +-
tests/gexp.scm | 20 +-
tests/guix-archive.sh | 4 +-
tests/nar.scm | 21 +-
tests/store-database.scm | 18 +-
tests/store-deduplication.scm | 20 +-
tests/store.scm | 82 +
tests/substitute.scm | 56 +-
tests/swh.scm | 2 +-
tests/transformations.scm | 7 +-
149 files changed, 47089 insertions(+), 2787 deletions(-)
diff --cc gnu/local.mk
index ee8aecf,e649594..5d14cbc
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@@ -1517,8 -1516,8 +1519,9 @@@ dist_patch_DATA =
%D%/packages/patches/python-3-search-paths.patch \
%D%/packages/patches/python-3-fix-tests.patch \
%D%/packages/patches/python-3.8-fix-tests.patch \
+ %D%/packages/patches/python-3.9-fix-tests.patch \
%D%/packages/patches/python-CVE-2018-14647.patch \
+ %D%/packages/patches/python-CVE-2020-26116.patch \
%D%/packages/patches/python-aionotify-0.2.0-py3.8.patch \
%D%/packages/patches/python-argcomplete-1.11.1-fish31.patch \
%D%/packages/patches/python-axolotl-AES-fix.patch \