Merge branch 'master' into core-updates

diff --cc gnu-system.am
Simple merge

diff --cc gnu/packages/bdw-gc.scm
index 0a483ef,f4bbc64..992a11b
--- 1/gnu/packages/bdw-gc.scm
--- 2/gnu/packages/bdw-gc.scm
+++ b/gnu/packages/bdw-gc.scm
@@@ -1,5 -1,5 +1,5 @@@
  ;;; GNU Guix --- Functional package management for GNU
--;;; Copyright © 2012, 2013, 2014 Ludovic Courtès <ludo@gnu.org>
++;;; Copyright © 2012, 2013, 2014, 2016 Ludovic Courtès <ludo@gnu.org>
  ;;; Copyright © 2014 Mark H Weaver <mhw@netris.org>
  ;;;
  ;;; This file is part of GNU Guix.

diff --cc gnu/packages/commencement.scm
index d758913,73b27a2..1928360
--- 1/gnu/packages/commencement.scm
--- 2/gnu/packages/commencement.scm
+++ b/gnu/packages/commencement.scm
@@@ -452,18 -424,18 +452,19 @@@ exec ~a/bin/~a-~a -B~a/lib -Wl,-dynamic
                                    glibc-final-with-bootstrap-bash
                                    (car (assoc-ref %boot1-inputs "bash"))))
           (bash (package (inherit static-bash)
 -                 (native-inputs `(("bison" ,bison-boot1)))
                   (arguments
                    `(#:guile ,%bootstrap-guile
 -                    ,@(package-arguments static-bash))))))
 -    (package-with-bootstrap-guile
 -     (package-with-explicit-inputs bash
 -                                   `(("gcc" ,gcc)
 -                                     ("libc" ,glibc-final-with-bootstrap-bash)
 -                                     ,@(fold alist-delete %boot1-inputs
 -                                             '("gcc" "libc")))
 -                                   (current-source-location)
 -                                   #:guile %bootstrap-guile))))
 +                    ,@(package-arguments static-bash)))))
 +         (inputs `(("gcc" ,gcc)
 +                   ("libc" ,glibc-final-with-bootstrap-bash)
 +                   ,@(fold alist-delete %boot1-inputs
 +                           '("gcc" "libc")))))
 +    (package
 +      (inherit (package-with-bootstrap-guile
 +                (package-with-explicit-inputs bash inputs
-                                               (current-source-location))))
++                                              (current-source-location)
++                                              #:guile %bootstrap-guile)))
 +      (native-inputs `(("bison" ,bison-boot1))))))
  
  (define gettext-boot0
    ;; A minimal gettext used during bootstrap.

diff --cc gnu/packages/emacs.scm
index 947c7e2,e82ffd3..ba7bd49
--- 1/gnu/packages/emacs.scm
--- 2/gnu/packages/emacs.scm
+++ b/gnu/packages/emacs.scm
@@@ -70,18 -70,23 +70,24 @@@
               (sha256
                (base32
                 "0kn3rzm91qiswi0cql89kbv6mqn27rwsyjfb8xmwy9m5s8fxfiyx"))
 -             (patches (list (search-patch "emacs-exec-path.patch")))))
 +             (patches (list (search-patch "emacs-exec-path.patch")
 +                            (search-patch "emacs-source-date-epoch.patch")))))
      (build-system glib-or-gtk-build-system)
      (arguments
-      '(#:phases (alist-cons-before
-                  'configure 'fix-/bin/pwd
-                  (lambda _
-                    ;; Use `pwd', not `/bin/pwd'.
-                    (substitute* (find-files "." "^Makefile\\.in$")
-                      (("/bin/pwd")
-                       "pwd")))
-                  %standard-phases)))
+      '(#:phases (modify-phases %standard-phases
+                   (add-before 'configure 'fix-/bin/pwd
+                     (lambda _
+                       ;; Use `pwd', not `/bin/pwd'.
+                       (substitute* (find-files "." "^Makefile\\.in$")
+                         (("/bin/pwd")
+                          "pwd"))))
+                   (add-after 'install 'remove-info.info
+                     (lambda* (#:key outputs #:allow-other-keys)
+                       ;; Remove 'info.info', which is provided by Texinfo.
+                       (let ((out (assoc-ref outputs "out")))
+                         (delete-file
+                          (string-append out "/share/info/info.info.gz"))
+                         #t))))))
      (inputs
       `(("gnutls" ,gnutls)
         ("ncurses" ,ncurses)

diff --cc gnu/packages/linux.scm
Simple merge

diff --cc gnu/packages/package-management.scm
Simple merge

diff --cc gnu/packages/plotutils.scm
index 6166226,09a2d4f..e9a2471
--- 1/gnu/packages/plotutils.scm
--- 2/gnu/packages/plotutils.scm
+++ b/gnu/packages/plotutils.scm
@@@ -1,5 -1,6 +1,6 @@@
  ;;; GNU Guix --- Functional package management for GNU
--;;; Copyright © 2013, 2014, 2015 Ludovic Courtès <ludo@gnu.org>
++;;; Copyright © 2013, 2014, 2015, 2016 Ludovic Courtès <ludo@gnu.org>
+ ;;; Copyright © 2015 Eric Bavier <bavier@member.fsf.org>
  ;;;
  ;;; This file is part of GNU Guix.
  ;;;
@@@ -156,3 -167,61 +167,61 @@@ just-in-time graph generation, handles 
  basic statistical capabilities.  It allows significant user control over
  colors, styles, options and details.")
      (license license:gpl2+)))
 -       ("libgc" ,libgc-for-c++)
+ 
+ (define-public asymptote
+   (package
+     (name "asymptote")
+     (version "2.35")
+     (source (origin
+               (method url-fetch)
+               (uri (string-append "mirror://sourceforge/asymptote/"
+                                   version "/asymptote-" version ".src.tgz"))
+               (sha256
+                (base32
+                 "11f28vxw0ybhvl7vxmqcdwvw7y6gz55ykw9ybgzb2px6lsvgag7z"))
+               (patches (list (search-patch "asymptote-gsl2.patch")))))
+     (build-system gnu-build-system)
+     ;; Note: The 'asy' binary retains a reference to docdir for use with its
+     ;; "help" command in interactive mode, so adding a "doc" output is not
+     ;; currently useful.
+     (native-inputs
+      `(("gs" ,ghostscript)              ;For tests
+        ("texinfo" ,texinfo)             ;For generating documentation
+        ("texlive" ,texlive)             ;For tests and documentation
+        ("perl" ,perl)))
+     (inputs
+      `(("fftw" ,fftw)
+        ("freeglut" ,freeglut)
+        ("gsl" ,gsl)
++       ("libgc" ,libgc)
+        ("python" ,python-2)
+        ("readline" ,readline)
+        ("zlib" ,zlib)))
+     (arguments
+      `(#:configure-flags
+        (list (string-append "--enable-gc=" (assoc-ref %build-inputs "libgc"))
+              (string-append "--with-latex="
+                             (assoc-ref %outputs "out")
+                             "/share/texmf/tex/latex")
+              (string-append "--with-context="
+                             (assoc-ref %outputs "out")
+                             "/share/texmf/tex/context/third"))
+        #:phases (modify-phases %standard-phases
+                   (add-before 'build 'patch-pdf-viewer
+                     (lambda _
+                       ;; Default to a free pdf viewer
+                       (substitute* "settings.cc"
+                         (("defaultPDFViewer=\"acroread\"")
+                          "defaultPDFViewer=\"gv\"")))))))
+     (home-page "http://asymptote.sourceforge.net")
+     (synopsis "Script-based vector graphics language")
+     (description
+      "Asymptote is a powerful descriptive vector graphics language for
+ technical drawing, inspired by MetaPost but with an improved C++-like syntax.
+ Asymptote provides for figures the same high-quality level of typesetting that
+ LaTeX does for scientific text.")
+     ;; Most source files do not contain license statements, but the README
+     ;; contains: "All source files in the Asymptote project, unless explicitly
+     ;; noted otherwise, are released under version 3 (or later) of the GNU
+     ;; Lesser General Public License"
+     (license license:lgpl3+)))

diff --cc gnu/packages/ruby.scm
index 2977f94,577be18..fd36f8d
--- 1/gnu/packages/ruby.scm
--- 2/gnu/packages/ruby.scm
+++ b/gnu/packages/ruby.scm
@@@ -100,28 -95,9 +100,28 @@@ a focus on simplicity and productivity.
      (home-page "https://ruby-lang.org")
      (license license:ruby)))
  
 +(define-public ruby-2.2
 +  (package (inherit ruby)
 +    (version "2.2.4")
 +    (source
 +     (origin
 +       (method url-fetch)
 +       (uri (string-append "http://cache.ruby-lang.org/pub/ruby/"
 +                           (version-major+minor version)
 +                           "/ruby-" version ".tar.xz"))
 +       (sha256
 +        (base32
 +         "0g3ps4q3iz7wj9m45n8xyxzw8nh29ljdqb87b0f6i0p3853gz2yj"))
 +       (modules '((guix build utils)))
 +       (snippet `(begin
 +                   ;; Remove bundled libffi
 +                   (delete-file-recursively
 +                    (string-append "ext/fiddle/libffi-3.2.1"))
 +                   #t))))))
 +
  (define-public ruby-2.1
    (package (inherit ruby)
-     (version "2.1.6")
+     (version "2.1.8")
      (source
       (origin
         (method url-fetch)

diff --cc gnu/packages/video.scm
Simple merge

diff --cc gnu/packages/webkit.scm
Simple merge

diff --cc guix/build-system/gnu.scm
Simple merge

diff --cc guix/build/ruby-build-system.scm
Simple merge