[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: |
Thu, 29 Aug 2019 17:22:53 -0400 (EDT) |
mhw pushed a commit to branch core-updates
in repository guix.
commit 0481289cbccba2646bf654f0ae49ac9c45602d5d
Merge: c55fae4 9fbf4d2
Author: Mark H Weaver <address@hidden>
Date: Thu Aug 29 17:19:18 2019 -0400
Merge branch 'master' into core-updates
Makefile.am | 33 +
doc/guix.texi | 75 +-
gnu/build/accounts.scm | 2 +-
gnu/build/cross-toolchain.scm | 6 +-
gnu/ci.scm | 8 +-
gnu/installer.scm | 21 +-
gnu/installer/newt/page.scm | 9 +-
gnu/installer/newt/user.scm | 7 +-
gnu/installer/newt/wifi.scm | 4 +-
gnu/local.mk | 8 +-
gnu/packages/agda.scm | 46 +
gnu/packages/astronomy.scm | 4 +-
gnu/packages/audio.scm | 9 +-
gnu/packages/bittorrent.scm | 8 +-
gnu/packages/cedille.scm | 124 +
gnu/packages/chromium.scm | 4 +-
gnu/packages/ci.scm | 6 +-
gnu/packages/cran.scm | 39 +
gnu/packages/crates-io.scm | 2252 +++++++++++++--
gnu/packages/cups.scm | 6 +-
gnu/packages/cvassistant.scm | 90 +
gnu/packages/databases.scm | 14 +-
gnu/packages/disk.scm | 4 +-
gnu/packages/education.scm | 40 +
gnu/packages/emacs-xyz.scm | 129 +-
gnu/packages/emulators.scm | 32 +-
gnu/packages/enlightenment.scm | 31 +-
gnu/packages/fpga.scm | 8 +-
gnu/packages/ghostscript.scm | 27 +-
gnu/packages/glib.scm | 38 +
gnu/packages/gnome.scm | 10 +-
gnu/packages/gnunet.scm | 7 +-
gnu/packages/golang.scm | 24 +
gnu/packages/gsasl.scm | 2 +-
gnu/packages/gtk.scm | 4 +-
gnu/packages/guile-xyz.scm | 165 +-
gnu/packages/guile.scm | 11 +-
gnu/packages/ipfs.scm | 4 +-
gnu/packages/linux.scm | 38 +-
gnu/packages/lisp.scm | 98 +-
gnu/packages/mail.scm | 5 +-
gnu/packages/make-bootstrap.scm | 154 +-
gnu/packages/maths.scm | 4 +-
gnu/packages/mingw.scm | 6 +-
gnu/packages/nano.scm | 4 +-
gnu/packages/package-management.scm | 161 +-
gnu/packages/parallel.scm | 4 +-
gnu/packages/password-utils.scm | 24 +-
.../patches/bash-4.4-linux-pgrp-pipe.patch | 30 +
.../patches/enlightenment-fix-setuid-path.patch | 74 +-
gnu/packages/patches/libextractor-exiv2.patch | 124 +
.../patches/mingw-w64-5.0rc2-gcc-4.9.3.patch | 218 --
gnu/packages/patches/mingw-w64-6.0.0-gcc.patch | 65 +
gnu/packages/perl.scm | 7 +-
gnu/packages/python-web.scm | 23 +-
gnu/packages/python-xyz.scm | 94 +-
gnu/packages/qt.scm | 3 +
gnu/packages/rednotebook.scm | 91 +
gnu/packages/ruby.scm | 129 +-
gnu/packages/security-token.scm | 4 +-
gnu/packages/terminals.scm | 56 +
gnu/packages/text-editors.scm | 53 +
gnu/packages/textutils.scm | 109 +-
gnu/packages/tls.scm | 8 +-
gnu/packages/video.scm | 23 +-
gnu/packages/web-browsers.scm | 181 +-
gnu/packages/web.scm | 34 +
gnu/packages/webkit.scm | 6 +-
gnu/packages/wine.scm | 4 +-
gnu/packages/wm.scm | 4 +-
gnu/services/cuirass.scm | 29 +-
gnu/services/cups.scm | 21 +-
gnu/services/desktop.scm | 40 +-
gnu/services/pm.scm | 7 +-
gnu/tests/docker.scm | 13 +-
guix/build/cargo-build-system.scm | 19 +-
guix/build/make-bootstrap.scm | 1 +
guix/diagnostics.scm | 7 +-
guix/docker.scm | 68 +-
guix/git-download.scm | 7 +-
guix/import/cran.scm | 254 +-
guix/import/github.scm | 2 +-
guix/import/utils.scm | 5 +-
guix/lint.scm | 4 +-
guix/packages.scm | 3 +-
guix/remote.scm | 12 +-
guix/scripts/deploy.scm | 2 +-
guix/scripts/import.scm | 4 +-
guix/scripts/import/cran.scm | 9 +-
guix/scripts/lint.scm | 6 +-
guix/scripts/pack.scm | 71 +-
guix/ssh.scm | 14 +-
guix/swh.scm | 63 +-
po/doc/guix-manual.de.po | 3049 +++++++++++---------
po/doc/guix-manual.fr.po | 109 +-
po/guix/fr.po | 6 +-
po/guix/sv.po | 2745 +++++++++++++-----
tests/accounts.scm | 19 +
tests/guix-pack-relocatable.sh | 6 +
tests/pack.scm | 1 +
100 files changed, 8383 insertions(+), 3362 deletions(-)
diff --cc gnu/local.mk
index 44a553d,2c02b85..fe47653
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@@ -1021,11 -1021,14 +1026,12 @@@ dist_patch_DATA =
%D%/packages/patches/libexif-CVE-2016-6328.patch \
%D%/packages/patches/libexif-CVE-2017-7544.patch \
%D%/packages/patches/libexif-CVE-2018-20030.patch \
+ %D%/packages/patches/libextractor-exiv2.patch \
- %D%/packages/patches/libgcrypt-make-yat2m-reproducible.patch \
%D%/packages/patches/libgit2-avoid-python.patch \
%D%/packages/patches/libgit2-mtime-0.patch \
- %D%/packages/patches/libgdata-fix-tests.patch \
- %D%/packages/patches/libgdata-glib-duplicate-tests.patch \
%D%/packages/patches/libgnome-encoding.patch \
%D%/packages/patches/libgnomeui-utf8.patch \
+ %D%/packages/patches/libgpg-error-gawk-compat.patch \
%D%/packages/patches/libffi-3.2.1-complex-alpha.patch \
%D%/packages/patches/libjxr-fix-function-signature.patch \
%D%/packages/patches/libjxr-fix-typos.patch \
diff --cc gnu/packages/ghostscript.scm
index 817104c,139682b..3239ab4
--- a/gnu/packages/ghostscript.scm
+++ b/gnu/packages/ghostscript.scm
@@@ -137,7 -144,13 +137,13 @@@ printing, and psresize, for adjusting p
(define-public ghostscript
(package
(name "ghostscript")
- (version "9.26")
+ (version "9.27")
+
+ ;; The problems addressed by GHOSTSCRIPT/FIXED are not security-related,
+ ;; but they have a significant impact on usability, hence this graft.
+ ;; TODO: Ungraft on next update cycle.
+ (replacement ghostscript/fixed)
+
(source
(origin
(method url-fetch)
diff --cc gnu/packages/glib.scm
index 3e17330,77b5715..3a50347
--- a/gnu/packages/glib.scm
+++ b/gnu/packages/glib.scm
@@@ -9,7 -9,7 +9,8 @@@
;;; 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>
;;;
;;; This file is part of GNU Guix.
;;;
diff --cc gnu/packages/make-bootstrap.scm
index 2163b64,37bf4e9..4594e2f
--- a/gnu/packages/make-bootstrap.scm
+++ b/gnu/packages/make-bootstrap.scm
@@@ -2,9 -2,8 +2,9 @@@
;;; Copyright © 2012, 2013, 2014, 2015, 2016, 2017, 2018 Ludovic Courtès
<address@hidden>
;;; Copyright © 2017 Efraim Flashner <address@hidden>
;;; Copyright © 2018 Tobias Geerinckx-Rice <address@hidden>
- ;;; Copyright © 2018 Mark H Weaver <address@hidden>
- ;;; Copyright © 2018 Jan (janneke) Nieuwenhuizen <address@hidden>
+ ;;; Copyright © 2018, 2019 Mark H Weaver <address@hidden>
-;;; Copyright © 2019 Jan (janneke) Nieuwenhuizen <address@hidden>
++;;; Copyright © 2018, 2019 Jan (janneke) Nieuwenhuizen <address@hidden>
+;;; Copyright © 2019 Marius Bakke <address@hidden>
;;;
;;; This file is part of GNU Guix.
;;;
diff --cc gnu/packages/webkit.scm
index 538c976,2eca514..ea7cee5
--- a/gnu/packages/webkit.scm
+++ b/gnu/packages/webkit.scm
@@@ -59,14 -59,14 +59,14 @@@
(define-public webkitgtk
(package
(name "webkitgtk")
- (version "2.24.3")
- (version "2.20.5")
++ (version "2.24.4")
(source (origin
(method url-fetch)
(uri (string-append "https://www.webkitgtk.org/releases/";
name "-" version ".tar.xz"))
(sha256
(base32
- "0lbcrw5axwrbrajxq7fqywfyh0djqi23ynzb5wi5ghw2grnp83cl"))))
- "147r7an41920zl4x9srdva7fxvw2znjin5ldjkhay1cndv9gih0m"))))
++ "1n3x5g1z6rg9n1ssna7wi0z6zlprjm4wzk544v14wqi6q0lv2s46"))))
(build-system cmake-build-system)
(outputs '("out" "doc"))
(arguments