guix-commits
[Top][All Lists]
Advanced

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

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


From: Ludovic Courtès
Subject: 01/02: Merge branch 'master' into core-updates
Date: Sun, 13 Sep 2015 19:39:10 +0000

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

commit 75710da66710cef1d32053cd8f350d13057d02a7
Merge: ab20c2c 610075f
Author: Ludovic Courtès <address@hidden>
Date:   Sun Sep 13 21:28:01 2015 +0200

    Merge branch 'master' into core-updates

 .gitignore                                         |    3 +-
 Makefile.am                                        |    8 +-
 configure.ac                                       |    3 +-
 doc/emacs.texi                                     |  102 +++-
 doc/guix.texi                                      |  166 +++++-
 emacs.am                                           |   13 +-
 emacs/guix-backend.el                              |   14 +-
 emacs/guix-base.el                                 |  121 +++-
 emacs/guix-command.el                              |  671 ++++++++++++++++++++
 emacs/guix-config.el.in                            |   40 ++
 emacs/guix-external.el                             |   72 +++
 emacs/guix-help-vars.el                            |  108 ++++
 emacs/guix-info.el                                 |   48 +-
 emacs/{guix-init.el.in => guix-init.el}            |    4 -
 emacs/guix-list.el                                 |   52 +-
 emacs/guix-main.scm                                |   78 +++-
 emacs/guix-messages.el                             |    8 +-
 emacs/guix-pcomplete.el                            |   91 +---
 emacs/guix-popup.el                                |   48 ++
 emacs/guix-prettify.el                             |   17 +-
 emacs/{guix-profiles.el.in => guix-profiles.el}    |    4 +-
 emacs/guix-read.el                                 |  176 +++++
 emacs/guix-utils.el                                |  120 ++++-
 emacs/guix.el                                      |   12 +-
 gnu-system.am                                      |   12 +-
 gnu/build/linux-container.scm                      |   18 +-
 gnu/build/linux-initrd.scm                         |    4 +-
 gnu/packages/admin.scm                             |   10 +-
 gnu/packages/audacity.scm                          |    2 +-
 gnu/packages/audio.scm                             |    7 +-
 gnu/packages/backup.scm                            |   40 ++-
 gnu/packages/bioinformatics.scm                    |   39 ++
 gnu/packages/bootstrap.scm                         |    2 +-
 gnu/packages/compression.scm                       |   34 +
 gnu/packages/cpio.scm                              |   18 +-
 gnu/packages/databases.scm                         |   19 +-
 gnu/packages/ebook.scm                             |    4 +-
 gnu/packages/emacs.scm                             |  107 +++-
 gnu/packages/engineering.scm                       |   48 ++
 gnu/packages/enlightenment.scm                     |   53 +-
 gnu/packages/firmware.scm                          |    6 +-
 gnu/packages/fonts.scm                             |   82 +++
 gnu/packages/freedesktop.scm                       |  104 ++--
 gnu/packages/game-development.scm                  |   14 +-
 gnu/packages/games.scm                             |    8 +-
 gnu/packages/gdb.scm                               |   54 +-
 gnu/packages/geeqie.scm                            |    3 +-
 gnu/packages/gettext.scm                           |   63 ++-
 gnu/packages/gnome.scm                             |  139 ++++-
 gnu/packages/gnucash.scm                           |   46 ++-
 gnu/packages/gnupg.scm                             |    4 +-
 gnu/packages/gstreamer.scm                         |    2 +-
 gnu/packages/gtk.scm                               |   88 +++
 gnu/packages/ibus.scm                              |  120 ++++-
 gnu/packages/image.scm                             |   16 +-
 gnu/packages/libcanberra.scm                       |    8 +-
 gnu/packages/libedit.scm                           |    6 +-
 gnu/packages/libusb.scm                            |   41 ++-
 gnu/packages/linux-libre-i686.conf                 |  220 +++++--
 gnu/packages/linux-libre-x86_64.conf               |  239 +++++--
 gnu/packages/linux.scm                             |    4 +-
 gnu/packages/mail.scm                              |   34 +
 gnu/packages/make-bootstrap.scm                    |    2 +-
 gnu/packages/maths.scm                             |   36 +
 gnu/packages/music.scm                             |   66 ++
 gnu/packages/ncdu.scm                              |   33 +-
 gnu/packages/openstack.scm                         |  216 +++++++
 gnu/packages/package-management.scm                |   13 +-
 gnu/packages/patches/cpio-CVE-2014-9112-pt1.patch  |  231 -------
 gnu/packages/patches/cpio-CVE-2014-9112-pt2.patch  |   51 --
 gnu/packages/patches/cpio-CVE-2014-9112-pt3.patch  |   23 -
 gnu/packages/patches/cpio-CVE-2014-9112-pt4.patch  |  105 ---
 gnu/packages/patches/cpio-CVE-2014-9112-pt5.patch  |   88 ---
 .../patches/cpio-fix-symlink-bad-length-test.patch |   44 --
 .../patches/gnucash-price-quotes-perl.patch        |   23 +
 gnu/packages/patches/guile-present-coding.patch    |   16 +
 gnu/packages/patches/guile-rsvg-pkgconfig.patch    |   16 +
 .../perl-finance-quote-unuse-mozilla-ca.patch      |   15 +
 gnu/packages/patches/xfce4-settings-defaults.patch |   29 +
 gnu/packages/patchutils.scm                        |   32 +
 gnu/packages/pdf.scm                               |   46 ++
 gnu/packages/perl.scm                              |   71 ++-
 gnu/packages/photo.scm                             |  126 ++++-
 gnu/packages/polkit.scm                            |   79 ++-
 gnu/packages/python.scm                            |  116 ++++-
 gnu/packages/ruby.scm                              |  516 +++++++++++++++-
 gnu/packages/ssh.scm                               |   32 +-
 gnu/packages/statistics.scm                        |  385 +++++++++++-
 gnu/packages/version-control.scm                   |   28 +-
 gnu/packages/video.scm                             |   17 +-
 gnu/packages/vpn.scm                               |    4 +
 gnu/packages/web.scm                               |  131 ++++
 gnu/packages/wm.scm                                |   79 +++
 gnu/packages/xfce.scm                              |   53 ++-
 gnu/packages/xml.scm                               |   22 +
 gnu/services/base.scm                              |    4 +
 gnu/services/desktop.scm                           |  238 +++++++-
 gnu/system/file-systems.scm                        |   22 +
 gnu/system/install.scm                             |    2 +-
 gnu/system/locale.scm                              |    2 +
 guix/build-system/r.scm                            |  134 ++++
 guix/build/download.scm                            |   79 ++-
 guix/build/emacs-build-system.scm                  |    2 +-
 guix/build/r-build-system.scm                      |  112 ++++
 guix/build/ruby-build-system.scm                   |   16 +-
 guix/build/syscalls.scm                            |   24 +-
 guix/download.scm                                  |   29 +-
 guix/git-download.scm                              |    4 +-
 guix/http-client.scm                               |    7 +-
 guix/import/cran.scm                               |  188 ++++++
 guix/import/gem.scm                                |    3 +-
 guix/licenses.scm                                  |   20 +
 guix/monads.scm                                    |    8 +-
 guix/packages.scm                                  |   15 +
 guix/scripts/build.scm                             |   49 ++-
 guix/scripts/graph.scm                             |   27 +-
 guix/scripts/import.scm                            |    2 +-
 guix/scripts/import/cran.scm                       |   92 +++
 guix/scripts/lint.scm                              |   28 +-
 guix/scripts/publish.scm                           |   23 +-
 guix/scripts/pull.scm                              |    2 +-
 guix/scripts/refresh.scm                           |    2 +-
 guix/scripts/substitute.scm                        |    2 +-
 guix/ui.scm                                        |  111 +++-
 tests/cran.scm                                     |  178 ++++++
 tests/derivations.scm                              |    4 +-
 tests/gem.scm                                      |   82 +++
 tests/guix-graph.sh                                |    5 +
 tests/lint.scm                                     |    6 +
 tests/monads.scm                                   |    4 +-
 tests/packages.scm                                 |   17 +
 131 files changed, 6647 insertions(+), 1337 deletions(-)

