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

commit 35995769b516d228793940c5333ad522de992a6c
Merge: c6f9098 e03f6d5
Author: Mark H Weaver <m...@netris.org>
Date:   Wed Jul 15 15:10:32 2015 -0400

    Merge branch 'master' into core-updates

 Makefile.am                                     |    1 +
 doc/guix.texi                                   |   38 +++-
 emacs/guix-emacs.el                             |   29 ++-
 emacs/guix-info.el                              |   17 +-
 emacs/guix-init.el.in                           |    4 +-
 gnu-system.am                                   |    4 +
 gnu/build/file-systems.scm                      |  131 +++++++---
 gnu/packages/admin.scm                          |    3 +-
 gnu/packages/algebra.scm                        |    2 +-
 gnu/packages/boost.scm                          |    5 +-
 gnu/packages/ccache.scm                         |   12 +-
 gnu/packages/dunst.scm                          |   72 +++++
 gnu/packages/freedesktop.scm                    |   33 +++
 gnu/packages/gcc.scm                            |   63 +++++
 gnu/packages/gnome.scm                          |   89 +++++++-
 gnu/packages/linux.scm                          |    4 +-
 gnu/packages/music.scm                          |    9 +-
 gnu/packages/ntp.scm                            |   27 ++-
 gnu/packages/patches/boost-mips-avoid-m32.patch |   15 +
 gnu/packages/polkit.scm                         |    4 +-
 gnu/packages/pumpio.scm                         |    6 +-
 gnu/packages/rc.scm                             |   72 +++++
 gnu/packages/skarnet.scm                        |   92 +++++++
 gnu/packages/ssh.scm                            |   10 +-
 gnu/system/file-systems.scm                     |   59 ++++-
 gnu/system/install.scm                          |    2 +-
 guix/scripts/build.scm                          |   12 +
 guix/scripts/lint.scm                           |    2 -
 guix/scripts/substitute.scm                     |  317 ++++++++++++-----------
 guix/store.scm                                  |    1 +
 guix/tests.scm                                  |   11 +-
 tests/derivations.scm                           |    9 +-
 tests/file-systems.scm                          |   46 ++++
 tests/guix-daemon.sh                            |   12 +-
 tests/store.scm                                 |   51 +++-
 tests/syscalls.scm                              |    6 +
 36 files changed, 1024 insertions(+), 246 deletions(-)


Reply via email to