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

[Mark H. Weaver]

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

commit bf76d98789a0fc6303c303beddbc1ed609f2a6ea
Merge: fc9ff91 12b04cb
Author: Mark H Weaver <address@hidden>
Date:   Sun Jun 21 14:30:22 2015 -0400

    Merge branch 'master' into core-updates

 emacs/guix-pcomplete.el                           |    5 +-
 gnu-system.am                                     |    1 +
 gnu/build/file-systems.scm                        |    9 +--
 gnu/packages/audio.scm                            |   27 +++++++++
 gnu/packages/bioinformatics.scm                   |   59 +++++++++++++++++++++
 gnu/packages/commencement.scm                     |    1 +
 gnu/packages/gcc.scm                              |   26 +++++++++
 gnu/packages/gnome.scm                            |   10 ++--
 gnu/packages/llvm.scm                             |   51 +++++++++++++++++-
 gnu/packages/patches/clang-libc-search-path.patch |   19 +++++++
 gnu/packages/patches/guile-linux-syscalls.patch   |   22 ++++----
 gnu/packages/ruby.scm                             |   33 ++++++++++++
 gnu/packages/video.scm                            |    4 +-
 gnu/system/file-systems.scm                       |   27 ++++++++--
 guix/gexp.scm                                     |    8 ++-
 guix/store.scm                                    |   11 ++--
 tests/gexp.scm                                    |   23 +++++++-
 17 files changed, 297 insertions(+), 39 deletions(-)

diff --cc gnu/packages/commencement.scm
index db91bec,9cabaa0..ebf770b
--- a/gnu/packages/commencement.scm
+++ b/gnu/packages/commencement.scm
@@@ -518,8 -497,9 +518,9 @@@ exec ~a/bin/~a-~a -B~a/lib -Wl,-dynamic
  (define libstdc++
    ;; Intermediate libstdc++ that will allow us to build the final GCC
    ;; (remember that GCC-BOOT0 cannot build libstdc++.)
+   ;; TODO: Write in terms of 'make-libstdc++'.
    (package-with-bootstrap-guile
 -   (package (inherit gcc-4.8)
 +   (package (inherit gcc-4.9)
       (name "libstdc++")
       (arguments
        `(#:guile ,%bootstrap-guile
diff --cc gnu/packages/patches/guile-linux-syscalls.patch
index 25a5e90,73a062b..ac74d02
--- a/gnu/packages/patches/guile-linux-syscalls.patch
+++ b/gnu/packages/patches/guile-linux-syscalls.patch
@@@ -3,17 -3,16 +3,15 @@@ This patch adds bindings to Linux sysca
  Using the FFI would have been nice, but that's not an option when using
  a statically-linked Guile in an initrd that doesn't have libc.so around.
  
--diff --git a/libguile/posix.c b/libguile/posix.c
--index 324f21b..cbee94d 100644
----- a/libguile/posix.c
--+++ b/libguile/posix.c
- @@ -2245,6 +2245,263 @@ scm_init_popen (void)
 -@@ -2245,6 +2245,267 @@ scm_init_popen (void)
++--- guile-2.0.11/libguile/posix.c.orig        2014-02-28 15:01:27.000000000 
-0500
+++++ guile-2.0.11/libguile/posix.c     2015-06-21 14:28:23.624251038 -0400
++@@ -2245,6 +2245,269 @@
   }
   #endif
 -
 + 
  +
  +/* Linux! */
 ++#ifdef __linux__
  +
  +#include <sys/mount.h>
  +#include "libguile/foreign.h"