[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
01/01: Merge remote-tracking branch master into core-updates
|
From: |
guix-commits |
|
Subject: |
01/01: Merge remote-tracking branch master into core-updates |
|
Date: |
Sat, 16 Nov 2019 03:36:31 -0500 (EST) |
mothacehe pushed a commit to branch core-updates
in repository guix.
commit 154d97abdd16674fdebc763351f661bbcdc869a4
Merge: e4696c6 87e7faa
Author: Mathieu Othacehe <address@hidden>
Date: Sat Nov 16 09:34:27 2019 +0100
Merge remote-tracking branch master into core-updates
Makefile.am | 3 +-
README | 3 +-
build-aux/run-system-tests.scm | 45 +-
build-aux/test-env.in | 6 +-
config-daemon.ac | 3 -
configure.ac | 12 +-
doc/build.scm | 51 +-
doc/contributing.texi | 3 +-
doc/guix-cookbook.texi | 1261 +++++++++-
doc/guix.texi | 360 ++-
etc/news.scm | 202 +-
gnu/bootloader/u-boot.scm | 51 +
gnu/ci.scm | 3 +-
gnu/local.mk | 37 +-
gnu/machine/digital-ocean.scm | 422 ++++
gnu/packages.scm | 4 +-
gnu/packages/abiword.scm | 2 +-
gnu/packages/admin.scm | 59 +-
gnu/packages/aidc.scm | 3 +-
gnu/packages/algebra.scm | 19 +-
gnu/packages/android.scm | 16 +-
gnu/packages/antivirus.scm | 6 +-
gnu/packages/aspell.scm | 37 +-
gnu/packages/assembly.scm | 4 +
gnu/packages/audio.scm | 200 +-
gnu/packages/avahi.scm | 12 +
gnu/packages/backup.scm | 83 +-
gnu/packages/base.scm | 27 +-
gnu/packages/bash.scm | 20 +-
gnu/packages/bioconductor.scm | 97 +-
gnu/packages/bioinformatics.scm | 143 +-
gnu/packages/bittorrent.scm | 19 +-
gnu/packages/boost.scm | 50 +
gnu/packages/bootloaders.scm | 87 +-
gnu/packages/bootstrap.scm | 71 +-
gnu/packages/build-tools.scm | 18 +-
gnu/packages/cdrom.scm | 17 +-
gnu/packages/check.scm | 105 +-
gnu/packages/chromium.scm | 108 +-
gnu/packages/ci.scm | 10 +-
gnu/packages/cmake.scm | 16 +
gnu/packages/code.scm | 65 +-
gnu/packages/commencement.scm | 29 +-
gnu/packages/compression.scm | 16 +-
gnu/packages/connman.scm | 15 +-
gnu/packages/coq.scm | 3 +-
gnu/packages/cpio.scm | 5 +-
gnu/packages/cpp.scm | 66 +-
gnu/packages/cran.scm | 338 +--
gnu/packages/crates-io.scm | 2418 ++++++++++----------
gnu/packages/cross-base.scm | 13 +-
gnu/packages/crypto.scm | 74 +-
gnu/packages/cryptsetup.scm | 4 +-
gnu/packages/cups.scm | 129 +-
gnu/packages/databases.scm | 105 +-
gnu/packages/debug.scm | 2 +-
gnu/packages/diffoscope.scm | 18 +-
gnu/packages/digest.scm | 1 +
gnu/packages/disk.scm | 8 +-
gnu/packages/django.scm | 5 +-
gnu/packages/dns.scm | 104 +-
gnu/packages/docker.scm | 9 +-
gnu/packages/dunst.scm | 4 +-
gnu/packages/education.scm | 8 +-
gnu/packages/electronics.scm | 16 +-
gnu/packages/elf.scm | 41 +-
gnu/packages/emacs-xyz.scm | 1164 ++++++++--
gnu/packages/emulators.scm | 106 +-
gnu/packages/engineering.scm | 56 +-
gnu/packages/enlightenment.scm | 28 +-
gnu/packages/fabric-management.scm | 64 +
gnu/packages/fcitx.scm | 12 +-
gnu/packages/finance.scm | 84 +-
gnu/packages/firmware.scm | 25 +-
gnu/packages/fonts.scm | 27 +-
gnu/packages/fontutils.scm | 51 +-
gnu/packages/fpga.scm | 4 +-
gnu/packages/freedesktop.scm | 89 +-
gnu/packages/fribidi.scm | 8 +
gnu/packages/fvwm.scm | 7 +-
gnu/packages/game-development.scm | 337 ++-
gnu/packages/games.scm | 114 +-
gnu/packages/gcc.scm | 4 +
gnu/packages/genealogy.scm | 7 +-
gnu/packages/geo.scm | 226 +-
gnu/packages/gettext.scm | 6 +-
gnu/packages/gimp.scm | 42 +-
gnu/packages/glib.scm | 32 +-
gnu/packages/gnome-xyz.scm | 213 ++
gnu/packages/gnome.scm | 406 ++--
gnu/packages/gnunet.scm | 4 +-
gnu/packages/gnupg.scm | 36 +-
gnu/packages/gnuzilla.scm | 308 ++-
gnu/packages/gobby.scm | 7 +-
gnu/packages/golang.scm | 802 +------
gnu/packages/gps.scm | 4 +-
gnu/packages/graph.scm | 2 +-
gnu/packages/graphics.scm | 50 +-
gnu/packages/gtk.scm | 35 +-
gnu/packages/guile-xyz.scm | 98 +-
gnu/packages/guile.scm | 17 +-
gnu/packages/hardware.scm | 4 +-
gnu/packages/haskell-apps.scm | 101 +-
gnu/packages/haskell-xyz.scm | 92 +
gnu/packages/ibus.scm | 6 +-
gnu/packages/image-processing.scm | 7 +-
gnu/packages/image-viewers.scm | 1 +
gnu/packages/image.scm | 17 +-
gnu/packages/installers.scm | 27 +-
gnu/packages/ipfs.scm | 18 +-
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/kodi.scm | 9 +-
gnu/packages/libedit.scm | 6 +-
gnu/packages/libreoffice.scm | 52 +-
gnu/packages/linux.scm | 222 +-
gnu/packages/lisp.scm | 379 ++-
gnu/packages/llvm.scm | 13 +-
gnu/packages/logging.scm | 8 +-
gnu/packages/lolcode.scm | 22 +-
gnu/packages/lxqt.scm | 65 +-
gnu/packages/machine-learning.scm | 46 +-
gnu/packages/mail.scm | 101 +-
gnu/packages/make-bootstrap.scm | 131 +-
gnu/packages/man.scm | 18 +-
gnu/packages/maths.scm | 56 +-
gnu/packages/mes.scm | 35 +
gnu/packages/messaging.scm | 135 +-
gnu/packages/mingw.scm | 47 +-
gnu/packages/monitoring.scm | 4 +-
gnu/packages/mp3.scm | 8 +-
gnu/packages/mpd.scm | 4 +-
gnu/packages/mpi.scm | 86 +-
gnu/packages/multiprecision.scm | 43 +-
gnu/packages/music.scm | 551 ++++-
gnu/packages/ncurses.scm | 4 +-
gnu/packages/networking.scm | 92 +-
gnu/packages/ocaml.scm | 8 +-
gnu/packages/opencl.scm | 8 +-
gnu/packages/openstack.scm | 9 +-
gnu/packages/package-management.scm | 10 +-
gnu/packages/parallel.scm | 37 +-
gnu/packages/password-utils.scm | 188 +-
.../arm-trusted-firmware-disable-hdcp.patch | 82 +
...-trusted-firmware-optional-bin-generation.patch | 86 +
...-trusted-firmware-rockchip-disable-binary.patch | 73 +
gnu/packages/patches/avahi-CVE-2018-1000845.patch | 42 +
gnu/packages/patches/cpio-CVE-2016-2037.patch | 49 -
.../docker-adjust-tests-for-changes-in-go.patch | 67 +
.../emacs-magit-log-format-author-margin.patch | 72 +
gnu/packages/patches/icecat-gnuzilla-fixes.patch | 546 +++++
gnu/packages/patches/icecat-makeicecat.patch | 22 +-
.../patches/java-svg-salamander-Fix-non-det.patch | 86 +
.../patches/kodi-increase-test-timeout.patch | 18 +
.../patches/libmpeg2-arm-private-symbols.patch | 48 +
.../patches/libmpeg2-global-symbol-test.patch | 63 +
gnu/packages/patches/libreoffice-boost.patch | 17 -
.../patches/libvirt-create-machine-cgroup.patch | 48 +
gnu/packages/patches/mumps-shared-libseq.patch | 42 +
gnu/packages/patches/mumps-shared-mumps.patch | 63 +
gnu/packages/patches/mumps-shared-pord.patch | 77 +
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 ----
.../ruby-concurrent-ignore-broken-test.patch | 16 -
.../patches/ruby-concurrent-test-arm.patch | 36 -
.../patches/sbcl-graph-asdf-definitions.patch | 70 +
.../seahorse-gkr-use-0-on-empty-flags.patch | 32 +
gnu/packages/patches/tomb-fix-errors-on-open.patch | 25 +
gnu/packages/patches/udiskie-no-appindicator.patch | 155 ++
.../patches/vlc-fix-test_libvlc_slaves.patch | 35 +
.../patches/weasyprint-library-paths.patch | 43 +
.../patches/xorriso-no-mbr-in-inner-efi.patch | 47 -
.../xorriso-no-partition-table-in-inner-efi.patch | 107 -
gnu/packages/patchutils.scm | 21 +-
gnu/packages/pdf.scm | 198 +-
gnu/packages/perl-check.scm | 9 +-
gnu/packages/perl-compression.scm | 24 +-
gnu/packages/perl.scm | 279 ++-
gnu/packages/perl6.scm | 6 +-
gnu/packages/php.scm | 4 +-
gnu/packages/pkg-config.scm | 67 +-
gnu/packages/plotutils.scm | 6 +-
gnu/packages/poedit.scm | 5 +-
gnu/packages/polkit.scm | 6 +-
gnu/packages/pretty-print.scm | 4 +-
gnu/packages/protobuf.scm | 41 +-
gnu/packages/python-check.scm | 31 +
gnu/packages/python-crypto.scm | 28 +
gnu/packages/python-web.scm | 141 +-
gnu/packages/python-xyz.scm | 704 ++++--
gnu/packages/qt.scm | 347 +--
gnu/packages/rdesktop.scm | 34 +-
gnu/packages/rdf.scm | 4 +-
gnu/packages/regex.scm | 6 +-
gnu/packages/robotics.scm | 2 +-
gnu/packages/rsync.scm | 15 +-
gnu/packages/ruby.scm | 91 +-
gnu/packages/rust-cbindgen.scm | 87 +
gnu/packages/sagemath.scm | 12 +-
gnu/packages/samba.scm | 18 +-
gnu/packages/scheme.scm | 14 +-
gnu/packages/search.scm | 6 +-
gnu/packages/security-token.scm | 83 +-
gnu/packages/serialization.scm | 57 +-
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 | 130 +-
gnu/packages/sync.scm | 6 +-
gnu/packages/syncthing.scm | 246 +-
gnu/packages/telephony.scm | 13 +-
gnu/packages/terminals.scm | 69 +-
gnu/packages/tex.scm | 25 +-
gnu/packages/text-editors.scm | 35 +-
gnu/packages/textutils.scm | 36 +-
gnu/packages/tigervnc.scm | 1 +
gnu/packages/tls.scm | 15 +-
gnu/packages/tor.scm | 25 +-
gnu/packages/toys.scm | 92 +
gnu/packages/upnp.scm | 45 +-
gnu/packages/version-control.scm | 17 +-
gnu/packages/video.scm | 108 +-
gnu/packages/vim.scm | 37 +-
gnu/packages/virtualization.scm | 68 +-
gnu/packages/vpn.scm | 32 +-
gnu/packages/web-browsers.scm | 28 +-
gnu/packages/web.scm | 222 +-
gnu/packages/webkit.scm | 8 +-
gnu/packages/wine.scm | 92 +-
gnu/packages/wm.scm | 94 +-
gnu/packages/wxwidgets.scm | 62 +
gnu/packages/xdisorg.scm | 61 +-
gnu/packages/xfce.scm | 46 +-
gnu/packages/xml.scm | 18 +-
gnu/packages/xorg.scm | 7 +-
gnu/services.scm | 40 +-
gnu/services/audio.scm | 92 +-
gnu/services/base.scm | 229 +-
gnu/services/cuirass.scm | 5 +-
gnu/services/dbus.scm | 48 +-
gnu/services/desktop.scm | 59 +-
gnu/services/dns.scm | 86 +
gnu/services/getmail.scm | 4 +-
gnu/services/herd.scm | 7 +-
gnu/services/monitoring.scm | 3 +-
gnu/services/networking.scm | 189 +-
gnu/services/sddm.scm | 10 +-
gnu/services/virtualization.scm | 6 +-
gnu/services/web.scm | 37 +-
gnu/services/xorg.scm | 5 +-
gnu/system/file-systems.scm | 5 +-
gnu/system/install.scm | 18 +
gnu/tests/docker.scm | 2 +-
gnu/tests/install.scm | 6 +-
gnu/tests/singularity.scm | 2 +-
guix/build-system/asdf.scm | 13 +-
guix/build/download.scm | 3 +-
guix/build/make-bootstrap.scm | 1 -
guix/build/svn.scm | 4 +
guix/build/syscalls.scm | 35 +-
guix/channels.scm | 2 +-
guix/cve.scm | 376 ++-
guix/derivations.scm | 38 +-
guix/gexp.scm | 48 +-
guix/inferior.scm | 143 +-
guix/packages.scm | 4 +-
guix/profiles.scm | 3 +-
guix/scripts/build.scm | 15 +-
guix/scripts/graph.scm | 105 +-
guix/scripts/offload.scm | 22 +-
guix/scripts/package.scm | 70 +-
guix/scripts/pull.scm | 62 +-
guix/scripts/system/reconfigure.scm | 5 +-
guix/scripts/system/search.scm | 10 +-
guix/scripts/time-machine.scm | 135 ++
guix/ssh.scm | 10 +-
guix/store.scm | 79 +-
guix/svn-download.scm | 15 +-
guix/ui.scm | 64 +-
nix/libstore/build.cc | 10 +-
nix/libstore/gc.cc | 7 +-
nix/libstore/local-store.cc | 20 +-
nix/libstore/local-store.hh | 2 +
nix/libstore/store-api.hh | 4 +
nix/nix-daemon/nix-daemon.cc | 24 +-
tests/containers.scm | 1 +
tests/cve-sample.json | 1279 +++++++++++
tests/cve-sample.xml | 616 -----
tests/cve.scm | 85 +-
tests/guix-build.sh | 4 +
tests/guix-daemon.sh | 21 +
tests/guix-graph.sh | 8 +-
tests/guix-package.sh | 10 +-
tests/lint.scm | 40 +-
tests/networking.scm | 19 +-
tests/store.scm | 13 +-
302 files changed, 18073 insertions(+), 7816 deletions(-)
diff --cc gnu/local.mk
index 21318af,0bc23b9..4cf68dc
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@@ -694,7 -698,11 +698,10 @@@ dist_patch_DATA =
%D%/packages/patches/antlr3-3_1-fix-java8-compilation.patch \
%D%/packages/patches/antlr3-3_3-fix-java8-compilation.patch \
%D%/packages/patches/apr-skip-getservbyname-test.patch \
+ %D%/packages/patches/arm-trusted-firmware-disable-hdcp.patch \
+ %D%/packages/patches/arm-trusted-firmware-optional-bin-generation.patch
\
+ %D%/packages/patches/arm-trusted-firmware-rockchip-disable-binary.patch
\
%D%/packages/patches/aspell-default-dict-dir.patch \
- %D%/packages/patches/aspell-gcc-compat.patch \
%D%/packages/patches/ath9k-htc-firmware-binutils.patch \
%D%/packages/patches/ath9k-htc-firmware-gcc.patch \
%D%/packages/patches/ath9k-htc-firmware-objcopy.patch \
diff --cc gnu/packages/boost.scm
index 4e1e682,2ef0591..1d241ac
--- a/gnu/packages/boost.scm
+++ b/gnu/packages/boost.scm
@@@ -10,7 -10,7 +10,8 @@@
;;; Copyright © 2018, 2019 Ricardo Wurmus <address@hidden>
;;; Copyright © 2018 Maxim Cournoyer <address@hidden>
;;; Copyright © 2018 Efraim Flashner <address@hidden>
+;;; Copyright © 2019 Mathieu Othacehe <address@hidden>
+ ;;; Copyright © 2019 Giacomo Leidi <address@hidden>
;;;
;;; This file is part of GNU Guix.
;;;
diff --cc gnu/packages/cmake.scm
index b9ac84a,e2c244c..5c9b981
--- a/gnu/packages/cmake.scm
+++ b/gnu/packages/cmake.scm
@@@ -221,14 -219,22 +221,30 @@@ and workspaces that can be used in the
(append (search-patches "cmake-curl-certificates.patch")
(origin-patches (package-source cmake))))))))
+(define-public cmake-minimal-cross
+ (package
+ (inherit cmake-minimal)
+ (name "cmake-minimal-cross")
+ (native-search-paths '())
+ (search-paths
+ (package-native-search-paths cmake-minimal))))
+
+ (define-public cmake-3.15.5
+ ;; CMake 3.15.5 fixes some issues, but declare another version to
+ ;; avoid triggering the rebuild of all CMake-based packages.
+ ;; See <https://issues.guix.gnu.org/issue/38060>.
+ (package
+ (inherit cmake)
+ (version "3.15.5")
+ (source (origin
+ (inherit (package-source cmake))
+ (uri (string-append "https://www.cmake.org/files/v";
+ (version-major+minor version)
+ "/cmake-" version ".tar.gz"))
+ (sha256
+ (base32
+ "1d5y8d92axcc6rfqlsxamayfs3fc1vdby91hn5mx1kn02ppprpgv"))))))
+
(define-public emacs-cmake-mode
(package
(inherit cmake)
diff --cc gnu/packages/commencement.scm
index 58ee3ba,6a382c7..8bf7704
--- a/gnu/packages/commencement.scm
+++ b/gnu/packages/commencement.scm
@@@ -2375,9 -2398,13 +2377,10 @@@ exec ~a/bin/~a-~a -B~a/lib -Wl,-dynamic
(define gnu-make-final
;; The final GNU Make, which uses the final Guile.
- ;; FIXME: This is a mistake: we shouldn't be propagating GUILE-FINAL to
- ;; PKG-CONFIG.
- ;; TODO: Fix that on the next rebuild cycle.
(let ((pkg-config (package
- (inherit pkg-config)
- (inputs (%boot5-inputs))
+ (inherit %pkg-config) ;the native pkg-config
+ (inputs `(("guile" ,guile-final)
+ ,@(%boot5-inputs)))
(arguments
`(#:implicit-inputs? #f
,@(package-arguments pkg-config))))))
diff --cc gnu/packages/fribidi.scm
index b6cabdc,61aa6fd..ada7c26
--- a/gnu/packages/fribidi.scm
+++ b/gnu/packages/fribidi.scm
@@@ -27,8 -27,9 +27,9 @@@
(define-public fribidi
(package
+ (replacement fribidi/fixed)
(name "fribidi")
- (version "1.0.5")
+ (version "1.0.7")
(source
(origin
(method url-fetch)
diff --cc gnu/packages/glib.scm
index 62f0943,b3e85f8..8c3a077
--- a/gnu/packages/glib.scm
+++ b/gnu/packages/glib.scm
@@@ -199,16 -199,11 +199,19 @@@ shared NFS home directories."
("perl" ,perl) ; needed by GIO tests
("tzdata" ,tzdata-for-tests))) ; for tests/gdatetime.c
(arguments
- `(#:phases
+ `(;; TODO: Uncomment on the next rebuild cycle.
+ ;; #:disallowed-references (,tzdata-for-tests)
+
+ #:phases
(modify-phases %standard-phases
+ (add-after 'unpack 'patch-dbus-launch-path
+ (lambda* (#:key inputs #:allow-other-keys)
+ (let ((dbus (assoc-ref inputs "dbus")))
+ (substitute* "gio/gdbusaddress.c"
+ (("command_line = g_strdup_printf \\(\"dbus-launch")
+ (string-append "command_line = g_strdup_printf (\""
+ dbus "/bin/dbus-launch")))
+ #t)))
(add-before 'build 'pre-build
(lambda* (#:key inputs outputs #:allow-other-keys)
;; For tests/gdatetime.c.
diff --cc gnu/packages/version-control.scm
index 947873e,bde480e..99af761
--- a/gnu/packages/version-control.scm
+++ b/gnu/packages/version-control.scm
@@@ -521,11 -510,10 +526,13 @@@ everything from small to very large pro
(delete-file-recursively
(string-append out "/share/gitweb"))
#t)))))
+ ((#:make-flags flags)
+ `(delete "USE_LIBPCRE2=yes" ,flags))
((#:configure-flags flags)
- ''())
+ `(list
+ ,@(if (%current-target-system)
+ git-cross-configure-flags
+ '())))
((#:disallowed-references lst '())
`(,perl ,@lst))))
(outputs '("out"))
diff --cc gnu/packages/web.scm
index 5088aa0,7ce4889..076b821
--- a/gnu/packages/web.scm
+++ b/gnu/packages/web.scm
@@@ -35,8 -35,7 +35,9 @@@
;;; Copyright © 2019 Alex Griffin <address@hidden>
;;; Copyright © 2019 Hartmut Goebel <address@hidden>
;;; Copyright © 2019 Jakob L. Kreuze <address@hidden>
+;;; Copyright © 2019 Mathieu Othacehe <address@hidden>
+;;; Copyright © 2019 Pierre-Moana Levesque <address@hidden>
+ ;;; Copyright © 2019 Florian Pelz <address@hidden>
;;;
;;; This file is part of GNU Guix.
;;;