[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
01/01: Merge branch 'master' into core-updates
|
From: |
guix-commits |
|
Subject: |
01/01: Merge branch 'master' into core-updates |
|
Date: |
Fri, 27 Sep 2019 13:39:43 -0400 (EDT) |
mbakke pushed a commit to branch core-updates
in repository guix.
commit e7f62a41b245ca30404c54f3f77930336627c2f7
Merge: 1fdab9d b48eb1e
Author: Marius Bakke <address@hidden>
Date: Fri Sep 27 19:11:27 2019 +0200
Merge branch 'master' into core-updates
doc/build.scm | 59 +-
doc/guix.texi | 107 +-
gnu/build/linux-boot.scm | 5 +-
gnu/build/linux-initrd.scm | 4 +-
gnu/build/shepherd.scm | 6 +-
gnu/installer/newt/partition.scm | 9 +-
gnu/installer/parted.scm | 48 +-
gnu/local.mk | 19 +-
gnu/packages/admin.scm | 98 ++
gnu/packages/bootloaders.scm | 9 +-
gnu/packages/cluster.scm | 10 +-
gnu/packages/compression.scm | 50 +-
gnu/packages/cran.scm | 27 +
gnu/packages/disk.scm | 5 +-
gnu/packages/distributed.scm | 95 ++
gnu/packages/emacs-xyz.scm | 616 ++++++---
gnu/packages/embedded.scm | 81 +-
gnu/packages/game-development.scm | 2 +-
gnu/packages/geo.scm | 4 +-
gnu/packages/gl.scm | 80 ++
gnu/packages/glib.scm | 35 +
gnu/packages/graphics.scm | 92 +-
gnu/packages/gstreamer.scm | 5 +
gnu/packages/guile-xyz.scm | 6 +-
gnu/packages/haskell-xyz.scm | 37 +
gnu/packages/idris.scm | 9 +-
gnu/packages/image-processing.scm | 4 +
gnu/packages/image.scm | 111 +-
gnu/packages/license.scm | 10 +-
gnu/packages/linux.scm | 39 +-
gnu/packages/maths.scm | 6 +-
gnu/packages/music.scm | 17 +-
gnu/packages/networking.scm | 8 +-
gnu/packages/patches/beets-python-3.7-fix.patch | 57 -
...bops-constants-for-external-program-names.patch | 276 ++++
.../debops-debops-defaults-fall-back-to-less.patch | 45 +
gnu/packages/patches/freeimage-CVE-2015-0852.patch | 129 --
gnu/packages/patches/freeimage-CVE-2016-5684.patch | 34 -
.../patches/freeimage-fix-build-with-gcc-5.patch | 1453 --------------------
gnu/packages/patches/freeimage-unbundle.patch | 167 ++-
.../patches/glm-restore-install-target.patch | 574 ++++++++
gnu/packages/patches/idris-test-no-node.patch | 61 -
gnu/packages/patches/ilmbase-fix-tests.patch | 12 +-
.../patches/ilmbase-openexr-pkg-config.patch | 40 +
gnu/packages/patches/p11-kit-jks-timestamps.patch | 42 -
gnu/packages/plotutils.scm | 6 +-
gnu/packages/pretty-print.scm | 4 +-
gnu/packages/python-xyz.scm | 29 +-
gnu/packages/regex.scm | 4 +-
gnu/packages/tbb.scm | 11 +
gnu/packages/texinfo.scm | 14 +-
gnu/packages/tls.scm | 13 +-
gnu/packages/video.scm | 69 +-
gnu/packages/virtualization.scm | 4 +-
gnu/packages/vulkan.scm | 7 +-
gnu/packages/web-browsers.scm | 7 +-
gnu/packages/web.scm | 110 +-
gnu/packages/webkit.scm | 73 +-
gnu/packages/wm.scm | 8 +-
gnu/packages/xdisorg.scm | 12 +-
gnu/packages/xml.scm | 4 +-
gnu/packages/xorg.scm | 21 +-
gnu/services/guix.scm | 212 +++
gnu/tests/guix.scm | 173 +++
guix/colors.scm | 18 +-
guix/scripts/download.scm | 15 +
guix/scripts/package.scm | 21 +
guix/scripts/pull.scm | 2 +-
guix/self.scm | 6 +-
tests/guix-package.sh | 6 +-
70 files changed, 3083 insertions(+), 2369 deletions(-)
diff --cc gnu/local.mk
index bee5b70,a6fe439..9bd1e88
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@@ -760,9 -763,10 +762,11 @@@ dist_patch_DATA =
%D%/packages/patches/cvs-CVE-2017-12836.patch \
%D%/packages/patches/darkice-workaround-fpermissive-error.patch \
%D%/packages/patches/dbus-helper-search-path.patch \
- %D%/packages/patches/dbus-CVE-2019-12749.patch \
+ %D%/packages/patches/dbus-c++-gcc-compat.patch \
+ %D%/packages/patches/dbus-c++-threading-mutex.patch \
%D%/packages/patches/dealii-mpi-deprecations.patch \
+ %D%/packages/patches/debops-constants-for-external-program-names.patch \
+ %D%/packages/patches/debops-debops-defaults-fall-back-to-less.patch \
%D%/packages/patches/deja-dup-use-ref-keyword-for-iter.patch \
%D%/packages/patches/dfu-programmer-fix-libusb.patch \
%D%/packages/patches/diffutils-gets-undeclared.patch \
@@@ -901,10 -896,7 +902,11 @@@
%D%/packages/patches/glibc-versioned-locpath.patch \
%D%/packages/patches/glibc-2.27-git-fixes.patch \
%D%/packages/patches/glibc-2.28-git-fixes.patch \
- %D%/packages/patches/glibc-2.28-supported-locales.patch \
+ %D%/packages/patches/glibc-2.29-git-updates.patch \
- %D%/packages/patches/glibc-supported-locales.patch \
+ %D%/packages/patches/glibc-2.27-supported-locales.patch \
++ %D%/packages/patches/glibc-2.28-supported-locales.patch \
++ %D%/packages/patches/glibc-supported-locales.patch \
+ %D%/packages/patches/glm-restore-install-target.patch \
%D%/packages/patches/glusterfs-use-PATH-instead-of-hardcodes.patch
\
%D%/packages/patches/gmp-arm-asm-nothumb.patch \
%D%/packages/patches/gmp-faulty-test.patch \
@@@ -972,9 -960,8 +974,9 @@@
%D%/packages/patches/icedtea-6-hotspot-gcc-segfault-workaround.patch \
%D%/packages/patches/icedtea-7-hotspot-gcc-segfault-workaround.patch \
%D%/packages/patches/id3lib-CVE-2007-4460.patch \
- %D%/packages/patches/idris-test-no-node.patch \
%D%/packages/patches/ilmbase-fix-tests.patch \
+ %D%/packages/patches/ilmbase-openexr-pkg-config.patch \
+ %D%/packages/patches/inkscape-poppler-0.76.patch \
%D%/packages/patches/intltool-perl-compatibility.patch \
%D%/packages/patches/irrlicht-use-system-libs.patch \
%D%/packages/patches/isc-dhcp-4.4.1-fixes-for-newer-bind.patch \
diff --cc gnu/packages/glib.scm
index a2f0f2f,a02cf3b..3c2f346
--- a/gnu/packages/glib.scm
+++ b/gnu/packages/glib.scm
@@@ -9,8 -9,8 +9,9 @@@
;;; Copyright © 2017 Petter <address@hidden>
;;; Copyright © 2018, 2019 Tobias Geerinckx-Rice <address@hidden>
;;; Copyright © 2018 Alex Vong <address@hidden>
+;;; Copyright © 2019 Maxim Cournoyer <address@hidden>
;;; Copyright © 2019 Giacomo Leidi <address@hidden>
+ ;;; Copyright © 2019 Marius Bakke <address@hidden>
;;;
;;; This file is part of GNU Guix.
;;;
diff --cc gnu/packages/webkit.scm
index ea7cee5,4864495..3169c7d
--- a/gnu/packages/webkit.scm
+++ b/gnu/packages/webkit.scm
@@@ -59,14 -121,14 +121,14 @@@ engine that uses Wayland for graphics o
(define-public webkitgtk
(package
(name "webkitgtk")
- (version "2.24.4")
- (version "2.20.5")
++ (version "2.26.1")
(source (origin
(method url-fetch)
(uri (string-append "https://www.webkitgtk.org/releases/";
name "-" version ".tar.xz"))
(sha256
(base32
- "1n3x5g1z6rg9n1ssna7wi0z6zlprjm4wzk544v14wqi6q0lv2s46"))))
- "147r7an41920zl4x9srdva7fxvw2znjin5ldjkhay1cndv9gih0m"))))
++ "0mfikjfjhwcnrxbzdyh3fl9bbs2azgbdnx8h5910h41b3n022jvb"))))
(build-system cmake-build-system)
(outputs '("out" "doc"))
(arguments
@@@ -128,6 -190,6 +190,7 @@@
("libsoup" ,libsoup)))
(inputs
`(("at-spi2-core" ,at-spi2-core)
++ ("bubblewrap" ,bubblewrap)
("enchant" ,enchant)
("geoclue" ,geoclue)
("gst-plugins-base" ,gst-plugins-base)
@@@ -139,16 -201,15 +202,20 @@@
("libjpeg" ,libjpeg)
("libnotify" ,libnotify)
("libpng" ,libpng)
++ ("libseccomp" ,libseccomp)
("libsecret" ,libsecret)
("libtasn1" ,libtasn1)
("libwebp" ,libwebp)
++ ("libwpe" ,libwpe)
("libxcomposite" ,libxcomposite)
("libxml2" ,libxml2)
("libxslt" ,libxslt)
("libxt" ,libxt)
("mesa" ,mesa)
- ("sqlite" ,sqlite)))
+ ("openjpeg" ,openjpeg)
- ("sqlite" ,sqlite)))
++ ("sqlite" ,sqlite)
++ ("wpebackend-fdo" ,wpebackend-fdo)
++ ("xdg-dbus-proxy" ,xdg-dbus-proxy)))
(home-page "https://www.webkitgtk.org/";)
(synopsis "Web content engine for GTK+")
(description
diff --cc gnu/packages/xorg.scm
index b3d9fd3,e4050a1..273788f
--- a/gnu/packages/xorg.scm
+++ b/gnu/packages/xorg.scm
@@@ -215,10 -215,10 +215,10 @@@ which can be read by any architecture."
(source (origin
(method url-fetch)
(uri (string-append "mirror://xorg/individual/proto/"
- name "-" version ".tar.bz2"))
+ "xorgproto-" version ".tar.bz2"))
(sha256
(base32
- "180mqkp70i44rkmj430pmn9idssvffrgv4y5h19fm698a7h8bs7y"))))
+ "16yll1kaffnslik5sizlw3qrigj1gpsgfgyq6903g3mwdixamnm6"))))
(build-system gnu-build-system)
(propagated-inputs
;; To get util-macros in (almost?) all package inputs.