diff --cc gnu-system.am
index d3a9527,cd9561e..2f31f68
--- a/gnu-system.am
+++ b/gnu-system.am
@@@ -415,13 -415,6 +416,7 @@@ dist_patch_DATA =                                 
        
    gnu/packages/patches/clang-libc-search-path.patch           \
    gnu/packages/patches/clucene-pkgconfig.patch                        \
    gnu/packages/patches/cmake-fix-tests.patch                  \
 +  gnu/packages/patches/coreutils-racy-tail-test.patch         \
-   gnu/packages/patches/cpio-CVE-2014-9112-pt1.patch           \
-   gnu/packages/patches/cpio-CVE-2014-9112-pt2.patch           \
-   gnu/packages/patches/cpio-CVE-2014-9112-pt3.patch           \
-   gnu/packages/patches/cpio-CVE-2014-9112-pt4.patch           \
-   gnu/packages/patches/cpio-CVE-2014-9112-pt5.patch           \
-   gnu/packages/patches/cpio-fix-symlink-bad-length-test.patch \
    gnu/packages/patches/cpio-gets-undeclared.patch             \
    gnu/packages/patches/cpufrequtils-fix-aclocal.patch         \
    gnu/packages/patches/crda-optional-gcrypt.patch             \
@@@ -474,8 -467,8 +469,9 @@@
    gnu/packages/patches/glibc-bootstrap-system.patch           \
    gnu/packages/patches/glibc-ldd-x86_64.patch                 \
    gnu/packages/patches/glibc-locales.patch                    \
 +  gnu/packages/patches/glibc-o-largefile.patch                        \
    gnu/packages/patches/gmp-arm-asm-nothumb.patch              \
