[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
01/01: Merge branch 'master' into core-updates
|
From: |
Marius Bakke |
|
Subject: |
01/01: Merge branch 'master' into core-updates |
|
Date: |
Thu, 27 Jul 2017 18:36:09 -0400 (EDT) |
mbakke pushed a commit to branch core-updates
in repository guix.
commit e0b9e377f1822be434dc9eba516972979485694b
Merge: 201c0e7 fb27157
Author: Marius Bakke <address@hidden>
Date: Fri Jul 28 00:34:13 2017 +0200
Merge branch 'master' into core-updates
Makefile.am | 1 +
build-aux/hydra/guix.scm | 55 ++---
doc/guix.texi | 128 ++++++++++-
gnu/local.mk | 5 +-
gnu/packages/admin.scm | 10 +-
gnu/packages/certs.scm | 4 +-
gnu/packages/compression.scm | 30 +++
gnu/packages/cups.scm | 4 +-
gnu/packages/databases.scm | 3 +-
gnu/packages/disk.scm | 22 +-
gnu/packages/game-development.scm | 17 +-
gnu/packages/games.scm | 42 +++-
gnu/packages/gnome.scm | 83 +++++++-
gnu/packages/gnuzilla.scm | 9 +-
gnu/packages/guile.scm | 25 ++-
gnu/packages/image-viewers.scm | 6 +-
gnu/packages/linux.scm | 105 +++++++--
gnu/packages/lisp.scm | 25 +++
gnu/packages/mail.scm | 9 +-
gnu/packages/maths.scm | 24 +--
gnu/packages/mg.scm | 76 -------
gnu/packages/mpi.scm | 25 ++-
gnu/packages/ncurses.scm | 4 +-
gnu/packages/networking.scm | 4 +-
gnu/packages/package-management.scm | 6 +-
.../deja-dup-use-ref-keyword-for-iter.patch | 41 ++++
gnu/packages/patches/evince-CVE-2017-1000083.patch | 109 ----------
.../patches/guile-bytestructures-name-clash.patch | 31 +++
gnu/packages/patches/nss-pkgconfig.patch | 4 +-
.../patches/perl-dbd-mysql-CVE-2017-10788.patch | 62 ++++++
gnu/packages/python.scm | 43 +++-
gnu/packages/statistics.scm | 4 +-
gnu/packages/text-editors.scm | 62 +++++-
gnu/packages/tls.scm | 5 +-
gnu/packages/version-control.scm | 4 +-
gnu/packages/video.scm | 4 +-
gnu/packages/webkit.scm | 4 +-
gnu/packages/xiph.scm | 9 +-
gnu/packages/xorg.scm | 4 +-
gnu/services/base.scm | 12 +-
gnu/services/web.scm | 58 ++++-
gnu/system/shadow.scm | 8 +-
guix/git-download.scm | 95 ++++++---
guix/import/cpan.scm | 2 +-
guix/scripts/offload.scm | 48 +++--
guix/scripts/weather.scm | 234 +++++++++++++++++++++
po/guix/POTFILES.in | 1 +
47 files changed, 1182 insertions(+), 384 deletions(-)
diff --cc gnu/local.mk
index acfd2af,724c6b6..63894e8
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@@ -577,8 -579,9 +577,7 @@@ dist_patch_DATA =
%D%/packages/patches/emacs-scheme-complete-scheme-r5rs-info.patch \
%D%/packages/patches/emacs-source-date-epoch.patch \
%D%/packages/patches/eudev-rules-directory.patch \
- %D%/packages/patches/eudev-conflicting-declaration.patch \
%D%/packages/patches/evilwm-lost-focus-bug.patch \
- %D%/packages/patches/evince-CVE-2017-1000083.patch \
- %D%/packages/patches/expat-CVE-2016-0718-fix-regression.patch \
%D%/packages/patches/exim-CVE-2017-1000369.patch \
%D%/packages/patches/fabric-tests.patch \
%D%/packages/patches/fastcap-mulGlobal.patch \
@@@ -662,7 -666,7 +661,8 @@@
%D%/packages/patches/gsl-test-i686.patch \
%D%/packages/patches/gspell-dash-test.patch \
%D%/packages/patches/guile-1.8-cpp-4.5.patch \
+ %D%/packages/patches/guile-2.2-default-utf8.patch \
+ %D%/packages/patches/guile-bytestructures-name-clash.patch \
%D%/packages/patches/guile-default-utf8.patch \
%D%/packages/patches/guile-linux-syscalls.patch \
%D%/packages/patches/guile-present-coding.patch \