guix-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

01/01: Merge branch 'master' into security-updates


From: Mark H. Weaver
Subject: 01/01: Merge branch 'master' into security-updates
Date: Tue, 15 Mar 2016 16:41:05 +0000

mhw pushed a commit to branch security-updates
in repository guix.

commit a3b84f70d8bc992a0fc38cabdf12d48ff5e10e15
Merge: 2c9f0b0 20095cc
Author: Mark H Weaver <address@hidden>
Date:   Tue Mar 15 12:40:53 2016 -0400

    Merge branch 'master' into security-updates

 Makefile.am                                        |    8 +-
 doc/guix.texi                                      |  175 +++++++++---
 gnu-system.am                                      |    1 -
 gnu/build/install.scm                              |    2 +-
 gnu/packages/aspell.scm                            |    8 +
 gnu/packages/audio.scm                             |   35 +++
 gnu/packages/bioinformatics.scm                    |   66 +++-
 gnu/packages/cdrom.scm                             |   89 +++---
 gnu/packages/dav.scm                               |   26 +-
 gnu/packages/emacs.scm                             |    4 +-
 gnu/packages/enlightenment.scm                     |    4 +-
 gnu/packages/fonts.scm                             |  120 +++++++-
 gnu/packages/fontutils.scm                         |    5 +-
 gnu/packages/freedesktop.scm                       |    2 +-
 gnu/packages/games.scm                             |    4 +-
 gnu/packages/java.scm                              |    5 +-
 gnu/packages/jrnl.scm                              |    8 +-
 gnu/packages/kodi.scm                              |   59 ++++-
 ...x-libre-i686.conf => linux-libre-4.4-i686.conf} |    0
 ...bre-x86_64.conf => linux-libre-4.4-x86_64.conf} |    0
 ...x-libre-i686.conf => linux-libre-4.5-i686.conf} |  310 +++++++++++++-------
 ...bre-x86_64.conf => linux-libre-4.5-x86_64.conf} |  316 +++++++++++++-------
 gnu/packages/linux.scm                             |   27 ++-
 gnu/packages/mail.scm                              |   47 +++-
 gnu/packages/maths.scm                             |    4 +-
 gnu/packages/music.scm                             |    4 +-
 .../patches/gitolite-openssh-6.8-compat.patch      |   25 --
 gnu/packages/python.scm                            |   64 ++++-
 gnu/packages/version-control.scm                   |   23 +-
 gnu/packages/xfce.scm                              |   36 +++
 gnu/services.scm                                   |    5 +-
 guix/build-system/ant.scm                          |  149 +++++++++
 guix/build/ant-build-system.scm                    |  160 ++++++++++
 guix/grafts.scm                                    |    6 +
 guix/http-client.scm                               |    9 +-
 guix/scripts/size.scm                              |   33 ++-
 guix/scripts/substitute.scm                        |  110 +++++---
 guix/store.scm                                     |   18 +-
 38 files changed, 1495 insertions(+), 472 deletions(-)




reply via email to

[Prev in Thread] Current Thread [Next in Thread]