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

commit f89aa1521af69b0e1a1350c2380579788b0f8945
Merge: 169c658 60e1de6
Author: Mark H Weaver <m...@netris.org>
Date:   Tue Apr 10 00:42:22 2018 -0400

    Merge branch 'master' into core-updates

 Makefile.am                                        |   16 +-
 build-aux/build-self.scm                           |  460 +--
 build-aux/compile-as-derivation.scm                |   53 +
 build-aux/cuirass/gnu-system.scm                   |   28 +-
 build-aux/cuirass/guix-modular.scm                 |    6 +
 .../{gnu-system.scm => hydra-to-cuirass.scm}       |    6 +-
 build-aux/hydra/evaluate.scm                       |   11 +-
 build-aux/hydra/gnu-system.scm                     |   11 +-
 build-aux/hydra/guix-modular.scm                   |   54 +-
 build-aux/hydra/guix.scm                           |    4 +-
 doc/guix.texi                                      |   22 +-
 gnu/bootloader.scm                                 |    3 +-
 gnu/local.mk                                       |    5 +-
 gnu/packages.scm                                   |   27 +-
 gnu/packages/backup.scm                            |   15 +-
 gnu/packages/bioconductor.scm                      |   32 +-
 gnu/packages/bioinformatics.scm                    |  114 +-
 gnu/packages/build-tools.scm                       |   24 +
 gnu/packages/check.scm                             |   29 +-
 gnu/packages/ci.scm                                |    6 +-
 gnu/packages/cobol.scm                             |    2 +-
 gnu/packages/cran.scm                              |   70 +-
 gnu/packages/crypto.scm                            |   52 +-
 gnu/packages/databases.scm                         |   23 +-
 gnu/packages/debian.scm                            |    5 +-
 gnu/packages/dictionaries.scm                      |   17 +-
 gnu/packages/django.scm                            |   23 +
 gnu/packages/emacs.scm                             |  159 +-
 gnu/packages/emulators.scm                         |    6 +-
 gnu/packages/engineering.scm                       |   94 +-
 gnu/packages/fontutils.scm                         |    4 +-
 gnu/packages/freedesktop.scm                       |    4 +-
 gnu/packages/game-development.scm                  |    4 +-
 gnu/packages/gnome.scm                             |    4 +-
 gnu/packages/gnunet.scm                            |    9 +-
 gnu/packages/gnupg.scm                             |   11 +
 gnu/packages/gps.scm                               |    4 +-
 gnu/packages/graphviz.scm                          |   35 +
 gnu/packages/gstreamer.scm                         |    5 +-
 gnu/packages/guile.scm                             |    9 +-
 gnu/packages/haskell-check.scm                     |   31 +
 gnu/packages/haskell-crypto.scm                    |  130 +
 gnu/packages/haskell-web.scm                       |  278 ++
 gnu/packages/haskell.scm                           |  615 +++-
 gnu/packages/image.scm                             |    6 +-
 gnu/packages/java.scm                              |  329 ++-
 gnu/packages/javascript.scm                        |    4 +-
 gnu/packages/ldc.scm                               |    8 +-
 gnu/packages/libcanberra.scm                       |    4 +-
 gnu/packages/license.scm                           |    5 +-
 gnu/packages/linux.scm                             |   40 +-
 gnu/packages/llvm.scm                              |  107 +-
 gnu/packages/mail.scm                              |   12 +-
 gnu/packages/mate.scm                              |    4 +-
 gnu/packages/maths.scm                             |   42 +-
 gnu/packages/messaging.scm                         |   15 +-
 gnu/packages/mp3.scm                               |   17 +-
 gnu/packages/music.scm                             |   90 +-
 gnu/packages/networking.scm                        |    4 +-
 gnu/packages/ocaml.scm                             |    6 +-
 gnu/packages/openstack.scm                         |    4 +-
 gnu/packages/package-management.scm                |   27 +
 gnu/packages/password-utils.scm                    |   49 +
 .../4store-unset-preprocessor-directive.patch      |   16 +
 ...path.patch => clang-3.5-libc-search-path.patch} |    0
 .../patches/clang-6.0-libc-search-path.patch       |   67 +
 .../patches/delly-use-system-libraries.patch       |   56 +
 gnu/packages/patches/libgnomeui-utf8.patch         |    6 +-
 gnu/packages/patches/racket-fix-xform-issue.patch  |   63 +
 gnu/packages/perl.scm                              |  351 ++-
 gnu/packages/php.scm                               |    4 +-
 gnu/packages/plotutils.scm                         |    5 +-
 gnu/packages/python-crypto.scm                     |   10 +-
 gnu/packages/python.scm                            |   71 +-
 gnu/packages/regex.scm                             |   11 +-
 gnu/packages/ruby.scm                              |    8 +-
 gnu/packages/rust.scm                              | 1375 +--------
 gnu/packages/samba.scm                             |    4 +-
 gnu/packages/scheme.scm                            |    8 +-
 gnu/packages/search.scm                            |   50 +
 gnu/packages/ssh.scm                               |    7 +-
 gnu/packages/statistics.scm                        |   28 +-
 gnu/packages/syncthing.scm                         |   14 +-
 gnu/packages/syndication.scm                       |    4 +-
 gnu/packages/textutils.scm                         |   10 +-
 gnu/packages/tls.scm                               |   23 +-
 gnu/packages/upnp.scm                              |    4 +-
 gnu/packages/version-control.scm                   |   82 +-
 gnu/packages/video.scm                             |   38 +
 gnu/packages/virtualization.scm                    |   10 +-
 gnu/packages/vpn.scm                               |    4 +-
 gnu/packages/web.scm                               |   26 +-
 gnu/packages/wine.scm                              |    6 +-
 gnu/packages/wm.scm                                |    4 +-
 gnu/packages/xdisorg.scm                           |   34 +-
 gnu/packages/xorg.scm                              |    4 +-
 gnu/services.scm                                   |    3 +-
 gnu/services/certbot.scm                           |   22 +-
 gnu/services/desktop.scm                           |   22 +
 gnu/system/shadow.scm                              |    3 +
 guix/build-system/cargo.scm                        |   21 +-
 guix/build/union.scm                               |   40 +-
 guix/discovery.scm                                 |   31 +-
 guix/gexp.scm                                      |   15 +-
 guix/git.scm                                       |   87 +-
 guix/modules.scm                                   |    7 +-
 guix/scripts/package.scm                           |   17 +-
 guix/self.scm                                      |  599 ++++
 guix/upstream.scm                                  |    5 +-
 nix/libstore/globals.cc                            |   44 -
 nix/libstore/globals.hh                            |    4 -
 nix/libstore/local-store.cc                        |  159 +-
 nix/libstore/local-store.hh                        |    7 +-
 nix/libstore/misc.cc                               |  114 -
 nix/libstore/misc.hh                               |    7 -
 nix/libstore/store-api.cc                          |   31 -
 nix/libstore/store-api.hh                          |   17 -
 po/guix/LINGUAS                                    |    1 +
 po/guix/es.po                                      | 2994 ++++++++++++++++++++
 tests/guix-package.sh                              |    8 +
 tests/syscalls.scm                                 |   10 +-
 tests/union.scm                                    |   42 +-
 122 files changed, 7496 insertions(+), 2510 deletions(-)

