[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
01/02: Merge branch 'staging' into core-updates
|
From: |
guix-commits |
|
Subject: |
01/02: Merge branch 'staging' into core-updates |
|
Date: |
Fri, 24 May 2019 18:45:35 -0400 (EDT) |
mbakke pushed a commit to branch core-updates
in repository guix.
commit 57df83e07d4b5e78d9a54c1a88d05b4a9ed65714
Merge: 43d9ed7 136b7d8
Author: Marius Bakke <address@hidden>
Date: Sat May 25 00:25:15 2019 +0200
Merge branch 'staging' into core-updates
.mailmap | 1 +
Makefile.am | 29 +-
NEWS | 63 +-
build-aux/build-self.scm | 4 +
build-aux/check-available-binaries.scm | 24 +-
build-aux/update-NEWS.scm | 4 +-
config-daemon.ac | 2 +-
configure.ac | 10 +
doc/contributing.texi | 4 +-
doc/guix.texi | 279 +-
doc/htmlxref.cnf | 22 +-
doc/local.mk | 9 +-
etc/guix-daemon.service.in | 2 +-
etc/guix-install.sh | 6 +-
etc/guix-publish.service.in | 2 +-
etc/snippets/scheme-mode/guix-bzr-reference | 7 +
etc/snippets/scheme-mode/guix-origin | 6 +-
etc/substitutes/ci.guix.gnu.org.pub | 1 +
gnu/bootloader/grub.scm | 1 -
gnu/build/marionette.scm | 4 +-
gnu/build/shepherd.scm | 10 +-
gnu/build/vm.scm | 18 +-
gnu/installer.scm | 11 +-
gnu/installer/aux-files/SUPPORTED | 484 -
gnu/installer/locale.scm | 24 +-
gnu/installer/newt/ethernet.scm | 48 +-
gnu/installer/newt/menu.scm | 2 +-
gnu/installer/newt/network.scm | 56 +-
gnu/installer/newt/page.scm | 42 +-
gnu/installer/newt/partition.scm | 21 +-
gnu/installer/newt/user.scm | 40 +-
gnu/installer/parted.scm | 52 +-
gnu/installer/services.scm | 6 +-
gnu/installer/steps.scm | 7 +-
gnu/local.mk | 29 +-
gnu/packages/admin.scm | 118 +-
gnu/packages/algebra.scm | 4 +-
gnu/packages/anthy.scm | 3 +-
gnu/packages/assembly.scm | 47 +-
gnu/packages/audio.scm | 6 +-
.../{5.0-arm-veyron.conf => 5.1-arm-veyron.conf} | 117 +-
.../linux-libre/{5.0-arm.conf => 5.1-arm.conf} | 174 +-
.../linux-libre/{5.0-arm64.conf => 5.1-arm64.conf} | 213 +-
.../linux-libre/{5.0-i686.conf => 5.1-i686.conf} | 178 +-
.../{5.0-x86_64.conf => 5.1-x86_64.conf} | 187 +-
gnu/packages/backup.scm | 28 +-
gnu/packages/base.scm | 23 +
gnu/packages/bioconductor.scm | 759 +-
gnu/packages/bioinformatics.scm | 619 +-
gnu/packages/bittorrent.scm | 10 +-
gnu/packages/build-tools.scm | 31 +-
gnu/packages/c.scm | 31 +-
gnu/packages/calendar.scm | 9 +-
gnu/packages/cdrom.scm | 49 +-
gnu/packages/certs.scm | 10 +-
gnu/packages/check.scm | 6 +-
gnu/packages/chromium.scm | 8 +-
gnu/packages/cluster.scm | 2 +-
gnu/packages/cmake.scm | 2 +-
gnu/packages/code.scm | 18 +-
gnu/packages/commencement.scm | 3 +
gnu/packages/coq.scm | 90 +-
gnu/packages/cpp.scm | 6 +-
gnu/packages/cran.scm | 667 +-
gnu/packages/cross-base.scm | 30 +-
gnu/packages/crypto.scm | 2 +-
gnu/packages/cups.scm | 6 +-
gnu/packages/curl.scm | 14 +
gnu/packages/databases.scm | 155 +-
gnu/packages/datastructures.scm | 4 +-
gnu/packages/dav.scm | 3 +-
gnu/packages/dc.scm | 4 +-
gnu/packages/debug.scm | 2 +-
gnu/packages/dictionaries.scm | 6 +-
gnu/packages/disk.scm | 5 +-
gnu/packages/display-managers.scm | 3 +-
gnu/packages/django.scm | 79 +-
gnu/packages/dns.scm | 12 +-
gnu/packages/docker.scm | 338 +-
gnu/packages/ebook.scm | 104 +-
gnu/packages/education.scm | 21 +-
gnu/packages/elf.scm | 2 +-
gnu/packages/elixir.scm | 6 +-
gnu/packages/emacs-xyz.scm | 450 +-
gnu/packages/emacs.scm | 22 +-
gnu/packages/emulators.scm | 6 +-
gnu/packages/engineering.scm | 26 +-
gnu/packages/enlightenment.scm | 39 +-
gnu/packages/fabric-management.scm | 2 +-
gnu/packages/finance.scm | 17 +-
gnu/packages/firmware.scm | 20 +-
gnu/packages/fonts.scm | 58 +-
gnu/packages/freedesktop.scm | 6 +-
gnu/packages/game-development.scm | 103 +-
gnu/packages/games.scm | 209 +-
gnu/packages/gcc.scm | 438 +-
gnu/packages/gdb.scm | 21 +-
gnu/packages/geo.scm | 17 +-
gnu/packages/gettext.scm | 33 +
gnu/packages/gimp.scm | 4 +-
gnu/packages/gl.scm | 8 +-
gnu/packages/glib.scm | 2 +-
gnu/packages/gnome.scm | 144 +-
gnu/packages/gnuzilla.scm | 255 +-
gnu/packages/golang.scm | 40 +-
gnu/packages/gps.scm | 4 +-
gnu/packages/graph.scm | 35 +-
gnu/packages/graphviz.scm | 4 +-
gnu/packages/gstreamer.scm | 38 +-
gnu/packages/gtk.scm | 75 +-
gnu/packages/guile-xyz.scm | 37 +
gnu/packages/guile.scm | 6 +-
gnu/packages/haskell-check.scm | 2 +-
gnu/packages/haskell-web.scm | 2 +-
gnu/packages/haskell.scm | 4 +-
gnu/packages/image.scm | 11 +-
gnu/packages/imagemagick.scm | 4 +-
gnu/packages/java.scm | 15 +-
gnu/packages/javascript.scm | 6 +-
gnu/packages/kde.scm | 12 +-
gnu/packages/libffi.scm | 1 +
gnu/packages/libusb.scm | 5 +
gnu/packages/linux.scm | 363 +-
gnu/packages/lisp.scm | 33 +
gnu/packages/llvm.scm | 9 +-
gnu/packages/lxde.scm | 4 +-
gnu/packages/lxqt.scm | 17 +-
gnu/packages/mail.scm | 26 +-
gnu/packages/man.scm | 17 +-
gnu/packages/mate.scm | 13 +-
gnu/packages/maths.scm | 102 +-
gnu/packages/mes.scm | 74 +-
gnu/packages/messaging.scm | 12 +-
gnu/packages/mpd.scm | 2 +-
gnu/packages/multiprecision.scm | 16 +-
gnu/packages/music.scm | 22 +-
gnu/packages/nano.scm | 4 +-
gnu/packages/networking.scm | 79 +-
gnu/packages/nss.scm | 6 +-
gnu/packages/ocaml.scm | 259 +-
gnu/packages/openstack.scm | 1 +
gnu/packages/package-management.scm | 17 +-
gnu/packages/parallel.scm | 4 +-
gnu/packages/password-utils.scm | 9 +-
.../patches/at-spi2-core-meson-compat.patch | 18 -
.../bind-fix-unused-pk11-ecc-constants.patch | 43 -
.../patches/borg-fix-hard-link-preloading.patch | 157 +
gnu/packages/patches/calibre-remove-test-bs4.patch | 34 +
.../patches/calibre-remove-test-sqlite.patch | 29 +
.../patches/calibre-remove-test-unrar.patch | 28 +
.../patches/calibre-use-packaged-feedparser.patch | 51 -
gnu/packages/patches/efl-mesa-compat.patch | 21 -
.../gcc-8-cross-environment-variables.patch | 67 +
.../patches/gcc-9-asan-fix-limits-include.patch | 13 +
.../patches/gcc-9-strmov-store-file-names.patch | 114 +
...paths.patch => gnome-tweaks-search-paths.patch} | 4 +-
.../patches/gst-plugins-good-libvpx-compat.patch | 58 -
.../patches/ocaml-piqilib-Update-base64.patch | 46 +
gnu/packages/patches/slim-display.patch | 75 +
gnu/packages/patches/upower-builddir.patch | 24 +-
.../patches/webkitgtk-sans-gstreamer-gl.patch | 24 +
gnu/packages/patches/webkitgtk-sse2.patch | 202 -
.../patches/xf86-video-voodoo-pcitag.patch | 34 +
.../patches/xorriso-no-mbr-in-inner-efi.patch | 47 +
.../xorriso-no-partition-table-in-inner-efi.patch | 107 +
gnu/packages/pcre.scm | 4 +-
gnu/packages/pdf.scm | 3 +-
gnu/packages/perl.scm | 26 +-
gnu/packages/photo.scm | 4 +-
gnu/packages/php.scm | 6 +-
gnu/packages/profiling.scm | 19 +-
gnu/packages/pulseaudio.scm | 5 +
gnu/packages/python-web.scm | 90 +-
gnu/packages/python-xyz.scm | 463 +-
gnu/packages/python.scm | 2 +-
gnu/packages/ruby.scm | 2 +-
gnu/packages/rust.scm | 255 +-
gnu/packages/samba.scm | 4 +-
gnu/packages/search.scm | 1 +
gnu/packages/security-token.scm | 4 +-
gnu/packages/shells.scm | 6 +-
gnu/packages/shellutils.scm | 13 +-
gnu/packages/skarnet.scm | 8 +-
gnu/packages/speech.scm | 10 +-
gnu/packages/sphinx.scm | 524 +
gnu/packages/squirrel.scm | 55 +
gnu/packages/ssh.scm | 11 +-
gnu/packages/statistics.scm | 87 +-
gnu/packages/storage.scm | 1 +
gnu/packages/sync.scm | 2 +-
gnu/packages/syncthing.scm | 17 +-
gnu/packages/tbb.scm | 5 +-
gnu/packages/terminals.scm | 8 +-
gnu/packages/tex.scm | 4 +-
gnu/packages/textutils.scm | 4 +-
gnu/packages/tls.scm | 7 +-
gnu/packages/tmux.scm | 11 +-
gnu/packages/tor.scm | 7 +-
gnu/packages/valgrind.scm | 19 +-
gnu/packages/version-control.scm | 60 +-
gnu/packages/video.scm | 10 +-
gnu/packages/vim.scm | 14 +-
gnu/packages/vpn.scm | 4 +-
gnu/packages/vulkan.scm | 12 +-
gnu/packages/web-browsers.scm | 8 +-
gnu/packages/web.scm | 475 +-
gnu/packages/webkit.scm | 7 +-
gnu/packages/wget.scm | 38 +-
gnu/packages/wine.scm | 10 +-
gnu/packages/wm.scm | 2 +-
gnu/packages/xdisorg.scm | 6 +-
gnu/packages/xfce.scm | 26 +-
gnu/packages/xiph.scm | 12 +-
gnu/packages/xml.scm | 4 +-
gnu/packages/xorg.scm | 15 +-
gnu/packages/zwave.scm | 84 +
gnu/services.scm | 5 +-
gnu/services/base.scm | 5 +-
gnu/services/desktop.scm | 22 +-
gnu/services/docker.scm | 23 +-
gnu/services/mail.scm | 4 +-
gnu/services/mcron.scm | 4 +-
gnu/services/monitoring.scm | 7 +-
gnu/services/networking.scm | 4 +-
gnu/services/ssh.scm | 2 +
gnu/services/version-control.scm | 2 +-
gnu/services/xorg.scm | 136 +-
gnu/system.scm | 18 +-
gnu/system/examples/vm-image.tmpl | 24 +-
gnu/system/install.scm | 3 +-
gnu/system/linux-container.scm | 89 +-
gnu/system/locale.scm | 72 +-
gnu/system/pam.scm | 69 +-
gnu/system/uuid.scm | 4 +-
gnu/system/vm.scm | 69 +-
gnu/tests/base.scm | 17 +
gnu/tests/docker.scm | 118 +-
gnu/tests/install.scm | 11 -
gnu/tests/ssh.scm | 28 +-
guix/build-system/r.scm | 2 +-
guix/build/bzr.scm | 44 +
guix/build/cargo-build-system.scm | 2 +-
guix/build/cargo-utils.scm | 11 +-
guix/build/download.scm | 28 +-
guix/build/go-build-system.scm | 42 +-
guix/build/syscalls.scm | 9 +
guix/bzr-download.scm | 85 +
guix/config.scm.in | 4 +
guix/docker.scm | 15 +-
guix/gnu-maintenance.scm | 4 +-
guix/import/cran.scm | 12 +-
guix/import/github.scm | 56 +-
guix/lzlib.scm | 625 +
guix/scripts/build.scm | 7 +-
guix/scripts/environment.scm | 2 +-
guix/scripts/pack.scm | 18 +-
guix/scripts/package.scm | 6 +-
guix/scripts/processes.scm | 40 +-
guix/scripts/pull.scm | 25 +-
guix/scripts/substitute.scm | 2 +-
guix/scripts/system.scm | 52 +-
guix/scripts/weather.scm | 21 +-
guix/self.scm | 9 +-
guix/store.scm | 2 +-
guix/ui.scm | 23 +-
m4/guix.m4 | 17 +-
po/doc/guix-manual.de.po | 19913 ++++----
po/doc/guix-manual.es.po | 21429 +++++----
po/doc/guix-manual.fr.po | 16551 +++----
po/doc/guix-manual.pot | 47097 -------------------
po/doc/{guix-manual.zh_CN.po => guix-manual.ru.po} | 20250 ++++----
po/doc/guix-manual.zh_CN.po | 18175 +++----
po/doc/local.mk | 28 +-
po/guix/cs.po | 1 +
po/guix/da.po | 2297 +-
po/guix/de.po | 1127 +-
po/guix/eo.po | 1 +
po/guix/es.po | 820 +-
po/guix/fr.po | 759 +-
po/guix/hu.po | 1 +
po/guix/pl.po | 1 +
po/guix/sr.po | 1 +
po/guix/vi.po | 1 +
po/packages/da.po | 9686 ++--
po/packages/de.po | 22438 +--------
po/packages/eo.po | 1 +
po/packages/fr.po | 4434 +-
po/packages/pl.po | 1 +
po/packages/pt_BR.po | 3 +-
po/packages/sr.po | 1 +
po/packages/vi.po | 3 +-
tests/gremlin.scm | 4 +-
tests/guix-environment.sh | 19 +
tests/guix-pack-localstatedir.sh | 5 +-
tests/guix-pack-relocatable.sh | 18 +-
tests/guix-pack.sh | 15 +-
tests/guix-package.sh | 27 +-
tests/guix-system.sh | 4 +-
tests/lzlib.scm | 111 +
tests/uuid.scm | 6 +-
300 files changed, 70686 insertions(+), 128925 deletions(-)
diff --cc gnu/local.mk
index e6e3279,09a165c..d531050
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@@ -662,8 -666,6 +664,7 @@@ dist_patch_DATA =
%D%/packages/patches/apr-skip-getservbyname-test.patch \
%D%/packages/patches/aria2-CVE-2019-3500.patch \
%D%/packages/patches/aspell-default-dict-dir.patch \
+ %D%/packages/patches/aspell-gcc-compat.patch \
- %D%/packages/patches/at-spi2-core-meson-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 \
@@@ -681,9 -683,7 +682,8 @@@
%D%/packages/patches/bazaar-CVE-2017-14176.patch \
%D%/packages/patches/beets-python-3.7-fix.patch \
%D%/packages/patches/beignet-correct-file-names.patch \
+ %D%/packages/patches/binutils-boot-2.20.1a.patch \
%D%/packages/patches/biber-fix-encoding-write.patch \
- %D%/packages/patches/bind-fix-unused-pk11-ecc-constants.patch \
%D%/packages/patches/binutils-loongson-workaround.patch \
%D%/packages/patches/blender-2.79-newer-ffmpeg.patch \
%D%/packages/patches/blender-2.79-python-3.7-fix.patch \
diff --cc gnu/packages/cmake.scm
index 179b3fe,7186cf9..e49654a
--- a/gnu/packages/cmake.scm
+++ b/gnu/packages/cmake.scm
@@@ -41,17 -39,12 +41,17 @@@
#:use-module (gnu packages file)
#:use-module (gnu packages libevent)
#:use-module (gnu packages ncurses)
- #:use-module (gnu packages python-xyz)
- #:use-module (gnu packages xml))
++ #:use-module (gnu packages sphinx)
+ #:use-module (gnu packages texinfo)
+ #:use-module (gnu packages xml)
+ #:use-module (srfi srfi-1))
-(define-public cmake
+;;; This minimal variant of CMake does not include the documentation. It is
+;;; used by the cmake-build-system.
+(define-public cmake-minimal
(package
- (name "cmake")
- (version "3.13.1")
+ (name "cmake-minimal")
+ (version "3.14.3")
(source (origin
(method url-fetch)
(uri (string-append "https://www.cmake.org/files/v";
diff --cc gnu/packages/curl.scm
index 9a13815,5682a4a..338d26d
--- a/gnu/packages/curl.scm
+++ b/gnu/packages/curl.scm
@@@ -51,7 -51,8 +51,8 @@@
(define-public curl
(package
(name "curl")
+ (replacement curl-7.65.0)
- (version "7.63.0")
+ (version "7.64.1")
(source (origin
(method url-fetch)
(uri (string-append "https://curl.haxx.se/download/curl-";
diff --cc gnu/packages/mes.scm
index 9aff59a,afb1e02..c2430f5
--- a/gnu/packages/mes.scm
+++ b/gnu/packages/mes.scm
@@@ -97,35 -100,33 +99,35 @@@ bootstrap to Guix and aims to help crea
GNU/Linux distributions. It consists of a mutual self-hosting Scheme
interpreter in C and a Nyacc-based C compiler in Scheme and is compatible with
Guile.")
- (home-page "https://gnu.org/software/mes";)
- (license gpl3+))))
+ (home-page "https://gnu.org/software/mes";)
+ (license gpl3+)))
(define-public mescc-tools
- (package
- (name "mescc-tools")
- (version "0.5.2")
- (source (origin
- (method url-fetch)
- (uri (string-append
-
"http://git.savannah.nongnu.org/cgit/mescc-tools.git/snapshot/";
- name "-Release_" version
- ".tar.gz"))
- (file-name (string-append name "-" version ".tar.gz"))
- (sha256
- (base32
- "01x7bhmgwyf6mc2g1hcvibhps98nllacqm4f0j5l51b1mbi18pc2"))))
- (build-system gnu-build-system)
- (supported-systems '("i686-linux" "x86_64-linux"))
- (arguments
- `(#:make-flags (list (string-append "PREFIX=" (assoc-ref %outputs
"out")))
- #:test-target "test"
- #:phases (modify-phases %standard-phases
- (delete 'configure))))
- (synopsis "Tools for the full source bootstrapping process")
- (description
- "Mescc-tools is a collection of tools for use in a full source
+ (let ((commit "bb062b0da7bf2724ca40f9002b121579898d4ef7")
+ (revision "0")
+ (version "0.5.2"))
+ (package
+ (name "mescc-tools")
+ (version (string-append version "-" revision "." (string-take commit
7)))
+ (source (origin
+ (method url-fetch)
+ (uri (string-append
+
"https://git.savannah.nongnu.org/cgit/mescc-tools.git/snapshot/";
+ name "-" commit
+ ".tar.gz"))
+ (sha256
+ (base32
+ "1h6j57wyf91i42b26f8msbv6451cw3nm4nmpl1fckp9c7vi8mwkh"))))
+ (build-system gnu-build-system)
+ (supported-systems '("i686-linux" "x86_64-linux"))
+ (arguments
+ `(#:make-flags (list (string-append "PREFIX=" (assoc-ref %outputs
"out")))
+ #:test-target "test"
+ #:phases (modify-phases %standard-phases
+ (delete 'configure))))
+ (synopsis "Tools for the full source bootstrapping process")
+ (description
+ "Mescc-tools is a collection of tools for use in a full source
bootstrapping process. It consists of the M1 macro assembler, the hex2
linker, the blood-elf symbol table generator, the kaem shell, exec_enable and
get_machine.")
diff --cc gnu/packages/webkit.scm
index ceff9c1,e9b7ab7..4b807cc
--- a/gnu/packages/webkit.scm
+++ b/gnu/packages/webkit.scm
@@@ -59,16 -59,14 +59,15 @@@
(define-public webkitgtk
(package
(name "webkitgtk")
- (version "2.24.1")
- (version "2.20.5")
++ (version "2.24.2")
(source (origin
(method url-fetch)
(uri (string-append "https://www.webkitgtk.org/releases/";
name "-" version ".tar.xz"))
-
- (patches (search-patches "webkitgtk-sse2.patch"))
++ (patches (search-patches "webkitgtk-sans-gstreamer-gl.patch"))
(sha256
(base32
- "0v9riwrmwi9wxbb8hlvcbyyxa9zxhcdk6s1xcspalk6asam8xjsk"))))
- "147r7an41920zl4x9srdva7fxvw2znjin5ldjkhay1cndv9gih0m"))))
++ "071jnjvjq6wsxx1jh4ql3j53h1nhphs5ga67fa5i9xjvs3qb3701"))))
(build-system cmake-build-system)
(outputs '("out" "doc"))
(arguments