+   gnu/packages/patches/gnucash-price-quotes-perl.patch                \
    gnu/packages/patches/gnutls-doc-fix.patch                   \
    gnu/packages/patches/gobject-introspection-absolute-shlib-path.patch \
    gnu/packages/patches/gobject-introspection-cc.patch         \
@@@ -575,7 -587,7 +573,8 @@@
    gnu/packages/patches/patchelf-rework-for-arm.patch          \
    gnu/packages/patches/patchutils-xfail-gendiff-tests.patch   \
    gnu/packages/patches/patch-hurd-path-max.patch              \
 +  gnu/packages/patches/perl-autosplit-default-time.patch      \
+   gnu/packages/patches/perl-finance-quote-unuse-mozilla-ca.patch \
    gnu/packages/patches/perl-gd-options-passthrough-and-fontconfig.patch \
    gnu/packages/patches/perl-module-pluggable-search.patch     \
    gnu/packages/patches/perl-net-amazon-s3-moose-warning.patch \
diff --cc gnu/packages/databases.scm
index 98be700,c113959..e1cac39
--- a/gnu/packages/databases.scm
+++ b/gnu/packages/databases.scm
@@@ -326,16 -321,19 +326,23 @@@ types are supported, as is encryption."
                                              (map (cut string-pad <> 2 #\0)
                                                   other-digits))
                                             6 #\0))))))
 -                   (string-append
 -                    "https://fossies.org/linux/misc/sqlite-autoconf-";
 -                    numeric-version ".tar.gz")
 +                   (list
 +                    (string-append
-                      "http://distfiles.gentoo.org/distfiles/";
-                      "/sqlite-autoconf-" numeric-version ".tar.gz")
++                     "https://fossies.org/linux/misc/sqlite-autoconf-";
++                     numeric-version ".tar.gz")
 +                    (string-append
-                      "mirror://sourceforge/sqlite.mirror/SQLite%20" version
-                      "/sqlite-autoconf-" numeric-version ".tar.gz"))))
++                     "http://distfiles.gentoo.org/distfiles/";
++                     "/sqlite-autoconf-" numeric-version ".tar.gz"))
+ 
+                    ;; XXX: As of 2015-09-08, SourceForge is squatting the URL
+                    ;; below, returning 200 and showing an advertising page.
+                    ;; (string-append
+                    ;;  "mirror://sourceforge/sqlite.mirror/SQLite%20" version
+                    ;;  "/sqlite-autoconf-" numeric-version ".tar.gz")
+                    ))
              (sha256
               (base32
 -              "09nnaqx50gl1vmfvdipirizr61q3s0ywlql50f9kr1bx9rdfb0l3"))))
 +              "1dnkl4qr1dgaprbyf3jddfiynkhxnin86qabni47wjlc0fnb16gv"))))
     (build-system gnu-build-system)
     (inputs `(("readline" ,readline)))
     (arguments
diff --cc gnu/packages/python.scm
index be63890,feddd1a..f57bd83
--- a/gnu/packages/python.scm
+++ b/gnu/packages/python.scm
@@@ -4628,33 -4634,108 +4632,139 @@@ term.js Javascript terminal emulator li
                  ,@(alist-delete "python-tornado"
                                  (package-propagated-inputs terminado)))))))
  
 +(define-public python-fonttools
 +  (package
 +    (name "python-fonttools")
 +    (version "2.5")
 +    (source (origin
 +              (method url-fetch)
 +              (uri (string-append
 +                    "https://pypi.python.org/packages/source/F/FontTools/";
 +                    "fonttools-" version ".tar.gz"))
 +              (sha256
 +               (base32
 +                "08ay3x4ijarwhl60gqx2i9jzq6pxs20p4snc2d1q5jagh4rn39lb"))))
 +    (build-system python-build-system)
 +    (arguments '(#:test-target "check"))
 +    (propagated-inputs
 +     ;; XXX: module not found if setuptools is not available.
 +     `(("python-setuptools" ,python-setuptools)))
 +    (home-page "http://github.com/behdad/fonttools";)
 +    (synopsis "Tools to manipulate font files")
 +    (description
 +     "FontTools/TTX is a library to manipulate font files from Python.  It
 +supports reading and writinfg of TrueType/OpenType fonts, reading and writing
 +of AFM files, reading (and partially writing) of PS Type 1 fonts.  The package
 +also contains a tool called “TTX” which converts TrueType/OpenType fonts to 
and
 +from an XML-based format.")
 +    (license (non-copyleft "file://LICENSE.txt"
 +                           "See LICENSE.txt in the distribution."))))
 +
 +(define-public python2-fonttools
 +  (package-with-python2 python-fonttools))
