[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
02/02: Merge branch 'master' into staging
|
From: |
guix-commits |
|
Subject: |
02/02: Merge branch 'master' into staging |
|
Date: |
Fri, 15 Nov 2019 14:39:32 -0500 (EST) |
mbakke pushed a commit to branch staging
in repository guix.
commit f056553c6b8ffa36f4ce9fb1c3602a8f4b1de242
Merge: 2c9d341 528b523
Author: Marius Bakke <address@hidden>
Date: Fri Nov 15 20:11:35 2019 +0100
Merge branch 'master' into staging
README | 3 +-
build-aux/run-system-tests.scm | 45 +-
config-daemon.ac | 3 -
configure.ac | 12 +-
doc/contributing.texi | 3 +-
doc/guix.texi | 134 +++-
etc/news.scm | 82 ++-
gnu/ci.scm | 3 +-
gnu/local.mk | 13 +-
gnu/packages/admin.scm | 6 +-
gnu/packages/algebra.scm | 5 +-
gnu/packages/android.scm | 8 +-
gnu/packages/aspell.scm | 19 +-
gnu/packages/audio.scm | 191 ++++--
gnu/packages/backup.scm | 26 +-
gnu/packages/base.scm | 27 +-
gnu/packages/bash.scm | 20 +-
gnu/packages/bioconductor.scm | 2 +-
gnu/packages/bioinformatics.scm | 6 +-
gnu/packages/bittorrent.scm | 4 +-
gnu/packages/boost.scm | 50 ++
gnu/packages/bootloaders.scm | 4 +-
gnu/packages/bootstrap.scm | 69 +-
gnu/packages/build-tools.scm | 18 +-
gnu/packages/check.scm | 4 +-
gnu/packages/chromium.scm | 108 +--
gnu/packages/cmake.scm | 16 +
gnu/packages/code.scm | 64 +-
gnu/packages/commencement.scm | 26 +-
gnu/packages/cpio.scm | 5 +-
gnu/packages/cpp.scm | 29 +-
gnu/packages/cran.scm | 157 +++--
gnu/packages/crypto.scm | 16 +-
gnu/packages/cryptsetup.scm | 4 +-
gnu/packages/cups.scm | 129 ++--
gnu/packages/databases.scm | 4 +-
gnu/packages/debug.scm | 2 +-
gnu/packages/digest.scm | 1 +
gnu/packages/dns.scm | 72 ++
gnu/packages/docker.scm | 3 +-
gnu/packages/education.scm | 8 +-
gnu/packages/electronics.scm | 16 +-
gnu/packages/elf.scm | 41 +-
gnu/packages/emacs-xyz.scm | 315 ++++++++-
gnu/packages/emulators.scm | 8 +-
gnu/packages/engineering.scm | 52 +-
gnu/packages/enlightenment.scm | 4 +-
gnu/packages/fabric-management.scm | 6 +
gnu/packages/fcitx.scm | 12 +-
gnu/packages/finance.scm | 72 +-
gnu/packages/fpga.scm | 4 +-
gnu/packages/freedesktop.scm | 68 +-
gnu/packages/fribidi.scm | 13 +-
gnu/packages/fvwm.scm | 7 +-
gnu/packages/game-development.scm | 7 +-
gnu/packages/games.scm | 57 +-
gnu/packages/geo.scm | 222 ++++++-
gnu/packages/gimp.scm | 42 +-
gnu/packages/glib.scm | 5 +-
gnu/packages/gnome-xyz.scm | 213 ++++++
gnu/packages/gnome.scm | 187 ++++--
gnu/packages/gnupg.scm | 34 +-
gnu/packages/gnuzilla.scm | 14 +-
gnu/packages/golang.scm | 6 +-
gnu/packages/graphics.scm | 12 +-
gnu/packages/gtk.scm | 27 +-
gnu/packages/guile-xyz.scm | 16 +-
gnu/packages/haskell-apps.scm | 37 +-
gnu/packages/haskell-xyz.scm | 38 ++
gnu/packages/ibus.scm | 6 +-
gnu/packages/image-viewers.scm | 1 +
gnu/packages/image.scm | 5 +-
gnu/packages/installers.scm | 27 +-
gnu/packages/irc.scm | 5 +-
gnu/packages/java-maths.scm | 1 +
gnu/packages/java.scm | 478 +++++++++++++-
gnu/packages/jrnl.scm | 17 +-
gnu/packages/kde.scm | 43 ++
gnu/packages/libreoffice.scm | 7 +-
gnu/packages/linux.scm | 73 ++-
gnu/packages/llvm.scm | 13 +-
gnu/packages/logging.scm | 8 +-
gnu/packages/lolcode.scm | 22 +-
gnu/packages/lxqt.scm | 19 +-
gnu/packages/mail.scm | 209 +++---
gnu/packages/make-bootstrap.scm | 80 +--
gnu/packages/mes.scm | 35 +
gnu/packages/messaging.scm | 33 +-
gnu/packages/monitoring.scm | 4 +-
gnu/packages/mp3.scm | 4 +-
gnu/packages/mpd.scm | 4 +-
gnu/packages/mpi.scm | 88 ++-
gnu/packages/music.scm | 388 ++++++++++-
gnu/packages/ncurses.scm | 4 +-
gnu/packages/networking.scm | 49 +-
gnu/packages/ocaml.scm | 8 +-
gnu/packages/opencl.scm | 8 +-
gnu/packages/package-management.scm | 10 +-
gnu/packages/parallel.scm | 33 +-
gnu/packages/password-utils.scm | 148 +++--
gnu/packages/patches/cpio-CVE-2016-2037.patch | 49 --
.../docker-adjust-tests-for-changes-in-go.patch | 67 ++
gnu/packages/patches/fribidi-CVE-2019-18397.patch | 26 +
gnu/packages/patches/icecat-gnuzilla-fixes.patch | 727 +++++++++++++++------
gnu/packages/patches/icecat-makeicecat.patch | 2 +-
.../patches/java-svg-salamander-Fix-non-det.patch | 86 +++
.../patches/libvirt-create-machine-cgroup.patch | 48 ++
gnu/packages/patches/openmpi-psm2-priority.patch | 21 +
gnu/packages/patches/patchelf-page-size.patch | 70 --
gnu/packages/patches/patchelf-rework-for-arm.patch | 473 --------------
gnu/packages/patches/udiskie-no-appindicator.patch | 155 +++++
.../patches/vlc-fix-test_libvlc_slaves.patch | 35 +
gnu/packages/pdf.scm | 4 +-
gnu/packages/perl-compression.scm | 24 +-
gnu/packages/perl.scm | 198 +++++-
gnu/packages/perl6.scm | 6 +-
gnu/packages/pkg-config.scm | 67 +-
gnu/packages/plotutils.scm | 6 +-
gnu/packages/polkit.scm | 6 +-
gnu/packages/pretty-print.scm | 4 +-
gnu/packages/protobuf.scm | 6 +-
gnu/packages/python-crypto.scm | 28 +
gnu/packages/python-xyz.scm | 71 +-
gnu/packages/qt.scm | 347 ++--------
gnu/packages/rdesktop.scm | 34 +-
gnu/packages/rdf.scm | 4 +-
gnu/packages/regex.scm | 6 +-
gnu/packages/rsync.scm | 15 +-
gnu/packages/ruby.scm | 11 +-
gnu/packages/sagemath.scm | 6 +-
gnu/packages/samba.scm | 18 +-
gnu/packages/scheme.scm | 14 +-
gnu/packages/serialization.scm | 40 +-
gnu/packages/shells.scm | 4 +-
gnu/packages/shellutils.scm | 11 +-
gnu/packages/speech.scm | 12 +-
gnu/packages/sphinx.scm | 34 +-
gnu/packages/ssh.scm | 51 +-
gnu/packages/statistics.scm | 76 +--
gnu/packages/sync.scm | 6 +-
gnu/packages/telephony.scm | 11 +-
gnu/packages/terminals.scm | 22 +-
gnu/packages/tex.scm | 25 +-
gnu/packages/text-editors.scm | 31 +-
gnu/packages/textutils.scm | 36 +-
gnu/packages/tigervnc.scm | 1 +
gnu/packages/tls.scm | 12 +-
gnu/packages/upnp.scm | 45 +-
gnu/packages/version-control.scm | 17 +-
gnu/packages/video.scm | 68 +-
gnu/packages/vim.scm | 16 +-
gnu/packages/virtualization.scm | 56 +-
gnu/packages/vpn.scm | 22 +-
gnu/packages/web-browsers.scm | 26 +-
gnu/packages/web.scm | 186 +++++-
gnu/packages/webkit.scm | 8 +-
gnu/packages/wine.scm | 85 +++
gnu/packages/wm.scm | 20 +-
gnu/packages/wxwidgets.scm | 62 ++
gnu/packages/xdisorg.scm | 12 +-
gnu/packages/xfce.scm | 46 +-
gnu/packages/xml.scm | 14 +-
gnu/packages/xorg.scm | 7 +-
gnu/services.scm | 40 +-
gnu/services/audio.scm | 7 +
gnu/services/dbus.scm | 48 +-
gnu/services/desktop.scm | 6 +-
gnu/services/dns.scm | 86 +++
gnu/services/monitoring.scm | 3 +-
gnu/services/networking.scm | 156 ++++-
gnu/services/virtualization.scm | 6 +-
gnu/services/web.scm | 37 +-
gnu/system/file-systems.scm | 5 +-
gnu/tests/docker.scm | 2 +-
gnu/tests/install.scm | 6 +-
gnu/tests/singularity.scm | 2 +-
guix/build/make-bootstrap.scm | 1 -
guix/build/svn.scm | 4 +
guix/build/syscalls.scm | 35 +-
guix/derivations.scm | 2 +-
guix/scripts/graph.scm | 105 +--
guix/scripts/package.scm | 70 +-
guix/scripts/pull.scm | 40 +-
guix/scripts/system/search.scm | 10 +-
guix/svn-download.scm | 15 +-
guix/ui.scm | 64 +-
nix/libstore/build.cc | 10 +-
nix/libstore/local-store.cc | 3 -
tests/guix-build.sh | 4 +
tests/guix-graph.sh | 8 +-
tests/guix-package.sh | 10 +-
tests/networking.scm | 19 +-
192 files changed, 6399 insertions(+), 2867 deletions(-)
diff --cc gnu/packages/java.scm
index 15e8144,65f8d6a..955625b
--- a/gnu/packages/java.scm
+++ b/gnu/packages/java.scm
@@@ -9,8 -9,7 +9,8 @@@
;;; Copyright © 2017, 2019 Tobias Geerinckx-Rice <address@hidden>
;;; Copyright © 2018, 2019 Gábor Boskovits <address@hidden>
;;; Copyright © 2018 Chris Marusich <address@hidden>
- ;;; Copyright © 2018 Efraim Flashner <address@hidden>
+ ;;; Copyright © 2018, 2019 Efraim Flashner <address@hidden>
+;;; Copyright © 2019 Björn Höfling <address@hidden>
;;;
;;; This file is part of GNU Guix.
;;;
diff --cc gnu/packages/kde.scm
index 9755f66,ab51185..79eb20c
--- a/gnu/packages/kde.scm
+++ b/gnu/packages/kde.scm
@@@ -6,7 -5,7 +6,8 @@@
;;; Copyright © 2017, 2018, 2019 Tobias Geerinckx-Rice <address@hidden>
;;; Copyright © 2018 Gábor Boskovits <address@hidden>
;;; Copyright © 2019 Nicolas Goaziou <address@hidden>
+;;; Copyright © 2018, 2019 Hartmut Goebel <address@hidden>
+ ;;; Copyright © 2019 Ludovic Courtès <address@hidden>
;;;
;;; This file is part of GNU Guix.
;;;
diff --cc gnu/packages/qt.scm
index 222a0cc,241e73d..5f4f29a
--- a/gnu/packages/qt.scm
+++ b/gnu/packages/qt.scm
@@@ -225,10 -184,8 +185,9 @@@ system, and the core design of Django i
("libxslt" ,libxslt)
("libxtst" ,libxtst)
("mtdev" ,mtdev)
- ("mariadb" ,mariadb)
+ ("mariadb" ,mariadb "lib")
+ ("mariadb-dev" ,mariadb "dev")
("nss" ,nss)
- ("openssl" ,openssl)
("postgresql" ,postgresql)
("pulseaudio" ,pulseaudio)
("pcre2" ,pcre2)