[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: |
Mon, 4 Mar 2019 17:12:30 -0500 (EST) |
mbakke pushed a commit to branch core-updates
in repository guix.
commit b4d7689f9255b93b9ea02e01dc490f1416f77782
Merge: dd7ce86 6d3cff5
Author: Marius Bakke <address@hidden>
Date: Mon Mar 4 23:05:01 2019 +0100
Merge branch 'staging' into core-updates
doc/contributing.fr.texi | 539 +-
doc/guix.fr.texi | 18524 ++++++++++---------
doc/guix.texi | 38 +-
gnu/build/activation.scm | 6 +-
gnu/local.mk | 5 +-
gnu/packages/admin.scm | 15 +-
gnu/packages/arcan.scm | 179 +
gnu/packages/audio.scm | 32 +-
gnu/packages/bioconductor.scm | 29 +
gnu/packages/bioinformatics.scm | 4 +-
gnu/packages/calcurse.scm | 29 +-
gnu/packages/chromium.scm | 4 +-
gnu/packages/coq.scm | 24 +-
gnu/packages/cran.scm | 21 +
gnu/packages/databases.scm | 19 +-
gnu/packages/django.scm | 44 +-
gnu/packages/emacs-xyz.scm | 91 +-
gnu/packages/emacs.scm | 7 +-
gnu/packages/glib.scm | 4 +-
gnu/packages/gnome.scm | 10 +-
gnu/packages/java-maths.scm | 89 +
gnu/packages/java.scm | 10 +-
gnu/packages/mail.scm | 2 +-
gnu/packages/music.scm | 4 +-
gnu/packages/networking.scm | 5 +-
gnu/packages/patches/libopenshot-fixup-tests.patch | 148 +
gnu/packages/patches/lyx-2.2.3-fix-test.patch | 13 -
.../patches/thermald-make-int-max32-visible.patch | 24 +
gnu/packages/python-web.scm | 4 +-
gnu/packages/python-xyz.scm | 66 +-
gnu/packages/rails.scm | 28 +
gnu/packages/ruby.scm | 700 +-
gnu/packages/samba.scm | 26 +-
gnu/packages/sdl.scm | 5 +-
gnu/packages/tex.scm | 701 +-
gnu/packages/tls.scm | 29 +-
gnu/packages/video.scm | 54 +-
gnu/packages/virtualization.scm | 11 +-
gnu/packages/vpn.scm | 66 +
gnu/packages/web.scm | 140 +-
gnu/packages/webkit.scm | 4 +-
gnu/packages/wine.scm | 17 +-
gnu/packages/xorg.scm | 8 +-
gnu/services/cuirass.scm | 4 +-
gnu/services/monitoring.scm | 4 +-
gnu/services/rsync.scm | 2 +-
gnu/services/ssh.scm | 4 +-
gnu/tests/base.scm | 2 +-
guix/scripts/environment.scm | 12 +-
po/doc/guix-manual.fr.po | 1886 +-
tests/guix-environment.sh | 14 +-
51 files changed, 13372 insertions(+), 10334 deletions(-)
diff --cc gnu/packages/webkit.scm
index af34052,7a48186..1c3275c
--- 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.6")
- (version "2.20.5")
++ (version "2.22.7")
(source (origin
(method url-fetch)
(uri (string-append "https://www.webkitgtk.org/releases/";
name "-" version ".tar.xz"))
(sha256
(base32
- "0ny8azipr2dmdk79qrf4hvb2p4k5b3af38szjhmhg8mh1nfdp46z"))))
- "147r7an41920zl4x9srdva7fxvw2znjin5ldjkhay1cndv9gih0m"))))
++ "1zrhmz90sn30zgyflj4i86fsscws10xsi2kfs87nj2nd0pbggrjb"))))
(build-system cmake-build-system)
(outputs '("out" "doc"))
(arguments