++
+ (define-public python-ly
+   (package
+     (name "python-ly")
+     (version "0.9.2")
+     (source
+      (origin
+        (method url-fetch)
+        (uri (string-append
+              "https://pypi.python.org/packages/source/p/python-ly/python-ly-";
+              version ".tar.gz"))
+        (sha256
+         (base32
+          "1bsjg4q9ihr8bfdclrcmb8yjcg8xm9dznh58f3zsyrkrjzwbhcd2"))))
+     (build-system python-build-system)
+     (native-inputs
+      `(("python-setuptools" ,python-setuptools)))
+     (synopsis "Tool and library for manipulating LilyPond files")
+     (description "This package provides a Python library to parse, manipulate
+ or create documents in LilyPond format.  A command line program ly is also
+ provided that can be used to do various manipulations with LilyPond files.")
+     (home-page "https://pypi.python.org/pypi/python-ly";)
+     (license gpl2+)))
+ 
+ (define-public python-appdirs
+   (package
+     (name "python-appdirs")
+     (version "1.4.0")
+     (source
+       (origin
+         (method url-fetch)
+         (uri (string-append
+                "https://pypi.python.org/packages/source/a/appdirs/appdirs-";
+                version
+                ".tar.gz"))
+         (sha256
+           (base32
+             "1iddva7v3fq0aqzsahkazxr7vpw28mqcrsy818z4wyiqnkplbhlg"))))
+     (build-system python-build-system)
+     (inputs
+       `(("python-setuptools" ,python-setuptools)))
+     (home-page "http://github.com/ActiveState/appdirs";)
+     (synopsis
+       "Determine platform-specific dirs, e.g. a \"user data dir\"")
+     (description
+       "This module provides a portable way of finding out where user data
+ should be stored on various operating systems.")
+     (license license:expat)))
+ 
+ (define-public python2-appdirs
+   (package-with-python2 python-appdirs))
+ 
+ (define-public python-llfuse
+   (package
+     (name "python-llfuse")
+     (version "0.41")
+     (source (origin
+               (method url-fetch)
+               (uri (string-append
+                     "https://bitbucket.org/nikratio/python-llfuse/downloads/";
+                     "llfuse-" version ".tar.bz2"))
+               (sha256
+                (base32
+                 "0yzy8ixpmxk00kdq6lx5vvwbs0n6s59qnja5q0js2ahbqyxiz2hb"))))
+     (build-system python-build-system)
+     (inputs
+      `(("fuse" ,fuse)
+        ("attr" ,attr)))
+     (native-inputs
+      `(("pkg-config" ,pkg-config)
+        ("python-setuptools" ,python-setuptools)))
+     (synopsis "Python bindings for FUSE")
+     (description
+      "Python-LLFUSE is a set of Python bindings for the low level FUSE API.")
+     (home-page "https://bitbucket.org/nikratio/python-llfuse/";)
+     ;; Python-LLFUSE includes underscore.js, which is MIT (expat) licensed.
+     ;; The rest of the package is licensed under LGPL2.0 or later.
+     (license (list license:expat lgpl2.0+))))
+ 
+ (define-public python2-llfuse
+   (package-with-python2 python-llfuse))
+ 
+ (define-public python-msgpack
+   (package
+     (name "python-msgpack")
+     (version "0.4.6")
+     (source (origin
+               (method url-fetch)
+               (uri (string-append
+                     "https://pypi.python.org/packages/source/m/";
+                     "msgpack-python/msgpack-python-" version ".tar.gz"))
+               (sha256
+                (base32
+                 "1527c76b6fn4zzkgfq5xvhh7x9a9686g7fjiz717rw5vklf5ik5z"))))
+     (build-system python-build-system)
+     (native-inputs
+      `(("python-setuptools" ,python-setuptools)))
+     (synopsis "MessagePack (de)serializer")
+     (description "MessagePack is a fast, compact binary serialization format,
+ suitable for similar data to JSON.  This package provides CPython bindings for
+ reading and writing MessagePack data.")
+     (home-page "https://pypi.python.org/pypi/msgpack-python/";)
+     (license asl2.0)))
+ 
+ (define-public python2-msgpack
+   (package-with-python2 python-msgpack))
diff --cc guix/build/emacs-build-system.scm
index aacb5a4,c01b24f..cb5bde3
--- a/guix/build/emacs-build-system.scm
+++ b/guix/build/emacs-build-system.scm
@@@ -83,8 -83,7 +83,8 @@@ store in '.el' files.
    (let* ((out (assoc-ref outputs "out"))
           (elpa-name-ver (store-directory->elpa-name-version out))
           (el-dir (string-append out %install-suffix "/" elpa-name-ver))
 -         (info-dir (string-append out "/share/info"))
 +         (name-ver (strip-store-file-name out))
-          (info-dir (string-append out "/share/info/" name-ver))
++         (info-dir (string-append out "/share/info/"))
           (info-files (find-files el-dir "\\.info$")))
      (unless (null? info-files)
        (mkdir-p info-dir)
diff --cc guix/packages.scm
index da49409,e466ffe..49c6b44
--- a/guix/packages.scm
+++ b/guix/packages.scm
@@@ -93,8 -94,9 +94,10 @@@
              package-output
              package-grafts
  
+             transitive-input-references
+ 
              %supported-systems
 +            %hurd-systems
              %hydra-supported-systems
              supported-package?
  



reply via email to

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