[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: |
Tue, 2 Jul 2019 14:27:44 -0400 (EDT) |
mbakke pushed a commit to branch core-updates
in repository guix.
commit 4fb916551579d336ebea0dbe968314febb3a99d4
Merge: 6661b02 30484be
Author: Marius Bakke <address@hidden>
Date: Tue Jul 2 20:18:16 2019 +0200
Merge branch 'staging' into core-updates
Makefile.am | 3 +-
doc/contributing.texi | 5 +-
doc/guix.texi | 9 +-
etc/guix-install.sh | 10 +-
etc/substitutes/hydra.gnu.org.pub | 6 -
gnu/local.mk | 3 +-
gnu/packages/admin.scm | 8 +-
gnu/packages/algebra.scm | 4 +-
gnu/packages/audio.scm | 4 +-
gnu/packages/base.scm | 14 +-
gnu/packages/bioconductor.scm | 12 +-
gnu/packages/bioinformatics.scm | 32 +-
gnu/packages/certs.scm | 4 +-
gnu/packages/check.scm | 3 +-
gnu/packages/chromium.scm | 6 +-
gnu/packages/compression.scm | 40 +++
gnu/packages/cran.scm | 85 ++---
gnu/packages/databases.scm | 4 +-
gnu/packages/education.scm | 6 +-
gnu/packages/emacs-xyz.scm | 36 +-
gnu/packages/emulators.scm | 4 +-
gnu/packages/finance.scm | 8 +-
gnu/packages/flashing-tools.scm | 4 +-
gnu/packages/freedesktop.scm | 4 +-
gnu/packages/gl.scm | 19 +-
gnu/packages/gstreamer.scm | 15 +-
gnu/packages/gtk.scm | 6 +-
gnu/packages/guile-xyz.scm | 119 +++---
gnu/packages/haskell-check.scm | 44 +++
gnu/packages/haskell.scm | 144 +++++++-
gnu/packages/icu4c.scm | 17 +
gnu/packages/image-viewers.scm | 26 ++
gnu/packages/imagemagick.scm | 4 +-
gnu/packages/kde.scm | 51 ++-
gnu/packages/linux.scm | 16 +-
gnu/packages/lisp.scm | 39 ++
gnu/packages/llvm.scm | 30 +-
gnu/packages/maths.scm | 36 +-
gnu/packages/music.scm | 33 +-
gnu/packages/nss.scm | 4 +-
gnu/packages/package-management.scm | 25 +-
.../patches/gstreamer-buffer-reset-offset.patch | 59 +++
.../patches/webkitgtk-sans-gstreamer-gl.patch | 24 --
gnu/packages/perl.scm | 32 +-
gnu/packages/python-xyz.scm | 15 +-
gnu/packages/regex.scm | 4 +-
gnu/packages/rust.scm | 18 +-
gnu/packages/statistics.scm | 41 ++-
gnu/packages/textutils.scm | 32 +-
gnu/packages/tls.scm | 10 +-
gnu/packages/upnp.scm | 4 +-
gnu/packages/vulkan.scm | 30 +-
gnu/packages/web.scm | 4 +-
gnu/packages/webkit.scm | 5 +-
gnu/services/base.scm | 7 +-
gnu/services/databases.scm | 7 +-
gnu/system/install.scm | 4 +-
guix/build-system/python.scm | 2 +-
guix/build/download-nar.scm | 6 +-
guix/derivations.scm | 4 +-
guix/download.scm | 1 -
guix/grafts.scm | 24 +-
guix/import/crate.scm | 4 +-
guix/import/pypi.scm | 397 +++++++++++++--------
guix/self.scm | 3 -
tests/crate.scm | 2 +-
tests/pypi.scm | 214 ++++++++---
67 files changed, 1282 insertions(+), 613 deletions(-)
diff --cc gnu/packages/webkit.scm
index 4b807cc,6b38998..b258ac8
--- a/gnu/packages/webkit.scm
+++ b/gnu/packages/webkit.scm
@@@ -59,15 -59,14 +59,14 @@@
(define-public webkitgtk
(package
(name "webkitgtk")
- (version "2.24.2")
- (version "2.20.5")
++ (version "2.24.3")
(source (origin
(method url-fetch)
(uri (string-append "https://www.webkitgtk.org/releases/";
name "-" version ".tar.xz"))
- (patches (search-patches "webkitgtk-sans-gstreamer-gl.patch"))
(sha256
(base32
- "071jnjvjq6wsxx1jh4ql3j53h1nhphs5ga67fa5i9xjvs3qb3701"))))
- "147r7an41920zl4x9srdva7fxvw2znjin5ldjkhay1cndv9gih0m"))))
++ "0lbcrw5axwrbrajxq7fqywfyh0djqi23ynzb5wi5ghw2grnp83cl"))))
(build-system cmake-build-system)
(outputs '("out" "doc"))
(arguments