[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
01/01: Merge remote-tracking branch 'origin/master' into staging
|
From: |
guix-commits |
|
Subject: |
01/01: Merge remote-tracking branch 'origin/master' into staging |
|
Date: |
Sat, 5 Sep 2020 15:31:33 -0400 (EDT) |
efraim pushed a commit to branch staging
in repository guix.
commit de3c03a47160dec355d9b19ad5ca210d90c15fd7
Merge: ab6fe9d b8477ca
Author: Efraim Flashner <efraim@flashner.co.il>
AuthorDate: Sat Sep 5 21:56:34 2020 +0300
Merge remote-tracking branch 'origin/master' into staging
.dir-locals.el | 1 +
.guix-authorizations | 3 +
Makefile.am | 21 +-
build-aux/build-self.scm | 8 +-
build-aux/pre-inst-env.in | 9 +-
configure.ac | 42 +-
doc/build.scm | 2 +
doc/contributing.texi | 3 +-
doc/guix-cookbook.texi | 125 ++
doc/guix.texi | 623 +++++++-
etc/indent-code.el | 3 +-
gnu.scm | 10 +-
gnu/build/file-systems.scm | 90 +-
gnu/build/install.scm | 44 +-
gnu/build/linux-container.scm | 3 +-
gnu/build/linux-modules.scm | 115 +-
gnu/build/secret-service.scm | 137 ++
gnu/build/shepherd.scm | 18 +-
gnu/ci.scm | 11 +-
gnu/installer.scm | 2 +
gnu/installer/final.scm | 124 +-
gnu/installer/newt/final.scm | 7 -
gnu/installer/newt/partition.scm | 2 +-
gnu/installer/parted.scm | 24 +-
gnu/local.mk | 71 +-
gnu/machine.scm | 2 +-
gnu/machine/digital-ocean.scm | 7 +-
gnu/machine/ssh.scm | 68 +-
gnu/packages.scm | 88 +-
gnu/packages/accessibility.scm | 167 ++
gnu/packages/admin.scm | 232 +--
gnu/packages/agda.scm | 46 +-
gnu/packages/aidc.scm | 45 +
gnu/packages/algebra.scm | 159 +-
gnu/packages/android.scm | 41 +-
gnu/packages/animation.scm | 6 +-
gnu/packages/aspell.scm | 8 +-
gnu/packages/astronomy.scm | 8 +-
gnu/packages/audio.scm | 417 ++++-
gnu/packages/aux-files/linux-libre/4.14-arm.conf | 4 +-
gnu/packages/aux-files/linux-libre/4.14-i686.conf | 4 +-
.../aux-files/linux-libre/4.14-x86_64.conf | 4 +-
gnu/packages/aux-files/linux-libre/4.19-arm.conf | 4 +-
gnu/packages/aux-files/linux-libre/4.19-arm64.conf | 4 +-
gnu/packages/aux-files/linux-libre/4.19-i686.conf | 4 +-
.../aux-files/linux-libre/4.19-x86_64.conf | 4 +-
gnu/packages/aux-files/linux-libre/4.4-i686.conf | 4 +-
gnu/packages/aux-files/linux-libre/4.4-x86_64.conf | 4 +-
gnu/packages/aux-files/linux-libre/4.9-i686.conf | 4 +-
gnu/packages/aux-files/linux-libre/4.9-x86_64.conf | 4 +-
gnu/packages/aux-files/linux-libre/5.4-arm.conf | 4 +-
gnu/packages/aux-files/linux-libre/5.4-arm64.conf | 4 +-
gnu/packages/aux-files/linux-libre/5.4-i686.conf | 4 +-
gnu/packages/aux-files/linux-libre/5.4-x86_64.conf | 4 +-
.../linux-libre/{5.4-arm.conf => 5.8-arm.conf} | 1012 ++++++++----
.../linux-libre/{5.4-arm64.conf => 5.8-arm64.conf} | 1114 +++++++++----
.../linux-libre/{5.4-i686.conf => 5.8-i686.conf} | 1304 +++++++++------
.../{5.4-x86_64.conf => 5.8-x86_64.conf} | 1237 ++++++++------
gnu/packages/aux-files/run-in-namespace.c | 83 +-
gnu/packages/backup.scm | 15 +-
gnu/packages/base.scm | 114 +-
gnu/packages/benchmark.scm | 4 +-
gnu/packages/bioconductor.scm | 111 +-
gnu/packages/bioinformatics.scm | 414 +++--
gnu/packages/bison.scm | 7 +-
gnu/packages/bittorrent.scm | 25 +-
gnu/packages/calendar.scm | 59 +-
gnu/packages/check.scm | 99 +-
gnu/packages/chez.scm | 14 +-
gnu/packages/chromium.scm | 10 +-
gnu/packages/ci.scm | 11 +-
gnu/packages/code.scm | 4 +-
gnu/packages/compression.scm | 16 +-
gnu/packages/configuration-management.scm | 105 ++
gnu/packages/conky.scm | 6 +-
gnu/packages/cpp.scm | 79 +-
gnu/packages/cran.scm | 1003 +++++++++---
gnu/packages/crates-io.scm | 1680 ++++++++++++--------
gnu/packages/crypto.scm | 116 +-
gnu/packages/databases.scm | 46 +-
gnu/packages/datastructures.scm | 70 +-
gnu/packages/dav.scm | 79 +-
gnu/packages/debian.scm | 4 +-
gnu/packages/debug.scm | 25 +
gnu/packages/dictionaries.scm | 4 +-
gnu/packages/digest.scm | 4 +-
gnu/packages/disk.scm | 56 +-
gnu/packages/dns.scm | 202 ++-
gnu/packages/docker.scm | 6 +-
gnu/packages/documentation.scm | 98 +-
gnu/packages/dunst.scm | 4 +-
gnu/packages/easyrpg.scm | 5 +-
gnu/packages/ebook.scm | 3 +-
gnu/packages/education.scm | 22 +-
gnu/packages/electronics.scm | 3 +-
gnu/packages/elixir.scm | 6 +-
gnu/packages/emacs-xyz.scm | 1400 +++++++++++-----
gnu/packages/emacs.scm | 223 ++-
gnu/packages/embedded.scm | 13 +-
gnu/packages/emulators.scm | 72 +-
gnu/packages/enchant.scm | 50 +-
gnu/packages/engineering.scm | 80 +-
gnu/packages/enlightenment.scm | 57 +-
gnu/packages/fcitx.scm | 60 +
gnu/packages/file-systems.scm | 66 +-
gnu/packages/finance.scm | 72 +-
gnu/packages/firmware.scm | 6 +-
gnu/packages/fonts.scm | 1 +
gnu/packages/fontutils.scm | 72 +-
gnu/packages/fpga.scm | 70 +-
gnu/packages/freedesktop.scm | 246 ++-
gnu/packages/ftp.scm | 6 +-
gnu/packages/fvwm.scm | 19 +-
gnu/packages/game-development.scm | 11 +-
gnu/packages/games.scm | 170 +-
gnu/packages/geo.scm | 93 +-
gnu/packages/gettext.scm | 4 +-
gnu/packages/gimp.scm | 114 ++
gnu/packages/glib.scm | 33 +
gnu/packages/gnome-xyz.scm | 4 +-
gnu/packages/gnome.scm | 1195 +++++++++++---
gnu/packages/gnunet.scm | 31 +-
gnu/packages/gnupg.scm | 19 +-
gnu/packages/gnustep.scm | 4 +-
gnu/packages/gnuzilla.scm | 26 +-
gnu/packages/golang.scm | 1370 +++++++++++++++-
gnu/packages/gpodder.scm | 7 +-
gnu/packages/gps.scm | 4 +-
gnu/packages/graph.scm | 9 +-
gnu/packages/graphics.scm | 407 ++++-
gnu/packages/groff.scm | 60 +-
gnu/packages/gstreamer.scm | 539 +++++--
gnu/packages/gtk.scm | 147 +-
gnu/packages/guile-xyz.scm | 211 ++-
gnu/packages/guile.scm | 86 +-
gnu/packages/haskell-apps.scm | 38 +-
gnu/packages/haskell-check.scm | 5 +-
gnu/packages/haskell-crypto.scm | 6 +
gnu/packages/haskell-web.scm | 23 +-
gnu/packages/haskell-xyz.scm | 344 +++-
gnu/packages/haskell.scm | 78 +-
gnu/packages/hexedit.scm | 6 +-
gnu/packages/idris.scm | 18 +-
gnu/packages/image-processing.scm | 142 +-
gnu/packages/image-viewers.scm | 7 +-
gnu/packages/image.scm | 89 +-
gnu/packages/ipfs.scm | 5 +-
gnu/packages/irc.scm | 160 +-
gnu/packages/jami.scm | 114 +-
gnu/packages/java-compression.scm | 4 +-
gnu/packages/java.scm | 2 +
gnu/packages/javascript.scm | 6 +
gnu/packages/kde-pim.scm | 10 +-
gnu/packages/kde-utils.scm | 30 +
gnu/packages/kde.scm | 31 +-
gnu/packages/kodi.scm | 4 +-
gnu/packages/language.scm | 151 +-
gnu/packages/less.scm | 16 +-
gnu/packages/libedit.scm | 6 +-
gnu/packages/libreoffice.scm | 221 ++-
gnu/packages/libusb.scm | 97 +-
gnu/packages/license.scm | 8 +-
gnu/packages/lighting.scm | 86 +-
gnu/packages/linphone.scm | 8 +
gnu/packages/linux.scm | 419 ++++-
gnu/packages/lisp-xyz.scm | 968 ++++++++++-
gnu/packages/lisp.scm | 10 +-
gnu/packages/llvm.scm | 42 +-
gnu/packages/lxde.scm | 28 +-
gnu/packages/lxqt.scm | 4 +-
gnu/packages/machine-learning.scm | 68 +-
gnu/packages/mail.scm | 562 +++++--
gnu/packages/man.scm | 83 +-
gnu/packages/mastodon.scm | 40 +
gnu/packages/mate.scm | 147 +-
gnu/packages/maths.scm | 269 +++-
gnu/packages/mcrypt.scm | 5 +-
gnu/packages/messaging.scm | 36 +-
gnu/packages/monitoring.scm | 8 +-
gnu/packages/mp3.scm | 19 +-
gnu/packages/mpd.scm | 4 +-
gnu/packages/music.scm | 238 +--
gnu/packages/musl.scm | 4 +-
gnu/packages/nano.scm | 6 +-
gnu/packages/networking.scm | 432 ++++-
gnu/packages/nfs.scm | 44 +
gnu/packages/nicotine.scm | 68 +
gnu/packages/node.scm | 7 +-
gnu/packages/ntp.scm | 4 +-
gnu/packages/ocaml.scm | 57 +-
gnu/packages/opencl.scm | 7 +-
gnu/packages/openpgp.scm | 94 +-
gnu/packages/package-management.scm | 376 +++--
gnu/packages/parallel.scm | 4 +-
gnu/packages/pascal.scm | 279 ++++
gnu/packages/password-utils.scm | 13 +-
gnu/packages/patches/blender-2.79-gcc8.patch | 36 +
gnu/packages/patches/blender-2.79-gcc9.patch | 53 +
gnu/packages/patches/blender-2.79-oiio2.patch | 284 ++++
.../patches/blender-2.79-python-3.8-fix.patch | 204 +++
.../patches/bpftrace-disable-bfd-disasm.patch | 15 +
...clang-runtime-3.5-libsanitizer-mode-field.patch | 29 +
gnu/packages/patches/dbxfs-remove-sentry-sdk.patch | 64 +
gnu/packages/patches/dee-vapi.patch | 15 +
gnu/packages/patches/emacs-exec-path.patch | 22 +-
.../patches/emacs-ignore-empty-xim-styles.patch | 24 +
gnu/packages/patches/emacs-source-date-epoch.patch | 6 +-
gnu/packages/patches/emacs27-exec-path.patch | 18 -
gnu/packages/patches/fpc-reproducibility.patch | 28 +
.../patches/freedink-engine-fix-sdl-hints.patch | 33 +
gnu/packages/patches/glibc-CVE-2015-5180.patch | 311 ----
gnu/packages/patches/glibc-CVE-2015-7547.patch | 590 -------
gnu/packages/patches/glibc-CVE-2016-3075.patch | 43 -
gnu/packages/patches/glibc-CVE-2016-3706.patch | 188 ---
gnu/packages/patches/glibc-CVE-2016-4429.patch | 58 -
.../patches/glibc-CVE-2017-1000366-pt1.patch | 36 -
.../patches/glibc-CVE-2017-1000366-pt2.patch | 124 --
.../patches/glibc-CVE-2017-1000366-pt3.patch | 206 ---
gnu/packages/patches/glibc-o-largefile.patch | 25 -
.../patches/glibc-vectorized-strcspn-guards.patch | 23 -
gnu/packages/patches/gpodder-disable-updater.patch | 18 +
.../gvfs-add-support-for-libplist-2.2.patch | 34 +
gnu/packages/patches/icecat-makeicecat.patch | 4 +-
.../patches/json-c-0.12-CVE-2020-12762.patch | 175 ++
.../patches/json-c-0.13-CVE-2020-12762.patch | 230 +++
gnu/packages/patches/json-c-CVE-2020-12762.patch | 193 +++
gnu/packages/patches/ldns-drill-examples.patch | 85 +
.../patches/lib2geom-enable-assertions.patch | 36 -
gnu/packages/patches/lib2geom-fix-tests.patch | 40 +-
gnu/packages/patches/libextractor-exiv2.patch | 124 --
gnu/packages/patches/liblouisutdml-fix-tests.patch | 33 +
gnu/packages/patches/libmhash-hmac-fix-uaf.patch | 22 +
gnu/packages/patches/libofa-curl.diff | 15 +
gnu/packages/patches/libofa-ftbfs-1.diff | 45 +
gnu/packages/patches/libofa-ftbfs-2.diff | 27 +
gnu/packages/patches/libquicktime-ffmpeg.patch | 1309 +++++++++++++++
.../patches/nfs4-acl-tools-0.3.7-fixpaths.patch | 73 +
gnu/packages/patches/ola-readdir-r.patch | 62 -
.../opencv-fix-build-of-grfmt_jpeg2000.cpp.patch | 39 +
.../patches/opensles-add-license-file.patch | 45 +
.../pjproject-correct-the-cflags-field.patch | 121 ++
.../patches/pjproject-fix-pkg-config-ldflags.patch | 79 +
gnu/packages/patches/plotutils-spline-test.patch | 34 +
.../patches/python-alembic-exceptions-cause.patch | 69 -
.../patches/python-jedi-sort-project-test.patch | 18 -
.../python-onnx-use-system-googletest.patch | 54 +
.../python-slugify-depend-on-unidecode.patch | 22 -
.../patches/r-httpuv-1.5.4-unvendor-libuv.patch | 59 +
gnu/packages/patches/remake-impure-dirs.patch | 30 +
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 +
gnu/packages/patches/seed-webkit.patch | 49 +
.../patches/sooperlooper-build-with-wx-30.patch | 179 ---
gnu/packages/patches/sphinxbase-fix-doxygen.patch | 24 +
gnu/packages/patches/sssd-system-directories.patch | 56 +
gnu/packages/patches/transcode-ffmpeg.patch | 1408 ++++++++++++++++
.../patches/ttfautohint-source-date-epoch.patch | 70 -
.../unknown-horizons-python-3.8-distro.patch | 52 +
.../patches/vcflib-use-shared-libraries.patch | 135 ++
.../patches/webkitgtk-bind-all-fonts.patch | 26 +
gnu/packages/patches/wgetpaste-update-bpaste.patch | 27 +
.../patches/xf86-video-geode-glibc-2.20.patch | 15 -
.../patches/xf86-video-sis-xorg-compat.patch | 18 -
gnu/packages/patches/xmonad-dynamic-linking.patch | 16 +
gnu/packages/pdf.scm | 30 +-
gnu/packages/perl-compression.scm | 20 +-
gnu/packages/perl.scm | 25 +-
gnu/packages/photo.scm | 123 +-
gnu/packages/php.scm | 4 +-
gnu/packages/plotutils.scm | 11 +-
gnu/packages/prolog.scm | 4 +-
gnu/packages/protobuf.scm | 63 +-
gnu/packages/pulseaudio.scm | 132 +-
gnu/packages/python-check.scm | 424 ++++-
gnu/packages/python-crypto.scm | 135 +-
gnu/packages/python-science.scm | 50 +
gnu/packages/python-web.scm | 369 ++++-
gnu/packages/python-xyz.scm | 1036 ++++++++++--
gnu/packages/qt.scm | 62 +-
gnu/packages/radio.scm | 12 +-
gnu/packages/rdf.scm | 50 +
gnu/packages/ruby.scm | 169 +-
gnu/packages/rust-apps.scm | 92 +-
gnu/packages/rust.scm | 4 +-
gnu/packages/samba.scm | 4 +-
gnu/packages/scanner.scm | 11 +-
gnu/packages/scheme.scm | 119 +-
gnu/packages/search.scm | 6 +-
gnu/packages/sequoia.scm | 2 +-
gnu/packages/shells.scm | 9 +-
gnu/packages/simulation.scm | 72 +
gnu/packages/skarnet.scm | 4 +-
gnu/packages/skribilo.scm | 6 +-
gnu/packages/smalltalk.scm | 26 +-
gnu/packages/speech.scm | 72 +-
gnu/packages/ssh.scm | 9 +-
gnu/packages/sssd.scm | 8 +-
gnu/packages/statistics.scm | 277 ++--
gnu/packages/storage.scm | 4 +-
gnu/packages/sync.scm | 19 +-
gnu/packages/syncthing.scm | 77 +-
gnu/packages/syndication.scm | 110 +-
gnu/packages/telephony.scm | 189 ++-
gnu/packages/terminals.scm | 30 +-
gnu/packages/tex.scm | 33 +
gnu/packages/text-editors.scm | 177 ++-
gnu/packages/textutils.scm | 32 +-
gnu/packages/tls.scm | 5 +-
gnu/packages/tmux.scm | 5 +-
gnu/packages/tryton.scm | 876 +++++++++-
gnu/packages/uml.scm | 5 +-
gnu/packages/version-control.scm | 228 ++-
gnu/packages/video.scm | 614 ++++++-
gnu/packages/vim.scm | 27 +-
gnu/packages/virtualization.scm | 10 +-
gnu/packages/vlang.scm | 5 +-
gnu/packages/vpn.scm | 7 +-
gnu/packages/web-browsers.scm | 249 +--
gnu/packages/web.scm | 70 +-
gnu/packages/webkit.scm | 140 +-
gnu/packages/wget.scm | 20 +-
gnu/packages/wine.scm | 6 +-
gnu/packages/wireservice.scm | 4 +-
gnu/packages/wm.scm | 177 ++-
gnu/packages/wxwidgets.scm | 16 +-
gnu/packages/xdisorg.scm | 17 +-
gnu/packages/xfce.scm | 42 +-
gnu/packages/xiph.scm | 2 +-
gnu/packages/xml.scm | 167 +-
gnu/packages/xorg.scm | 163 +-
gnu/services.scm | 58 +-
gnu/services/admin.scm | 141 +-
gnu/services/auditd.scm | 41 +-
gnu/services/base.scm | 115 +-
gnu/services/databases.scm | 4 +-
gnu/services/desktop.scm | 3 +-
gnu/services/docker.scm | 11 +-
gnu/services/ganeti.scm | 2 +-
gnu/services/linux.scm | 81 +-
gnu/services/mcron.scm | 33 +-
gnu/services/networking.scm | 5 +-
gnu/services/nix.scm | 22 +-
gnu/services/virtualization.scm | 100 +-
gnu/services/web.scm | 19 +-
gnu/system.scm | 40 +-
gnu/system/examples/desktop.tmpl | 2 +
gnu/system/examples/lightweight-desktop.tmpl | 1 -
gnu/system/file-systems.scm | 46 +-
gnu/system/image.scm | 17 +-
gnu/system/install.scm | 53 +-
gnu/system/linux-initrd.scm | 72 +-
gnu/system/mapped-devices.scm | 36 +-
gnu/system/uuid.scm | 37 +-
gnu/system/vm.scm | 3 +-
gnu/tests.scm | 2 +-
guix/android-repo-download.scm | 159 ++
guix/build-system/emacs.scm | 2 +
guix/build-system/haskell.scm | 28 +-
guix/build/android-repo.scm | 75 +
guix/build/download-nar.scm | 2 +-
guix/build/haskell-build-system.scm | 96 +-
guix/channels.scm | 18 +-
guix/config.scm.in | 8 -
guix/cve.scm | 15 +-
guix/cvs-download.scm | 39 +-
guix/derivations.scm | 84 +-
guix/diagnostics.scm | 181 ++-
guix/gexp.scm | 11 +-
guix/git-authenticate.scm | 86 +-
guix/git-download.scm | 29 +-
guix/gnu-maintenance.scm | 2 +-
guix/hg-download.scm | 37 +-
guix/import/launchpad.scm | 38 +-
guix/import/pypi.scm | 4 +-
guix/inferior.scm | 3 +-
guix/lint.scm | 41 +-
guix/lzlib.scm | 709 ---------
guix/man-db.scm | 2 +-
guix/packages.scm | 3 +-
guix/profiles.scm | 95 +-
guix/remote.scm | 9 +-
guix/scripts/archive.scm | 2 +
guix/scripts/build.scm | 2 +
guix/scripts/copy.scm | 10 +-
guix/scripts/deploy.scm | 33 +-
guix/scripts/environment.scm | 7 +
guix/scripts/graph.scm | 9 +-
guix/scripts/lint.scm | 43 +-
guix/scripts/offload.scm | 39 +-
guix/scripts/pack.scm | 19 +
guix/scripts/package.scm | 2 +
guix/scripts/processes.scm | 5 +-
guix/scripts/publish.scm | 15 +-
guix/scripts/pull.scm | 3 +
guix/scripts/substitute.scm | 10 +-
guix/scripts/system.scm | 103 +-
guix/scripts/system/reconfigure.scm | 22 +-
guix/scripts/upgrade.scm | 3 +-
guix/self.scm | 32 +-
guix/ssh.scm | 171 +-
guix/store.scm | 33 +-
guix/store/deduplication.scm | 6 +-
guix/ui.scm | 280 ++--
guix/upstream.scm | 13 +-
guix/utils.scm | 102 +-
guix/zlib.scm | 241 ---
m4/guix.m4 | 46 -
po/guix/fr.po | 4 +-
tests/base32.scm | 31 +-
tests/channels.scm | 24 +-
tests/guix-lint.sh | 13 +-
tests/guix-pack-relocatable.sh | 103 +-
tests/lint.scm | 2 +-
tests/lzlib.scm | 120 --
tests/offload.scm | 71 +
tests/packages.scm | 23 +-
tests/publish.scm | 28 +-
tests/pypi.scm | 1 -
tests/services/linux.scm | 37 +
tests/store.scm | 9 +
tests/substitute.scm | 4 +-
tests/utils.scm | 3 +-
tests/zlib.scm | 62 -
424 files changed, 33161 insertions(+), 11402 deletions(-)
diff --cc gnu/local.mk
index 4d04c32,b059ded..c9443a1
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@@ -880,8 -890,11 +890,10 @@@ dist_patch_DATA =
%D%/packages/patches/dbus-CVE-2020-12049.patch \
%D%/packages/patches/dbus-c++-gcc-compat.patch \
%D%/packages/patches/dbus-c++-threading-mutex.patch \
+ %D%/packages/patches/dbxfs-remove-sentry-sdk.patch \
- %D%/packages/patches/dconf-meson-0.52.patch \
%D%/packages/patches/debops-constants-for-external-program-names.patch \
%D%/packages/patches/debops-debops-defaults-fall-back-to-less.patch \
+ %D%/packages/patches/dee-vapi.patch \
%D%/packages/patches/desmume-gcc6-fixes.patch \
%D%/packages/patches/desmume-gcc7-fixes.patch \
%D%/packages/patches/dfu-programmer-fix-libusb.patch \
@@@ -1140,12 -1147,12 +1146,15 @@@
%D%/packages/patches/iputils-libcap-compat.patch \
%D%/packages/patches/irrlicht-use-system-libs.patch \
%D%/packages/patches/isl-0.11.1-aarch64-support.patch \
+ %D%/packages/patches/json-c-CVE-2020-12762.patch \
+ %D%/packages/patches/json-c-0.13-CVE-2020-12762.patch \
+ %D%/packages/patches/json-c-0.12-CVE-2020-12762.patch \
%D%/packages/patches/jacal-fix-texinfo.patch \
+ %D%/packages/patches/jamvm-1.5.1-aarch64-support.patch \
- %D%/packages/patches/jamvm-1.5.1-armv7-support.patch \
++ %D%/packages/patches/jamvm-1.5.1-armv7-support.patch \
+ %D%/packages/patches/jamvm-2.0.0-aarch64-support.patch \
%D%/packages/patches/jamvm-2.0.0-disable-branch-patching.patch \
- %D%/packages/patches/jamvm-arm.patch \
+ %D%/packages/patches/jamvm-2.0.0-opcode-guard.patch \
%D%/packages/patches/java-apache-ivy-port-to-latest-bouncycastle.patch
\
%D%/packages/patches/java-commons-collections-fix-java8.patch \
%D%/packages/patches/java-jeromq-fix-tests.patch \
@@@ -1208,7 -1215,7 +1217,6 @@@
%D%/packages/patches/libbase-use-own-logging.patch \
%D%/packages/patches/libbonobo-activation-test-race.patch \
%D%/packages/patches/libcanberra-sound-theme-freedesktop.patch \
- %D%/packages/patches/libextractor-exiv2.patch \
- %D%/packages/patches/libdrm-realpath-virtio.patch \
%D%/packages/patches/libgeotiff-adapt-test-script-for-proj-6.2.patch
\
%D%/packages/patches/libgit2-mtime-0.patch \
%D%/packages/patches/libgnome-encoding.patch \
diff --cc gnu/packages/wget.scm
index 146097f,7950b3b..1092237
--- a/gnu/packages/wget.scm
+++ b/gnu/packages/wget.scm
@@@ -3,8 -3,7 +3,8 @@@
;;; Copyright © 2014, 2015, 2017, 2018 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2016, 2017, 2019, 2020 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2017 Rutger Helling <rhelling@mykolab.com>
- ;;; Copyright © 2018, 2019 Tobias Geerinckx-Rice <me@tobias.gr>
+ ;;; Copyright © 2018, 2019, 2020 Tobias Geerinckx-Rice <me@tobias.gr>
+;;; Copyright © 2020 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
;;;
;;; This file is part of GNU Guix.
;;;
diff --cc gnu/packages/xorg.scm
index bc9ea12,868a062..6d8cbc0
--- a/gnu/packages/xorg.scm
+++ b/gnu/packages/xorg.scm
@@@ -5445,11 -5464,19 +5453,10 @@@ draggable titlebars and borders."
(define-public xorg-server-for-tests
(hidden-package
(package
- (inherit xorg-server)
- (version "1.20.7")
- (source (origin
- (inherit (package-source xorg-server))
- (uri (string-append "mirror://xorg/individual/xserver/"
- "xorg-server-" version ".tar.bz2"))
- (sha256
- (base32
- "18bfl04ihw1jr3h0fs522nnxxq5ixjay77y9dcymnkzk23q8cndx")))))))
+ (inherit xorg-server))))
(define-public xorg-server-xwayland
- (package
- (inherit xorg-server)
+ (package/inherit xorg-server
(name "xorg-server-xwayland")
(inputs
`(("wayland" ,wayland)