[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
01/01: Merge branch 'master' into core-updates
|
From: |
Ludovic Courtès |
|
Subject: |
01/01: Merge branch 'master' into core-updates |
|
Date: |
Fri, 2 Sep 2016 13:41:35 +0000 (UTC) |
civodul pushed a commit to branch core-updates
in repository guix.
commit 072e10615fc786db02dc44f3cd5f25aed2969111
Merge: 3964e35 135ba81
Author: Ludovic Courtès <address@hidden>
Date: Fri Sep 2 15:39:50 2016 +0200
Merge branch 'master' into core-updates
Makefile.am | 1 +
TODO | 12 -
doc/guix.texi | 48 +-
gnu/local.mk | 7 +-
gnu/packages/admin.scm | 2 +-
gnu/packages/apl.scm | 4 +-
gnu/packages/aspell.scm | 8 +
gnu/packages/astronomy.scm | 106 ++
gnu/packages/bioinformatics.scm | 8 +-
gnu/packages/{slim.scm => display-managers.scm} | 2 +-
gnu/packages/emacs.scm | 73 +-
gnu/packages/entr.scm | 4 +-
gnu/packages/freedesktop.scm | 60 +
gnu/packages/games.scm | 47 +-
gnu/packages/gl.scm | 3 +-
gnu/packages/gnome.scm | 4 +-
gnu/packages/gnunet.scm | 2 +-
gnu/packages/grub.scm | 2 +-
gnu/packages/java.scm | 24 +-
gnu/packages/kde-frameworks.scm | 1304 ++++++++++++++++++++
gnu/packages/linux.scm | 46 +-
gnu/packages/networking.scm | 2 +-
gnu/packages/onc-rpc.scm | 50 +-
gnu/packages/openstack.scm | 29 +-
.../patches/dtc-add-missing-symbols-to-lds.patch | 59 +
gnu/packages/patches/fossil-test-fixes.patch | 189 ---
.../patches/icedtea-remove-overrides.patch | 291 -----
gnu/packages/python.scm | 57 +-
gnu/packages/qt.scm | 28 +-
gnu/packages/smalltalk.scm | 87 +-
gnu/packages/u-boot.scm | 139 +++
gnu/packages/version-control.scm | 112 +-
gnu/packages/xdisorg.scm | 49 +-
gnu/services/desktop.scm | 10 +-
gnu/services/herd.scm | 37 +-
gnu/services/shepherd.scm | 94 +-
gnu/services/xorg.scm | 2 +-
gnu/system/file-systems.scm | 1 -
gnu/tests/base.scm | 12 +-
guix/build/qt-utils.scm | 40 +
guix/import/cpan.scm | 4 +-
guix/import/hackage.scm | 7 +-
guix/packages.scm | 30 +
guix/scripts/build.scm | 30 +-
guix/scripts/system.scm | 41 +-
tests/cpan.scm | 4 +-
tests/hackage.scm | 2 +-
tests/packages.scm | 25 +
tests/services.scm | 79 +-
tests/system.scm | 2 +-
50 files changed, 2512 insertions(+), 767 deletions(-)
diff --cc gnu/local.mk
index 8b88226,efb00b9..20ab924
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@@ -509,9 -511,10 +512,8 @@@ dist_patch_DATA =
%D%/packages/patches/flint-ldconfig.patch \
%D%/packages/patches/fltk-shared-lib-defines.patch \
%D%/packages/patches/fltk-xfont-on-demand.patch \
- %D%/packages/patches/fontconfig-CVE-2016-5384.patch \
%D%/packages/patches/fontforge-svg-modtime.patch \
- %D%/packages/patches/fossil-test-fixes.patch \
%D%/packages/patches/freeimage-CVE-2015-0852.patch \
- %D%/packages/patches/gawk-fts-test.patch \
%D%/packages/patches/gawk-shell.patch \
%D%/packages/patches/gcc-arm-link-spec-fix.patch \
%D%/packages/patches/gcc-cross-environment-variables.patch \