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

[Mark H. Weaver]

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

commit 933204e5b1473a54367aef1f90de22424e9074ab
Merge: 9128e32 5e25ebe
Author: Mark H Weaver <address@hidden>
Date:   Fri Apr 17 09:54:11 2015 -0400

    Merge branch 'master' into core-updates
    
    Conflicts:
        gnu-system.am
        gnu/packages/gstreamer.scm

 Makefile.am                                       |    8 +
 THANKS                                            |    1 +
 build-aux/hydra/gnu-system.scm                    |   26 +++
 build-aux/make-binary-tarball.scm                 |   50 +++++
 configure.ac                                      |    2 +-
 doc/guix.texi                                     |   90 +++++++++-
 gnu-system.am                                     |    2 +-
 gnu/build/install.scm                             |   43 +++++-
 gnu/packages/bioinformatics.scm                   |   35 ++++-
 gnu/packages/ebook.scm                            |    4 +-
 gnu/packages/emacs.scm                            |    3 +-
 gnu/packages/gstreamer.scm                        |    8 +-
 gnu/packages/hurd.scm                             |   14 +-
 gnu/packages/java.scm                             |    8 +-
 gnu/packages/linux-libre-i686.conf                |  200 +++++++++++++++-----
 gnu/packages/linux-libre-x86_64.conf              |  204 ++++++++++++++++-----
 gnu/packages/linux.scm                            |   49 +++++-
 gnu/packages/mail.scm                             |    4 +-
 gnu/packages/patches/emacs-exec-path.patch        |   18 ++
 gnu/packages/patches/linux-libre-vblank-fix.patch |  175 ------------------
 gnu/packages/ruby.scm                             |    4 +-
 gnu/packages/tbb.scm                              |    7 +-
 gnu/packages/telephony.scm                        |   24 +++
 gnu/packages/textutils.scm                        |   31 +++
 gnu/services/avahi.scm                            |    3 +-
 gnu/services/dbus.scm                             |    3 +-
 gnu/services/networking.scm                       |    4 +-
 gnu/system.scm                                    |   45 ++++--
 gnu/system/install.scm                            |   39 ++++-
 guix/profiles.scm                                 |   72 +++-----
 guix/scripts/package.scm                          |   26 +++-
 tests/packages.scm                                |    4 +-
 tests/profiles.scm                                |    8 +-
 33 files changed, 836 insertions(+), 378 deletions(-)

diff --cc build-aux/hydra/gnu-system.scm
index cb2e209,f07b858..01e2859
--- a/build-aux/hydra/gnu-system.scm
+++ b/build-aux/hydra/gnu-system.scm
@@@ -158,9 -159,33 +159,33 @@@ system."
                         (set-guile-for-build (default-guile))
                         (system-disk-image installation-os
                                            #:disk-image-size
 -                                          (* 800 MiB))))))
 +                                          (* 850 MiB))))))
        '()))
  
+ (define (tarball-jobs store system)
+   "Return Hydra jobs to build the self-contained Guix binary tarball."
+   (define (->alist drv)
+     `((derivation . ,(derivation-file-name drv))
+       (description . "Stand-alone binary Guix tarball")
+       (long-description . "This is a tarball containing binaries of Guix and
+ all its dependencies, and ready to be installed on non-GuixSD distributions.")
+       (license . ,gpl3+)
+       (home-page . ,%guix-home-page-url)
+       (maintainers . ("address@hidden"))))
+ 
+   (define (->job name drv)
+     (let ((name (symbol-append name (string->symbol ".")
+                                (string->symbol system))))
+       `(,name . ,(cut ->alist drv))))
+ 
+   ;; XXX: Add a job for the stable Guix?
+   (list (->job 'binary-tarball
+                (run-with-store store
+                  (mbegin %store-monad
+                    (set-guile-for-build (default-guile))
+                    (self-contained-tarball))
+                  #:system system))))
+ 
  (define job-name
    ;; Return the name of a package's job.
    (compose string->symbol package-full-name))
diff --cc gnu-system.am
index 0e23175,c581d79..a3ad603
--- a/gnu-system.am
+++ b/gnu-system.am
@@@ -409,7 -407,7 +409,8 @@@ dist_patch_DATA =                                  
        
    gnu/packages/patches/doxygen-tmake.patch                    \
    gnu/packages/patches/duplicity-piped-password.patch         \
    gnu/packages/patches/duplicity-test_selection-tmp.patch     \
 +  gnu/packages/patches/elfutils-tests-ptrace.patch            \
+   gnu/packages/patches/emacs-exec-path.patch                  \
    gnu/packages/patches/eudev-rules-directory.patch            \
    gnu/packages/patches/findutils-absolute-paths.patch         \
    gnu/packages/patches/flashrom-use-libftdi1.patch            \
diff --cc gnu/packages/gstreamer.scm
index e3019f6,e07bbec..977ca14
--- a/gnu/packages/gstreamer.scm
+++ b/gnu/packages/gstreamer.scm
@@@ -262,19 -263,13 +263,20 @@@ developers consider to have good qualit
                  "1g7vg9amh3cc3nmc415h6g2rqxqi4wgwqi08hxfbpwq48ri64p30"))))
      (build-system gnu-build-system)
      (arguments
-      '(#:phases
 -     '(#:configure-flags '("--with-system-libav")))
++     '(#:configure-flags '("--with-system-libav")
++       #:phases
 +       (modify-phases %standard-phases
 +         (add-before 'configure 'patch-/bin/sh
 +                     (lambda _
 +                       (substitute* "gst-libs/ext/libav/configure"
 +                         (("#! /bin/sh")
 +                          (string-append "#! "(which "sh")))))))))
      (native-inputs
       `(("pkg-config" ,pkg-config)
-        ("python" ,python)
-        ("yasm" ,yasm)))
+        ("python" ,python)))
      (inputs
       `(("gst-plugins-base" ,gst-plugins-base)
+        ("ffmpeg" ,ffmpeg)
         ("orc" ,orc)
         ("zlib" ,zlib)))
      (home-page "http://gstreamer.freedesktop.org/";)