[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
01/03: Merge branch 'master' into core-updates
|
From: |
guix-commits |
|
Subject: |
01/03: Merge branch 'master' into core-updates |
|
Date: |
Thu, 13 Jun 2019 12:11:22 -0400 (EDT) |
civodul pushed a commit to branch core-updates
in repository guix.
commit d9bbfe042e06df35c12e4b8f53bfb1889cba90bf
Merge: f87a7cc 47f2168
Author: Ludovic Courtès <address@hidden>
Date: Thu Jun 13 13:24:35 2019 +0200
Merge branch 'master' into core-updates
.dir-locals.el | 4 +
Makefile.am | 1 +
doc/guix.texi | 689 ++++++++++++++++++++-
etc/guix-daemon.service.in | 2 +-
etc/guix-publish.service.in | 2 +-
gnu/artwork.scm | 4 +-
gnu/build/accounts.scm | 24 +-
gnu/build/activation.scm | 37 +-
gnu/build/linux-boot.scm | 4 +
gnu/build/locale.scm | 95 +++
gnu/installer/connman.scm | 2 +-
gnu/installer/locale.scm | 19 +-
gnu/installer/newt/network.scm | 2 +-
gnu/installer/newt/wifi.scm | 1 +
gnu/installer/parted.scm | 3 +-
gnu/installer/services.scm | 7 +-
gnu/local.mk | 26 +-
gnu/packages/admin.scm | 39 +-
gnu/packages/aidc.scm | 55 +-
gnu/packages/algebra.scm | 4 +-
gnu/packages/animation.scm | 4 +-
gnu/packages/aspell.scm | 84 ++-
gnu/packages/astronomy.scm | 8 +-
gnu/packages/audio.scm | 14 +-
gnu/packages/backup.scm | 23 +-
gnu/packages/base.scm | 37 +-
gnu/packages/benchmark.scm | 6 +-
gnu/packages/bioconductor.scm | 221 ++++++-
gnu/packages/bioinformatics.scm | 79 ++-
gnu/packages/bootstrap.scm | 1 +
gnu/packages/build-tools.scm | 9 +-
gnu/packages/busybox.scm | 4 +-
gnu/packages/chromium.scm | 85 +--
gnu/packages/compression.scm | 13 +-
gnu/packages/coq.scm | 10 +-
gnu/packages/cpp.scm | 45 +-
gnu/packages/cran.scm | 142 +++--
gnu/packages/crates-io.scm | 92 +++
gnu/packages/cross-base.scm | 12 +-
gnu/packages/crypto.scm | 4 +-
gnu/packages/databases.scm | 29 +-
gnu/packages/datastructures.scm | 4 +-
gnu/packages/debian.scm | 19 +-
gnu/packages/dictionaries.scm | 4 +-
gnu/packages/disk.scm | 22 +-
gnu/packages/display-managers.scm | 9 +
gnu/packages/django.scm | 4 +-
gnu/packages/education.scm | 107 ++++
gnu/packages/elf.scm | 23 +-
gnu/packages/emacs-xyz.scm | 521 +++++++++++-----
gnu/packages/emulators.scm | 9 +-
gnu/packages/enlightenment.scm | 6 +-
gnu/packages/finance.scm | 21 +-
gnu/packages/fonts.scm | 20 +-
gnu/packages/fpga.scm | 6 +-
gnu/packages/game-development.scm | 28 +-
gnu/packages/games.scm | 77 ++-
gnu/packages/geo.scm | 29 +
gnu/packages/gettext.scm | 4 +-
gnu/packages/gimp.scm | 8 +-
gnu/packages/gl.scm | 8 +-
gnu/packages/gnome.scm | 132 +++-
gnu/packages/gnucash.scm | 9 +-
gnu/packages/gnupg.scm | 4 +-
gnu/packages/gnuzilla.scm | 67 +-
gnu/packages/golang.scm | 26 +-
gnu/packages/gpodder.scm | 10 +-
gnu/packages/gps.scm | 35 +-
gnu/packages/gtk.scm | 5 +-
gnu/packages/guile-xyz.scm | 155 ++++-
gnu/packages/haskell-web.scm | 11 +-
gnu/packages/haskell.scm | 19 +-
gnu/packages/image-viewers.scm | 48 ++
gnu/packages/image.scm | 8 +-
gnu/packages/kawa.scm | 53 ++
gnu/packages/libevent.scm | 46 +-
gnu/packages/linux.scm | 272 +++++---
gnu/packages/lisp.scm | 48 ++
gnu/packages/machine-learning.scm | 14 +-
gnu/packages/mail.scm | 14 +-
gnu/packages/mate.scm | 165 +++--
gnu/packages/maths.scm | 43 +-
gnu/packages/mes.scm | 39 +-
gnu/packages/messaging.scm | 12 +-
gnu/packages/mpd.scm | 4 +-
gnu/packages/music.scm | 12 +-
gnu/packages/networking.scm | 8 +-
gnu/packages/node.scm | 48 +-
gnu/packages/ocaml.scm | 17 +-
gnu/packages/package-management.scm | 30 +-
gnu/packages/password-utils.scm | 13 +-
.../patches/borg-fix-hard-link-preloading.patch | 157 -----
.../patches/emacs-realgud-fix-configure-ac.patch | 27 -
.../gnucash-fix-test-transaction-failure.patch | 54 --
.../gtksourceview-2-add-default-directory.patch | 33 +
gnu/packages/patches/icecat-makeicecat.patch | 56 +-
.../patches/libevent-2.0-CVE-2016-10195.patch | 41 --
.../patches/libevent-2.0-CVE-2016-10196.patch | 41 --
.../patches/libevent-2.0-CVE-2016-10197.patch | 39 --
...vent-2.0-evbuffer-add-use-last-with-datap.patch | 38 --
gnu/packages/patches/libevent-2.1-dns-tests.patch | 26 -
.../patches/libevent-2.1-skip-failing-test.patch | 24 -
gnu/packages/patches/libevent-dns-tests.patch | 16 -
gnu/packages/patches/polkit-CVE-2018-19788.patch | 197 ------
.../patches/racket-store-checksum-override.patch | 35 +-
.../patches/supertux-fix-build-with-gcc5.patch | 75 +++
.../patches/supertux-unbundle-squirrel.patch | 53 ++
gnu/packages/patches/txr-shell.patch | 59 ++
.../patches/usb-modeswitch-accept-config-arg.patch | 42 ++
gnu/packages/patchutils.scm | 167 +++++
gnu/packages/photo.scm | 8 +-
gnu/packages/php.scm | 8 +-
gnu/packages/polkit.scm | 10 +-
gnu/packages/python-crypto.scm | 8 +-
gnu/packages/python-web.scm | 25 +-
gnu/packages/python-xyz.scm | 25 +-
gnu/packages/regex.scm | 4 +-
gnu/packages/scheme.scm | 4 +-
gnu/packages/sdl.scm | 11 +-
gnu/packages/shells.scm | 37 ++
gnu/packages/slang.scm | 10 +-
gnu/packages/squirrel.scm | 76 ++-
gnu/packages/statistics.scm | 64 +-
gnu/packages/storage.scm | 4 +-
gnu/packages/syncthing.scm | 12 +-
gnu/packages/tbb.scm | 4 +-
gnu/packages/terminals.scm | 4 +-
gnu/packages/tls.scm | 4 +-
gnu/packages/tmux.scm | 4 +-
gnu/packages/usb-modeswitch.scm | 166 +++++
gnu/packages/version-control.scm | 6 +-
gnu/packages/video.scm | 26 +-
gnu/packages/vim.scm | 33 +-
gnu/packages/vpn.scm | 4 +-
gnu/packages/vulkan.scm | 4 +-
gnu/packages/wget.scm | 14 +-
gnu/packages/wine.scm | 8 +-
gnu/packages/wm.scm | 42 +-
gnu/packages/xfce.scm | 42 ++
gnu/packages/xml.scm | 10 +-
gnu/packages/xorg.scm | 15 +-
gnu/services/auditd.scm | 54 ++
gnu/services/base.scm | 117 ++--
gnu/services/cgit.scm | 3 +-
gnu/services/cups.scm | 2 +
gnu/services/docker.scm | 61 +-
gnu/services/getmail.scm | 380 ++++++++++++
gnu/services/herd.scm | 4 +-
gnu/services/nix.scm | 113 ++++
gnu/services/sddm.scm | 16 +-
gnu/services/web.scm | 368 ++++++++++-
gnu/services/xorg.scm | 2 +-
gnu/system/linux-container.scm | 53 +-
gnu/system/locale.scm | 83 +--
gnu/tests/docker.scm | 19 +-
gnu/tests/mail.scm | 178 +++++-
gnu/tests/singularity.scm | 137 ++++
gnu/tests/web.scm | 164 ++++-
guix/build-system/cargo.scm | 117 +++-
guix/build-system/guile.scm | 6 +-
guix/build/cargo-build-system.scm | 54 +-
guix/build/compile.scm | 8 +-
guix/build/guile-build-system.scm | 52 +-
guix/build/syscalls.scm | 40 ++
guix/channels.scm | 4 +-
guix/deprecation.scm | 35 +-
guix/derivations.scm | 13 +-
guix/diagnostics.scm | 173 ++++++
guix/discovery.scm | 4 +-
guix/download.scm | 4 +-
guix/git-download.scm | 4 +-
guix/gnu-maintenance.scm | 6 +-
guix/import/cabal.scm | 35 +-
guix/import/cran.scm | 4 +-
guix/import/crate.scm | 47 +-
guix/import/hackage.scm | 59 +-
guix/import/print.scm | 13 +-
guix/import/utils.scm | 95 ++-
guix/lzlib.scm | 116 +++-
guix/nar.scm | 42 +-
guix/progress.scm | 4 +-
guix/scripts/challenge.scm | 4 +-
guix/scripts/offload.scm | 25 -
guix/scripts/pack.scm | 42 ++
guix/scripts/package.scm | 30 +-
guix/scripts/publish.scm | 357 +++++++----
guix/scripts/substitute.scm | 141 +++--
guix/scripts/weather.scm | 5 +-
guix/self.scm | 27 +-
guix/ssh.scm | 1 +
guix/store.scm | 28 +-
guix/tests.scm | 1 +
guix/ui.scm | 152 +----
guix/utils.scm | 27 +-
nix/libstore/build.cc | 2 +-
nix/libstore/globals.cc | 2 +-
nix/libstore/store-api.cc | 2 +-
tests/crate.scm | 4 +-
tests/derivations.scm | 22 +
tests/guix-package.sh | 14 +
tests/hackage.scm | 168 +++--
tests/lzlib.scm | 10 +
tests/print.scm | 48 +-
tests/publish.scm | 154 ++++-
tests/store.scm | 20 +
tests/substitute.scm | 51 +-
tests/utils.scm | 68 +-
207 files changed, 7419 insertions(+), 2785 deletions(-)
diff --cc gnu/local.mk
index 06f3f3a,7f3fcae..a212dbc
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@@ -899,8 -902,8 +904,9 @@@ dist_patch_DATA =
%D%/packages/patches/gtk3-respect-GUIX_GTK3_PATH.patch \
%D%/packages/patches/gtk3-respect-GUIX_GTK3_IM_MODULE_FILE.patch \
%D%/packages/patches/gtkglext-disable-disable-deprecated.patch \
+ %D%/packages/patches/gtksourceview-2-add-default-directory.patch \
%D%/packages/patches/gzdoom-search-in-installed-share.patch \
+ %D%/packages/patches/handbrake-opt-in-nvenc.patch \
%D%/packages/patches/haskell-mode-unused-variables.patch \
%D%/packages/patches/haskell-mode-make-check.patch \
%D%/packages/patches/hdf4-architectures.patch \
@@@ -985,16 -990,9 +991,9 @@@
%D%/packages/patches/libcroco-CVE-2017-7960.patch \
%D%/packages/patches/libcroco-CVE-2017-7961.patch \
%D%/packages/patches/libdrm-symbol-check.patch \
- %D%/packages/patches/libevent-dns-tests.patch \
- %D%/packages/patches/libevent-2.0-CVE-2016-10195.patch \
- %D%/packages/patches/libevent-2.0-CVE-2016-10196.patch \
- %D%/packages/patches/libevent-2.0-CVE-2016-10197.patch \
- %D%/packages/patches/libevent-2.0-evbuffer-add-use-last-with-datap.patch
\
- %D%/packages/patches/libevent-2.1-dns-tests.patch \
- %D%/packages/patches/libevent-2.1-skip-failing-test.patch \
%D%/packages/patches/libexif-CVE-2016-6328.patch \
%D%/packages/patches/libexif-CVE-2017-7544.patch \
- %D%/packages/patches/libgcrypt-make-yat2m-reproducible.patch \
+ %D%/packages/patches/libgpg-error-gawk-compat.patch \
%D%/packages/patches/libgit2-avoid-python.patch \
%D%/packages/patches/libgit2-mtime-0.patch \
%D%/packages/patches/libgdata-fix-tests.patch \
diff --cc gnu/packages/mpd.scm
index a9e6e05,1d75592..668045c
--- a/gnu/packages/mpd.scm
+++ b/gnu/packages/mpd.scm
@@@ -100,10 -100,20 +100,10 @@@ interfacing MPD in the C, C++ & Objecti
"/mpd-" version ".tar.xz"))
(sha256
(base32
- "0mwpkbjsljj1khlnnjanvw3pgxbhsdl0bh2k9bxnpijn2gqq7q13"))))
+ "0ghda8g9q0bi6nrvl6n756d8f45spqpblkh77mnb4k9gmiv57qir"))))
(build-system meson-build-system)
(arguments
- `(#:configure-flags '("-Ddocumentation=true") ; The default is 'false'...
- #:phases
- (modify-phases %standard-phases
- (add-before 'configure 'expand-C++-include-path
- ;; Make <gcc>/include/c++/ext/string_conversions.h find <stdlib.h>.
- (lambda* (#:key inputs #:allow-other-keys)
- (let* ((path "CPLUS_INCLUDE_PATH")
- (gcc (assoc-ref inputs "gcc"))
- (c++ (string-append gcc "/include/c++")))
- (setenv path (string-append c++ ":" (getenv path)))
- #t))))))
+ `(#:configure-flags '("-Ddocumentation=true"))) ;the default is
'false'...
(inputs `(("ao" ,ao)
("alsa-lib" ,alsa-lib)
("avahi" ,avahi)
diff --cc gnu/packages/node.scm
index 2772f56,fc43fcb..df59a42
--- a/gnu/packages/node.scm
+++ b/gnu/packages/node.scm
@@@ -184,9 -171,9 +171,9 @@@
`(("c-ares" ,c-ares)
("http-parser" ,http-parser)
("icu4c" ,icu4c)
- ("libuv" ,libuv-1.19)
+ ("libuv" ,libuv)
("nghttp2" ,nghttp2 "lib")
- ("openssl" ,openssl-1.0)
- ("openssl" ,openssl-next)
++ ("openssl" ,openssl)
("zlib" ,zlib)))
(synopsis "Evented I/O for V8 JavaScript")
(description "Node.js is a platform built on Chrome's JavaScript runtime
diff --cc gnu/packages/tls.scm
index 1052d58,8e20101..eb853da
--- a/gnu/packages/tls.scm
+++ b/gnu/packages/tls.scm
@@@ -259,7 -268,8 +259,7 @@@ required structures."
(define-public openssl
(package
(name "openssl")
- (version "1.1.1b")
- (replacement openssl/fixed)
- (version "1.0.2p")
++ (version "1.1.1c")
(source (origin
(method url-fetch)
(uri (list (string-append
"https://www.openssl.org/source/openssl-";
@@@ -271,12 -281,13 +271,12 @@@
"/openssl-" version ".tar.gz")))
(sha256
(base32
- "0jza8cmznnyiia43056dij1jdmz62dx17wsn0zxksh9h6817nmaw"))
- "003xh9f898i56344vpvpxxxzmikivxig4xwlm7vbi7m8n43qxaah"))
- (patches (search-patches "openssl-runpath.patch"
- "openssl-c-rehash-in.patch"))))
++ "142c7zdlz06hjrrvinb9f276czc78bnkyhd9xma621qmmmwk1yzn"))
+ (patches (search-patches "openssl-1.1-c-rehash-in.patch"))))
(build-system gnu-build-system)
(outputs '("out"
- "doc" ;1.5MiB of man3 pages
- "static")) ;6MiB of .a files
+ "doc" ;6.8 MiB of man3 pages and full HTML documentation
+ "static")) ;6.4 MiB of .a files
(native-inputs `(("perl" ,perl)))
(arguments
`(#:disallowed-references (,perl)