[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
01/01: Merge branch 'staging' into core-updates
|
From: |
guix-commits |
|
Subject: |
01/01: Merge branch 'staging' into core-updates |
|
Date: |
Thu, 14 Mar 2019 11:36:15 -0400 (EDT) |
mbakke pushed a commit to branch core-updates
in repository guix.
commit 19008a22d18e772062952034c58a15ed341df3b5
Merge: 520ae43 c958c31
Author: Marius Bakke <address@hidden>
Date: Thu Mar 14 16:30:19 2019 +0100
Merge branch 'staging' into core-updates
Makefile.am | 38 +-
doc/contributing.de.texi | 590 +-
doc/guix.de.texi | 18629 ++++++++++---------
doc/guix.texi | 168 +-
doc/images/installer-network.png | Bin 0 -> 24342 bytes
doc/images/installer-partitions.png | Bin 0 -> 55847 bytes
doc/images/installer-resume.png | Bin 0 -> 35829 bytes
doc/local.mk | 7 +-
gnu/bootloader/extlinux.scm | 4 +-
gnu/bootloader/grub.scm | 8 +-
gnu/build/linux-modules.scm | 27 +-
gnu/build/vm.scm | 6 +-
gnu/ci.scm | 4 +-
gnu/installer/newt/network.scm | 6 +-
gnu/installer/newt/welcome.scm | 4 +-
gnu/local.mk | 1 +
gnu/packages.scm | 17 +-
gnu/packages/admin.scm | 29 +-
gnu/packages/aspell.scm | 26 +-
gnu/packages/audio.scm | 27 +-
gnu/packages/bioconductor.scm | 789 +
gnu/packages/bioinformatics.scm | 160 +-
gnu/packages/bootloaders.scm | 6 +-
gnu/packages/compression.scm | 6 +-
gnu/packages/cran.scm | 900 +
gnu/packages/curl.scm | 2 +-
gnu/packages/databases.scm | 42 +-
gnu/packages/education.scm | 23 +-
gnu/packages/emacs-xyz.scm | 305 +-
gnu/packages/emacs.scm | 2 +-
gnu/packages/emulators.scm | 2 +-
gnu/packages/engineering.scm | 12 +-
gnu/packages/fpga.scm | 4 +-
gnu/packages/freedesktop.scm | 32 +-
gnu/packages/ftp.scm | 6 +-
gnu/packages/games.scm | 20 +-
gnu/packages/geo.scm | 4 +-
gnu/packages/gnome.scm | 70 +-
gnu/packages/gtk.scm | 4 +-
gnu/packages/guile-xyz.scm | 125 +-
gnu/packages/guile.scm | 2 +-
gnu/packages/image.scm | 4 +-
gnu/packages/julia.scm | 2 +-
gnu/packages/kde-frameworks.scm | 2 +-
gnu/packages/kodi.scm | 20 +-
gnu/packages/libevent.scm | 6 +-
gnu/packages/linux.scm | 14 +-
gnu/packages/llvm.scm | 8 +-
gnu/packages/machine-learning.scm | 103 +
gnu/packages/maths.scm | 4 +-
gnu/packages/music.scm | 10 +-
gnu/packages/networking.scm | 101 +-
gnu/packages/package-management.scm | 4 +-
.../patches/pugixml-versioned-libdir.patch | 61 +
gnu/packages/photo.scm | 21 +-
gnu/packages/polkit.scm | 2 +-
gnu/packages/python-xyz.scm | 44 +-
gnu/packages/samba.scm | 4 +-
gnu/packages/shells.scm | 4 +-
gnu/packages/skarnet.scm | 45 +-
gnu/packages/statistics.scm | 4 +-
gnu/packages/terminals.scm | 72 +-
gnu/packages/tex.scm | 8 +-
gnu/packages/tls.scm | 11 +-
gnu/packages/tmux.scm | 50 +
gnu/packages/video.scm | 155 +-
gnu/packages/vulkan.scm | 8 +-
gnu/packages/w3m.scm | 4 +-
gnu/packages/web.scm | 32 +-
gnu/packages/webkit.scm | 5 +-
gnu/packages/wm.scm | 148 +
gnu/packages/xml.scm | 8 +-
gnu/packages/xorg.scm | 46 +-
gnu/services/base.scm | 77 +-
gnu/services/configuration.scm | 5 +
gnu/services/cups.scm | 2 +-
gnu/services/desktop.scm | 6 +-
gnu/services/mail.scm | 2 +-
gnu/services/messaging.scm | 2 +-
gnu/services/monitoring.scm | 57 +-
gnu/system/examples/vm-image.tmpl | 2 +-
gnu/system/install.scm | 2 +-
gnu/system/linux-container.scm | 14 +-
gnu/system/mapped-devices.scm | 57 +-
gnu/system/vm.scm | 6 +-
gnu/tests/install.scm | 4 +-
guix/describe.scm | 31 +-
guix/modules.scm | 4 +-
guix/packages.scm | 16 +-
nix/libstore/optimise-store.cc | 2 +-
po/doc/guix-manual.de.po | 2598 +--
91 files changed, 15308 insertions(+), 10696 deletions(-)
diff --cc gnu/packages/webkit.scm
index 1c3275c,14c374d..c05366f
--- a/gnu/packages/webkit.scm
+++ b/gnu/packages/webkit.scm
@@@ -59,14 -59,14 +59,14 @@@
(define-public webkitgtk
(package
(name "webkitgtk")
- (version "2.22.7")
- (version "2.20.5")
++ (version "2.24.0")
(source (origin
(method url-fetch)
(uri (string-append "https://www.webkitgtk.org/releases/";
name "-" version ".tar.xz"))
(sha256
(base32
- "1zrhmz90sn30zgyflj4i86fsscws10xsi2kfs87nj2nd0pbggrjb"))))
- "147r7an41920zl4x9srdva7fxvw2znjin5ldjkhay1cndv9gih0m"))))
++ "01s446lmjk7y8il4snjm32vpxws2rp4hmxrwm2swx0p47x8d2jif"))))
(build-system cmake-build-system)
(outputs '("out" "doc"))
(arguments
@@@ -147,6 -147,6 +147,7 @@@
("libxslt" ,libxslt)
("libxt" ,libxt)
("mesa" ,mesa)
++ ("openjpeg" ,openjpeg)
("sqlite" ,sqlite)))
(home-page "https://www.webkitgtk.org/";)
(synopsis "Web content engine for GTK+")