diff --cc gnu/packages/bioinformatics.scm
index d4380f8,0e9e6b1..5af4947
--- a/gnu/packages/bioinformatics.scm
+++ b/gnu/packages/bioinformatics.scm
@@@ -3793,14 -3831,12 +3840,14 @@@ sequences)."
                (file-name (string-append name "-" version ".tar.gz"))
                (sha256
                 (base32
-                 "08znbvqq5xknfhmpp3wcj574zvi4p7i8zifi67c9qw9a6ikp42fj"))
+                 "00fx14vpmgsijwxd1xql3if934l82v8ckqgjjyyhnr36qb9qrskv"))
                (modules '((guix build utils)))
                (snippet
 -               ;; Delete bundled kseq.
 -               ;; TODO: Also delete bundled murmurhash and open bloom filter.
 -               '(delete-file "src/mash/kseq.h"))))
 +               '(begin
 +                  ;; Delete bundled kseq.
 +                  ;; TODO: Also delete bundled murmurhash and open bloom 
filter.
 +                  (delete-file "src/mash/kseq.h")
 +                  #t))))
      (build-system gnu-build-system)
      (arguments
       `(#:tests? #f ; No tests.
diff --cc gnu/packages/graphviz.scm
index 35ea129,58c0fa8..2b7438c
--- a/gnu/packages/graphviz.scm
+++ b/gnu/packages/graphviz.scm
@@@ -3,8 -3,9 +3,9 @@@
  ;;; Copyright © 2015 Efraim Flashner <efr...@flashner.co.il>
  ;;; Copyright © 2016 Theodoros Foradis <theodo...@foradis.org>
  ;;; Copyright © 2017 Ricardo Wurmus <rek...@elephly.net>
 -;;; Copyright © 2017 Tobias Geerinckx-Rice <m...@tobias.gr>
 +;;; Copyright © 2017, 2018 Tobias Geerinckx-Rice <m...@tobias.gr>
  ;;; Copyright © 2017 Gábor Boskovits <boskov...@gmail.com>
+ ;;; Copyright © 2018 Mathieu Lirzin <m...@gnu.org>
  ;;;
  ;;; This file is part of GNU Guix.
  ;;;
diff --cc gnu/packages/guile.scm
index a9c0a21,6efa0dd..e008e3b
--- a/gnu/packages/guile.scm
+++ b/gnu/packages/guile.scm
@@@ -1967,9 -1949,14 +1967,10 @@@ is not available for Guile 2.0."
        (build-system gnu-build-system)
        (arguments
         `(#:phases (modify-phases %standard-phases
 -                    (add-after 'unpack 'bootstrap
 -                      (lambda _
 -                        (zero? (system* "autoreconf" "-vfi"))))
 -
                      ;; FIXME: On i686, bytestructures miscalculates the offset
                      ;; of the 'old-file' and 'new-file' fields within the
-                     ;; '%diff-delta' structure.
+                     ;; '%diff-delta' structure.  See
+                     ;; 
<https://github.com/TaylanUB/scheme-bytestructures/issues/30>.
                      ,@(if (string=? (%current-system) "x86_64-linux")
                            '()
                            '((add-before 'check 'skip-tests
diff --cc gnu/packages/python.scm
index 013758c,e5b74a5..be93d43
--- a/gnu/packages/python.scm
+++ b/gnu/packages/python.scm
@@@ -13181,27 -13083,47 +13181,72 @@@ file system events on Linux."
           "0svc9nla3b9145d6b7fb9dizx412l3difzqw0ilh9lz52nsixw8j"))
         (file-name (string-append name "-" version ".tar.gz"))))))
  
 +(define-public python-more-itertools
 +  (package
 +    (name "python-more-itertools")
 +    (version "4.1.0")
 +    (source
 +     (origin
 +       (method url-fetch)
 +       (uri (pypi-uri "more-itertools" version))
 +       (sha256
 +        (base32
 +         "0i3ch700g5fyjp692gprlnzbysl8w0sa2vijbp3s40drvk67xkn9"))))
 +    (build-system python-build-system)
 +    (propagated-inputs
 +     `(("python-six" ,python-six-bootstrap)))
 +    (home-page "https://github.com/erikrose/more-itertools";)
 +    (synopsis "More routines for operating on iterables, beyond itertools")
 +    (description "Python's built-in @code{itertools} module implements a
 +number of iterator building blocks inspired by constructs from APL, Haskell,
 +and SML.  @code{more-itertools} includes additional building blocks for
 +working with iterables.")
 +    (license license:expat)))
 +
 +(define-public python2-more-itertools
 +  (package-with-python2 python-more-itertools))
++
+ (define-public python-latexcodec
+   (package
+     (name "python-latexcodec")
+     (version "1.0.5")
+     (source
+      (origin
+        (method url-fetch)
+        (uri (pypi-uri "latexcodec" version))
+        (sha256
+         (base32
+          "0zdd1gf24i83ykadx0y30n3001j43scqr2saql3vckk5c39dj1wn"))))
+     (build-system python-build-system)
+     (inputs
+      `(("python-six" ,python-six)))
+     (home-page "https://readthedocs.org/projects/latexcodec/";)
+     (synopsis "Work with LaTeX code in Python")
+     (description "Lexer and codec to work with LaTeX code in Python.")
+     (license license:expat)))
+ 
+ (define-public python-pybtex
+   (package
+     (name "python-pybtex")
+     (version "0.21")
+     (source
+      (origin
+        (method url-fetch)
+        (uri (pypi-uri "pybtex" version))
+        (sha256
+         (base32
+          "00300j8dn5pxq4ndxmfmbmycg2znawkqs49val2x6jlmfiy6r2mg"))))
+     (build-system python-build-system)
+     (native-inputs
+      `(("python-nose" ,python-nose)))
+     (inputs
+      `(("python-latexcodec" ,python-latexcodec)
+        ("python-pyyaml" ,python-pyyaml)
+        ("python-six" ,python-six)))
+     (arguments
+      `(#:test-target "nosetests"))
+     (home-page "https://pybtex.org/";)
+     (synopsis "BibTeX-compatible bibliography processor")
+     (description "Pybtex is a BibTeX-compatible bibliography processor written
+ in Python.  You can simply type pybtex instead of bibtex.")
+     (license license:expat)))
diff --cc gnu/packages/syncthing.scm
index 7560238,4c60760..5868bdb
--- a/gnu/packages/syncthing.scm
+++ b/gnu/packages/syncthing.scm
@@@ -36,12 -36,11 +36,12 @@@
                                    "/syncthing-source-v" version ".tar.gz"))
                (sha256
                 (base32
-                 "0nv5g9ymykl4316l2g3mnac77y2rx9ps4j2kg3pymxlq6qms2dij"))
+                 "0h5b2mp0li0qzrz3wggzavdfqfaz9b79hx6wds84ya2i9maw80cl"))
                (modules '((guix build utils)))
                ;; Delete bundled ("vendored") free software source code.
 -              (snippet
 -                '(delete-file-recursively "vendor"))))
 +              (snippet '(begin
 +                          (delete-file-recursively "vendor")
 +                          #t))))
      (build-system go-build-system)
      ;; The primary Syncthing executable goes to "out", while the auxiliary
      ;; server programs and utility tools go to "utils".  This reduces the size

Reply via email to