[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
03/03: Merge branch 'master' into core-updates
|
From: |
guix-commits |
|
Subject: |
03/03: Merge branch 'master' into core-updates |
|
Date: |
Thu, 23 Jul 2020 16:03:17 -0400 (EDT) |
niedzejkob pushed a commit to branch core-updates
in repository guix.
commit d726b954baaeff876ce9728e00920fa45f529f9a
Merge: 9a74a7d e165a24
Author: Jakub Kądziołka <kuba@kadziolka.net>
AuthorDate: Thu Jul 23 21:43:06 2020 +0200
Merge branch 'master' into core-updates
Conflicts:
gnu/packages/ruby.scm
.dir-locals.el | 1 +
.gitignore | 10 +-
.guix-authorizations | 15 +-
Makefile.am | 23 +-
build-aux/git-authenticate.scm | 322 -
doc/contributing.texi | 37 +-
doc/guix-cookbook.texi | 53 +-
doc/guix.texi | 1080 ++-
etc/completion/bash/guix | 8 +
etc/guix-install.sh | 12 +-
.../historical-authorizations | 34 +-
etc/news.scm | 47 +
...rlin.guixsd.org.pub => berlin.guix.gnu.org.pub} | 0
etc/substitutes/ci.guix.gnu.org.pub | 2 +-
etc/substitutes/ci.guix.info.pub | 2 +-
gnu/build/hurd-boot.scm | 20 +-
gnu/build/image.scm | 31 +-
gnu/ci.scm | 71 +-
gnu/image.scm | 2 +
gnu/installer.scm | 3 +-
gnu/local.mk | 74 +-
gnu/machine/ssh.scm | 1 +
gnu/packages/ada.scm | 4 +-
gnu/packages/admin.scm | 272 +-
gnu/packages/aidc.scm | 4 +-
gnu/packages/algebra.scm | 93 +-
gnu/packages/android.scm | 4 +-
gnu/packages/animation.scm | 2 +-
gnu/packages/antivirus.scm | 4 +-
gnu/packages/arcan.scm | 6 +-
gnu/packages/assembly.scm | 142 +-
gnu/packages/astronomy.scm | 8 +-
gnu/packages/audio.scm | 228 +-
gnu/packages/authentication.scm | 2 +-
gnu/packages/avr.scm | 2 +-
gnu/packages/axoloti.scm | 6 +-
gnu/packages/backup.scm | 33 +-
gnu/packages/base.scm | 8 +-
gnu/packages/bash.scm | 57 +-
gnu/packages/benchmark.scm | 8 +-
gnu/packages/bioconductor.scm | 77 +-
gnu/packages/bioinformatics.scm | 442 +-
gnu/packages/bittorrent.scm | 94 +-
gnu/packages/boost.scm | 4 +-
gnu/packages/bootloaders.scm | 19 +-
gnu/packages/build-tools.scm | 14 +-
gnu/packages/busybox.scm | 15 +-
gnu/packages/c.scm | 47 +-
gnu/packages/calendar.scm | 9 +-
gnu/packages/ccache.scm | 4 +-
gnu/packages/cdrom.scm | 4 +-
gnu/packages/check.scm | 100 +-
gnu/packages/chemistry.scm | 4 +-
gnu/packages/chez.scm | 14 +-
gnu/packages/chromium.scm | 441 +-
gnu/packages/ci.scm | 8 +-
gnu/packages/clojure.scm | 10 +-
gnu/packages/cluster.scm | 98 +
gnu/packages/code.scm | 56 +-
gnu/packages/commencement.scm | 26 +-
gnu/packages/compression.scm | 116 +-
gnu/packages/compton.scm | 4 +-
gnu/packages/coq.scm | 8 +-
gnu/packages/cpp.scm | 52 +-
gnu/packages/cran.scm | 756 +-
gnu/packages/crates-io.scm | 5164 ++++++++++----
gnu/packages/cross-base.scm | 2 +-
gnu/packages/crypto.scm | 65 +-
gnu/packages/cryptsetup.scm | 6 +-
gnu/packages/cups.scm | 2 +-
gnu/packages/curl.scm | 59 +
gnu/packages/databases.scm | 99 +-
gnu/packages/datastructures.scm | 24 +-
gnu/packages/dav.scm | 10 +-
gnu/packages/debian.scm | 49 +-
gnu/packages/debug.scm | 14 +-
gnu/packages/diffoscope.scm | 30 +-
gnu/packages/digest.scm | 17 +-
gnu/packages/disk.scm | 19 +-
gnu/packages/display-managers.scm | 34 +
gnu/packages/distributed.scm | 2 +-
gnu/packages/django.scm | 273 +-
gnu/packages/dlang.scm | 18 +-
gnu/packages/dns.scm | 52 +-
gnu/packages/docker.scm | 32 +-
gnu/packages/documentation.scm | 4 +-
gnu/packages/education.scm | 13 +-
gnu/packages/efi.scm | 2 +-
gnu/packages/elixir.scm | 6 +-
gnu/packages/emacs-xyz.scm | 1911 +++--
gnu/packages/embedded.scm | 20 +-
gnu/packages/emulators.scm | 291 +-
gnu/packages/engineering.scm | 24 +-
gnu/packages/erlang.scm | 2 +-
gnu/packages/fabric-management.scm | 2 +-
gnu/packages/file-systems.scm | 97 +-
gnu/packages/finance.scm | 43 +-
gnu/packages/firmware.scm | 23 +-
gnu/packages/flashing-tools.scm | 12 +-
gnu/packages/fonts.scm | 107 +-
gnu/packages/fontutils.scm | 28 +-
gnu/packages/fpga.scm | 6 +-
gnu/packages/freedesktop.scm | 17 +-
gnu/packages/game-development.scm | 231 +-
gnu/packages/games.scm | 1003 ++-
gnu/packages/gcc.scm | 156 +-
gnu/packages/gd.scm | 6 +-
gnu/packages/gdb.scm | 50 +-
gnu/packages/genealogy.scm | 2 +-
gnu/packages/genimage.scm | 2 +-
gnu/packages/geo.scm | 161 +-
gnu/packages/gimp.scm | 4 +-
gnu/packages/gl.scm | 12 +-
gnu/packages/glib.scm | 6 +-
gnu/packages/gnome-xyz.scm | 16 +-
gnu/packages/gnome.scm | 267 +-
gnu/packages/gnunet.scm | 23 +-
gnu/packages/gnustep.scm | 36 +-
gnu/packages/gnuzilla.scm | 28 +-
gnu/packages/golang.scm | 290 +-
gnu/packages/gpodder.scm | 2 +-
gnu/packages/gps.scm | 4 +-
gnu/packages/graph.scm | 84 +-
gnu/packages/graphics.scm | 27 +-
gnu/packages/graphviz.scm | 2 +-
gnu/packages/groff.scm | 2 +-
gnu/packages/groovy.scm | 2 +-
gnu/packages/gtk.scm | 4 +-
gnu/packages/guile-xyz.scm | 358 +-
gnu/packages/guile.scm | 10 +-
gnu/packages/hardware.scm | 4 +-
gnu/packages/haskell-apps.scm | 36 +-
gnu/packages/haskell-check.scm | 2 +-
gnu/packages/haskell-web.scm | 12 +-
gnu/packages/haskell-xyz.scm | 47 +-
gnu/packages/hexedit.scm | 2 +-
gnu/packages/hurd.scm | 34 +-
gnu/packages/i2p.scm | 2 +-
gnu/packages/ibus.scm | 164 +-
gnu/packages/icu4c.scm | 75 +-
gnu/packages/image-processing.scm | 46 +-
gnu/packages/image-viewers.scm | 123 +-
gnu/packages/image.scm | 81 +-
gnu/packages/ipfs.scm | 6 +-
gnu/packages/irc.scm | 9 +-
gnu/packages/jami.scm | 20 +-
gnu/packages/java-compression.scm | 32 +-
gnu/packages/java-graphics.scm | 2 +-
gnu/packages/java-maths.scm | 2 +-
gnu/packages/java.scm | 1690 ++++-
gnu/packages/javascript.scm | 4 +-
gnu/packages/jrnl.scm | 2 +-
gnu/packages/julia.scm | 4 +-
gnu/packages/jupyter.scm | 2 +-
gnu/packages/kde.scm | 4 +-
gnu/packages/kodi.scm | 10 +-
gnu/packages/language.scm | 2 +-
gnu/packages/lean.scm | 12 +-
gnu/packages/lego.scm | 2 +-
gnu/packages/less.scm | 2 +-
gnu/packages/libffi.scm | 2 +-
gnu/packages/libreoffice.scm | 5 +-
gnu/packages/libusb.scm | 16 +-
gnu/packages/linux.scm | 297 +-
gnu/packages/lirc.scm | 5 +-
gnu/packages/lisp-xyz.scm | 1539 +++-
gnu/packages/lisp.scm | 13 +-
gnu/packages/llvm.scm | 101 +-
gnu/packages/logging.scm | 9 +-
gnu/packages/lolcode.scm | 2 +-
gnu/packages/lsof.scm | 4 +-
gnu/packages/lua.scm | 177 +-
gnu/packages/lxde.scm | 16 +-
gnu/packages/lxqt.scm | 209 +-
gnu/packages/machine-learning.scm | 158 +-
gnu/packages/mail.scm | 664 +-
gnu/packages/man.scm | 4 +-
gnu/packages/markup.scm | 6 +-
gnu/packages/mastodon.scm | 4 +-
gnu/packages/mate.scm | 8 +-
gnu/packages/maths.scm | 94 +-
gnu/packages/maven-parent-pom.scm | 545 ++
gnu/packages/maven.scm | 2470 ++++++-
gnu/packages/mc.scm | 4 +-
gnu/packages/mercury.scm | 251 +
gnu/packages/mes.scm | 4 +-
gnu/packages/messaging.scm | 62 +-
gnu/packages/monitoring.scm | 19 +-
gnu/packages/mp3.scm | 5 +-
gnu/packages/mpd.scm | 22 +-
gnu/packages/music.scm | 432 +-
gnu/packages/ncdu.scm | 11 +-
gnu/packages/networking.scm | 152 +-
gnu/packages/node-xyz.scm | 2 +-
gnu/packages/ntp.scm | 16 +-
gnu/packages/ocaml.scm | 87 +-
gnu/packages/ocr.scm | 2 +-
gnu/packages/onc-rpc.scm | 2 +-
gnu/packages/opencl.scm | 10 +-
gnu/packages/opencog.scm | 12 +-
gnu/packages/openkinect.scm | 1 +
gnu/packages/openstack.scm | 2 +-
gnu/packages/package-management.scm | 33 +-
gnu/packages/pantheon.scm | 69 +-
gnu/packages/parallel.scm | 4 +-
gnu/packages/password-utils.scm | 72 +-
.../patches/ecl-16-format-directive-limit.patch | 83 +
.../patches/ecl-16-ignore-stderr-write-error.patch | 17 +
gnu/packages/patches/ecl-16-libffi.patch | 16 +
.../patches/emacs-exwm-fix-fullscreen-states.patch | 39 +
.../emacs-telega-patch-server-functions.patch | 31 +
gnu/packages/patches/flint-ldconfig.patch | 26 -
.../patches/ganeti-deterministic-manual.patch | 16 +
.../patches/ganeti-disable-version-symlinks.patch | 136 +
gnu/packages/patches/ganeti-drbd-compat.patch | 166 +
.../patches/ganeti-haskell-pythondir.patch | 66 +
gnu/packages/patches/ganeti-os-disk-size.patch | 17 +
.../patches/ganeti-preserve-PYTHONPATH.patch | 21 +
.../patches/ganeti-shepherd-master-failover.patch | 18 +
gnu/packages/patches/ganeti-shepherd-support.patch | 87 +
gnu/packages/patches/gash-utils-ls-test.patch | 25 +
gnu/packages/patches/gdb-hurd.patch | 69 +
gnu/packages/patches/grub-cross-system-i686.patch | 96 +
gnu/packages/patches/icecat-makeicecat.patch | 4 +-
gnu/packages/patches/ilmbase-fix-test-arm.patch | 60 -
.../patches/intel-xed-fix-nondeterminism.patch | 113 +
.../jamvm-2.0.0-disable-branch-patching.patch | 31 +
.../patches/libreoffice-poppler-compat.patch | 19 -
gnu/packages/patches/libvnc-CVE-2018-20750.patch | 44 -
gnu/packages/patches/libvnc-CVE-2019-15681.patch | 23 -
gnu/packages/patches/linbox-fix-pkgconfig.patch | 23 +
.../llvm-9-fix-bitcast-miscompilation.patch | 192 +
.../patches/llvm-9-fix-lpad-miscompilation.patch | 97 +
.../patches/llvm-9-fix-scev-miscompilation.patch | 113 +
.../maven-enforcer-api-fix-old-dependencies.patch | 177 +
gnu/packages/patches/opendht-fix-jami.patch | 33 +
.../patches/ppsspp-disable-upgrade-and-gold.patch | 358 +
.../patches/python-aionotify-0.2.0-py3.8.patch | 48 +
.../patches/python-tinycss2-flake8-compat.patch | 36 +
gnu/packages/patches/qtbase-absolute-runpath.patch | 17 +
.../ruby-rubocop-break-dependency-cycle.patch | 101 +
gnu/packages/patches/rust-1.45-linker-locale.patch | 14 +
gnu/packages/patches/sqlite-hurd.patch | 58 +
gnu/packages/patches/sssd-fix-samba.patch | 50 +
gnu/packages/patches/tao-add-missing-headers.patch | 102 +
gnu/packages/patches/tao-fix-parser-types.patch | 26 +
.../patches/transmission-CVE-2018-10756.patch | 71 -
.../patches/u-boot-DT-for-Pinebook-Pro.patch | 1132 ---
.../u-boot-add-boe-nv140fhmn49-display.patch | 29 -
.../patches/u-boot-gpio-keys-binding-cons.patch | 37 -
.../patches/u-boot-leds-common-binding-con.patch | 115 -
.../patches/u-boot-riscv64-fix-extlinux.patch | 14 -
.../u-boot-support-Pinebook-Pro-laptop.patch | 367 -
.../patches/u-boot-video-rockchip-fix-build.patch | 48 -
.../patches/ungoogled-chromium-system-nspr.patch | 120 +
.../patches/widelands-system-wide_minizip.patch | 153 +
gnu/packages/patches/x265-arm-flags.patch | 38 +-
gnu/packages/patches/xpra-4.0.1-systemd-run.patch | 34 +
gnu/packages/patchutils.scm | 2 +-
gnu/packages/pdf.scm | 10 +-
gnu/packages/perl6.scm | 22 +-
gnu/packages/phabricator.scm | 4 +-
gnu/packages/photo.scm | 133 +-
gnu/packages/php.scm | 4 +-
gnu/packages/plotutils.scm | 4 +-
gnu/packages/popt.scm | 2 +-
gnu/packages/presentation.scm | 90 +
gnu/packages/pretty-print.scm | 12 +-
gnu/packages/printers.scm | 4 +-
gnu/packages/prolog.scm | 24 +-
gnu/packages/protobuf.scm | 111 +-
gnu/packages/pulseaudio.scm | 6 +-
gnu/packages/python-check.scm | 192 +-
gnu/packages/python-compression.scm | 23 +-
gnu/packages/python-crypto.scm | 41 +-
gnu/packages/python-science.scm | 165 +-
gnu/packages/python-web.scm | 466 +-
gnu/packages/python-xyz.scm | 1247 +++-
gnu/packages/python.scm | 23 +-
gnu/packages/qt.scm | 26 +-
gnu/packages/radio.scm | 48 +-
gnu/packages/rails.scm | 4 +-
gnu/packages/rdf.scm | 2 +-
gnu/packages/rednotebook.scm | 2 +-
gnu/packages/rpc.scm | 6 +-
gnu/packages/rsync.scm | 2 +-
gnu/packages/ruby.scm | 7375 +++++++++++++-------
gnu/packages/rust-apps.scm | 49 +-
gnu/packages/rust.scm | 171 +-
gnu/packages/sagemath.scm | 80 +-
gnu/packages/scheme.scm | 4 +-
gnu/packages/screen.scm | 2 +-
gnu/packages/security-token.scm | 8 +-
gnu/packages/selinux.scm | 4 +-
gnu/packages/sequoia.scm | 42 +-
gnu/packages/serialization.scm | 10 +-
gnu/packages/shells.scm | 60 +-
gnu/packages/shellutils.scm | 12 +-
gnu/packages/simh.scm | 2 +-
gnu/packages/skarnet.scm | 4 +-
gnu/packages/sml.scm | 8 +-
gnu/packages/sqlite.scm | 19 +
gnu/packages/ssh.scm | 90 +-
gnu/packages/sssd.scm | 3 +-
gnu/packages/statistics.scm | 176 +-
gnu/packages/stenography.scm | 65 +
gnu/packages/storage.scm | 9 +-
gnu/packages/suckless.scm | 4 +-
gnu/packages/sync.scm | 8 +-
gnu/packages/syncthing.scm | 30 +-
gnu/packages/syndication.scm | 6 +-
gnu/packages/synergy.scm | 19 +-
gnu/packages/telephony.scm | 18 +-
gnu/packages/terminals.scm | 24 +-
gnu/packages/tex.scm | 41 +-
gnu/packages/texinfo.scm | 2 +-
gnu/packages/text-editors.scm | 8 +-
gnu/packages/textutils.scm | 16 +-
gnu/packages/time.scm | 9 +-
gnu/packages/tls.scm | 49 +-
gnu/packages/tmux.scm | 96 +-
gnu/packages/tor.scm | 38 +-
gnu/packages/toys.scm | 2 +-
gnu/packages/usb-modeswitch.scm | 9 +-
gnu/packages/version-control.scm | 28 +-
gnu/packages/video.scm | 266 +-
gnu/packages/vim.scm | 81 +-
gnu/packages/virtualization.scm | 545 +-
gnu/packages/vlang.scm | 116 +
gnu/packages/vnc.scm | 19 +-
gnu/packages/vpn.scm | 18 +-
gnu/packages/vulkan.scm | 45 +
gnu/packages/web-browsers.scm | 411 +-
gnu/packages/web.scm | 67 +-
gnu/packages/webkit.scm | 4 +-
gnu/packages/wine.scm | 35 +-
gnu/packages/wireservice.scm | 10 +-
gnu/packages/wm.scm | 39 +-
gnu/packages/wxwidgets.scm | 2 +-
gnu/packages/xdisorg.scm | 91 +-
gnu/packages/xfce.scm | 4 +-
gnu/packages/xiph.scm | 8 +-
gnu/packages/xml.scm | 16 +-
gnu/packages/xorg.scm | 227 +-
gnu/services.scm | 58 +-
gnu/services/base.scm | 4 +-
gnu/services/ganeti.scm | 1109 +++
gnu/services/networking.scm | 35 +-
gnu/services/nix.scm | 92 +-
gnu/services/science.scm | 57 +
gnu/services/virtualization.scm | 12 +-
gnu/services/web.scm | 34 +-
gnu/system.scm | 99 +-
gnu/system/hurd.scm | 2 +-
gnu/system/image.scm | 100 +-
gnu/system/images/hurd.scm | 89 +
gnu/system/mapped-devices.scm | 3 +-
gnu/system/vm.scm | 1 -
gnu/tests/docker.scm | 6 +-
gnu/tests/ganeti.scm | 270 +
gnu/tests/install.scm | 19 +-
gnu/tests/monitoring.scm | 2 +-
gnu/tests/networking.scm | 17 +-
gnu/tests/package-management.scm | 130 +
gnu/tests/web.scm | 73 +-
guix/build-system/ant.scm | 3 +
guix/build-system/maven.scm | 214 +
guix/build-system/r.scm | 2 +-
guix/build/compile.scm | 7 +-
guix/build/download-nar.scm | 8 +-
guix/build/java-utils.scm | 159 +-
guix/build/lisp-utils.scm | 8 +-
guix/build/maven-build-system.scm | 163 +
guix/build/maven/java.scm | 147 +
guix/build/maven/plugin.scm | 498 ++
guix/build/maven/pom.scm | 422 ++
guix/build/po.scm | 22 +-
guix/channels.scm | 221 +-
guix/combinators.scm | 2 +-
guix/cve.scm | 4 +-
guix/discovery.scm | 6 +-
guix/download.scm | 7 +-
guix/git-authenticate.scm | 103 +-
guix/git-download.scm | 4 +-
guix/git.scm | 109 +-
guix/gnu-maintenance.scm | 99 +-
guix/import/cpan.scm | 26 +-
guix/import/cran.scm | 28 +-
guix/import/crate.scm | 12 +-
guix/import/elpa.scm | 12 +-
guix/import/gem.scm | 16 +-
guix/import/github.scm | 33 +-
guix/import/hackage.scm | 19 +-
guix/import/launchpad.scm | 21 +-
guix/import/pypi.scm | 27 +-
guix/json.scm | 31 +-
guix/lint.scm | 55 +-
guix/openpgp.scm | 21 +-
guix/packages.scm | 17 +-
guix/remote.scm | 1 +
guix/scripts.scm | 5 +-
guix/scripts/challenge.scm | 4 +-
guix/scripts/describe.scm | 57 +-
guix/scripts/git.scm | 63 +
guix/scripts/git/authenticate.scm | 179 +
guix/scripts/graph.scm | 1 +
guix/scripts/pack.scm | 24 +-
guix/scripts/processes.scm | 11 +-
guix/scripts/pull.scm | 18 -
guix/scripts/system.scm | 68 +-
guix/scripts/system/reconfigure.scm | 97 +-
guix/scripts/system/search.scm | 1 +
guix/scripts/time-machine.scm | 4 +-
guix/scripts/weather.scm | 2 +-
guix/self.scm | 164 +-
guix/ssh.scm | 6 +-
guix/store.scm | 6 +-
guix/store/database.scm | 29 +-
guix/store/deduplication.scm | 110 +-
guix/swh.scm | 37 +-
guix/ui.scm | 300 +-
guix/upstream.scm | 49 +-
m4/guix.m4 | 6 +-
nix/boost/.gitignore | 3 -
nix/libstore/.gitignore | 3 +-
nix/libstore/optimise-store.cc | 3 +-
nix/libutil/.gitignore | 2 -
nix/libutil/gcrypt-hash.cc | 51 -
nix/libutil/gcrypt-hash.hh | 50 -
nix/libutil/hash.cc | 67 +-
nix/libutil/hash.hh | 20 +-
nix/libutil/md5.h | 35 -
nix/libutil/sha1.h | 35 -
nix/libutil/sha256.h | 35 -
nix/libutil/sha512.h | 35 -
nix/local.mk | 12 +-
po/guix/POTFILES.in | 2 +
tests/channels.scm | 95 +-
tests/git-authenticate.scm | 2 +-
tests/guix-git-authenticate.sh | 56 +
tests/lint.scm | 31 +-
tests/pack.scm | 66 +-
tests/packages.scm | 40 +
tests/store.scm | 4 +-
tests/syscalls.scm | 6 +-
445 files changed, 37347 insertions(+), 13966 deletions(-)
diff --cc gnu/packages/ruby.scm
index b76b5fe,99ef4fb..7610244
--- a/gnu/packages/ruby.scm
+++ b/gnu/packages/ruby.scm
@@@ -75,7 -79,14 +79,14 @@@
#:use-module (guix build-system ruby)
#:use-module ((srfi srfi-1) #:select (alist-delete)))
+ (define %prawn-project-licenses
+ ;; This set of licenses applies to most (all?) components of the Prawn
+ ;; project (it is triple licensed).
+ (list license:ruby
+ license:gpl2+
+ license:gpl3+))
+
-(define-public ruby
+(define-public ruby-2.6
(package
(name "ruby")
(version "2.6.5")