[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
04/05: Merge remote-tracking branch 'origin/master' into core-updates
|
From: |
Efraim Flashner |
|
Subject: |
04/05: Merge remote-tracking branch 'origin/master' into core-updates |
|
Date: |
Mon, 29 Aug 2016 21:04:26 +0000 (UTC) |
efraim pushed a commit to branch core-updates
in repository guix.
commit b3d2be945d2dfe08e3b73102dd0fd3f4a0a93b60
Merge: 9712743 5b63a85
Author: Efraim Flashner <address@hidden>
Date: Mon Aug 29 23:46:33 2016 +0300
Merge remote-tracking branch 'origin/master' into core-updates
doc/guix.texi | 27 +-
gnu/build/activation.scm | 15 +-
gnu/build/install.scm | 6 +-
gnu/local.mk | 5 +-
gnu/packages/admin.scm | 55 +-
gnu/packages/audio.scm | 19 +-
gnu/packages/backup.scm | 4 +-
gnu/packages/bioinformatics.scm | 55 ++
gnu/packages/bittorrent.scm | 8 +-
gnu/packages/compression.scm | 24 +
gnu/packages/crypto.scm | 44 +-
gnu/packages/cups.scm | 4 +-
gnu/packages/databases.scm | 30 +
gnu/packages/dav.scm | 4 +-
gnu/packages/disk.scm | 65 +-
gnu/packages/documentation.scm | 21 +-
gnu/packages/emacs.scm | 64 +-
gnu/packages/engineering.scm | 4 +-
gnu/packages/enlightenment.scm | 89 ++-
gnu/packages/finance.scm | 2 +-
gnu/packages/freedesktop.scm | 22 +
gnu/packages/game-development.scm | 11 +-
gnu/packages/games.scm | 4 +-
gnu/packages/gcc.scm | 4 +-
gnu/packages/geo.scm | 5 +-
gnu/packages/gimp.scm | 31 +-
gnu/packages/gl.scm | 36 +-
gnu/packages/gnome.scm | 108 ++-
gnu/packages/gnunet.scm | 9 +-
gnu/packages/gnupg.scm | 200 +++---
gnu/packages/gps.scm | 8 +-
gnu/packages/gstreamer.scm | 20 +-
gnu/packages/guile.scm | 8 +-
gnu/packages/ibus.scm | 63 +-
gnu/packages/imagemagick.scm | 4 +-
gnu/packages/kde-frameworks.scm | 513 +++++++++++++-
gnu/packages/linux.scm | 56 +-
gnu/packages/lirc.scm | 88 +--
gnu/packages/lua.scm | 168 ++++-
gnu/packages/machine-learning.scm | 67 +-
gnu/packages/mail.scm | 17 +-
gnu/packages/maths.scm | 106 ++-
gnu/packages/messaging.scm | 78 ++-
gnu/packages/mit-krb5.scm | 16 +
gnu/packages/moreutils.scm | 11 +-
gnu/packages/mpd.scm | 16 +-
gnu/packages/music.scm | 6 +-
gnu/packages/networking.scm | 21 +
gnu/packages/ocaml.scm | 40 +-
gnu/packages/patches/gimp-CVE-2016-4994.patch | 96 ---
gnu/packages/patches/mupdf-CVE-2016-6265.patch | 30 +
gnu/packages/patches/mupdf-CVE-2016-6525.patch | 21 +
.../patches/xf86-video-openchrome-glibc-2.20.patch | 15 -
gnu/packages/pdf.scm | 9 +-
gnu/packages/polkit.scm | 2 +-
gnu/packages/python.scm | 727 +++++++++++++-------
gnu/packages/qemu.scm | 4 +-
gnu/packages/qt.scm | 152 +++-
gnu/packages/regex.scm | 57 ++
gnu/packages/scribus.scm | 5 +-
gnu/packages/serialization.scm | 79 ++-
gnu/packages/spice.scm | 8 +-
gnu/packages/ssh.scm | 9 +
gnu/packages/synergy.scm | 6 +-
gnu/packages/terminals.scm | 73 +-
gnu/packages/tor.scm | 4 +-
gnu/packages/video.scm | 17 +-
gnu/packages/web.scm | 6 +-
gnu/packages/webkit.scm | 6 +-
gnu/packages/wordnet.scm | 2 +-
gnu/packages/xdisorg.scm | 45 +-
gnu/packages/xml.scm | 1 -
gnu/packages/xorg.scm | 42 +-
gnu/services/base.scm | 58 +-
gnu/system.scm | 16 +-
gnu/system/shadow.scm | 4 +
gnu/tests/base.scm | 36 +
guix/base64.scm | 26 +-
guix/import/utils.scm | 26 +-
guix/scripts/archive.scm | 2 +-
guix/scripts/build.scm | 2 +-
guix/scripts/edit.scm | 13 +-
guix/scripts/environment.scm | 2 +-
guix/scripts/lint.scm | 13 +
guix/scripts/package.scm | 3 +-
guix/scripts/system.scm | 25 +-
tests/gem.scm | 2 +-
tests/guix-environment-container.sh | 2 +-
tests/lint.scm | 16 +-
tests/pypi.scm | 4 +-
90 files changed, 2947 insertions(+), 1000 deletions(-)
diff --cc gnu/packages/gnupg.scm
index 52a9fc5,c78e9d8..2817f2c
--- a/gnu/packages/gnupg.scm
+++ b/gnu/packages/gnupg.scm
@@@ -5,8 -5,9 +5,9 @@@
;;; Copyright © 2014, 2015, 2016 Mark H Weaver <address@hidden>
;;; Copyright © 2015 Paul van der Walt <address@hidden>
;;; Copyright © 2015, 2016 Efraim Flashner <address@hidden>
+ ;;; Copyright © 2015, 2016 Ricardo Wurmus <address@hidden>
;;; Copyright © 2016 Christopher Allan Webber <address@hidden>
-;;; Copyright © 2016 Nils Gillmann <address@hidden>
+;;; Copyright © 2016 ng0 <address@hidden>
;;;
;;; This file is part of GNU Guix.
;;;