guix-commits
[Top][All Lists]
Advanced

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

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


From: Mark H. Weaver
Subject: 01/01: Merge branch 'master' into core-updates
Date: Tue, 20 Mar 2018 00:50:48 -0400 (EDT)

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

commit 647888845c0d7b9ea1b51a3e3492d4d2382f4468
Merge: fe15613 c657716
Author: Mark H Weaver <address@hidden>
Date:   Tue Mar 20 00:49:05 2018 -0400

    Merge branch 'master' into core-updates

 doc/guix.texi                                      |  21 +-
 gnu/build/linux-modules.scm                        |  19 +-
 gnu/local.mk                                       |   3 +-
 gnu/packages/android.scm                           |   2 +-
 gnu/packages/avahi.scm                             |  16 +-
 gnu/packages/bash.scm                              |   5 +-
 gnu/packages/bioinformatics.scm                    |  60 +++--
 gnu/packages/bootloaders.scm                       |   2 +-
 gnu/packages/build-tools.scm                       |   2 +-
 gnu/packages/chemistry.scm                         |   4 +-
 gnu/packages/code.scm                              |   4 +-
 gnu/packages/compression.scm                       |  21 +-
 gnu/packages/connman.scm                           |   4 +-
 gnu/packages/cran.scm                              |  69 ++++--
 gnu/packages/crypto.scm                            |   2 +-
 gnu/packages/databases.scm                         |   8 +-
 gnu/packages/datamash.scm                          |   4 +-
 gnu/packages/django.scm                            |   4 +-
 gnu/packages/dns.scm                               |  13 +-
 gnu/packages/elf.scm                               |   2 +-
 gnu/packages/emacs.scm                             |   2 +-
 gnu/packages/emulators.scm                         |   2 +-
 gnu/packages/engineering.scm                       |   4 +-
 gnu/packages/enlightenment.scm                     |   5 +-
 gnu/packages/file-systems.scm                      |   2 +-
 gnu/packages/flashing-tools.scm                    |   6 +-
 gnu/packages/freedesktop.scm                       |   6 +-
 gnu/packages/fvwm.scm                              |  21 ++
 gnu/packages/games.scm                             |  26 +--
 gnu/packages/gimp.scm                              |  12 +-
 gnu/packages/gl.scm                                |   2 +-
 gnu/packages/gnome.scm                             |   6 +-
 gnu/packages/gnuzilla.scm                          |   5 +-
 gnu/packages/golang.scm                            |  52 +++++
 gnu/packages/graph.scm                             |   2 +-
 gnu/packages/graphics.scm                          |  27 ++-
 gnu/packages/guile.scm                             | 119 ++++------
 gnu/packages/haskell.scm                           |  21 +-
 gnu/packages/image.scm                             |   4 +-
 gnu/packages/imagemagick.scm                       |   4 +-
 gnu/packages/irc.scm                               |   6 +-
 gnu/packages/kde-frameworks.scm                    |  36 +--
 gnu/packages/linux.scm                             |  48 ++--
 gnu/packages/lua.scm                               |  10 +-
 gnu/packages/mail.scm                              |   2 +-
 gnu/packages/make-bootstrap.scm                    |   2 +-
 gnu/packages/maths.scm                             |  34 +++
 gnu/packages/messaging.scm                         |  12 +-
 gnu/packages/monitoring.scm                        |  31 +++
 gnu/packages/music.scm                             |  10 +-
 gnu/packages/networking.scm                        |  20 +-
 gnu/packages/ocaml.scm                             |   6 +-
 gnu/packages/onc-rpc.scm                           |   8 +-
 gnu/packages/openstack.scm                         |  12 +-
 gnu/packages/password-utils.scm                    |   4 +-
 .../patches/bash-completion-directories.patch      |   8 +-
 .../patches/java-simple-xml-fix-tests.patch        |  37 +++
 .../patches/libtirpc-missing-headers.patch         |  40 ----
 gnu/packages/perl.scm                              |   6 +-
 gnu/packages/photo.scm                             |   2 +-
 gnu/packages/protobuf.scm                          |   6 +-
 gnu/packages/python-crypto.scm                     |  19 +-
 gnu/packages/python-web.scm                        |   2 +-
 gnu/packages/python.scm                            |  58 ++---
 gnu/packages/qt.scm                                |   2 +-
 gnu/packages/ratpoison.scm                         |   2 +-
 gnu/packages/rdesktop.scm                          |   7 +-
 gnu/packages/ruby.scm                              | 260 +++++++++++++++++++++
 gnu/packages/sdl.scm                               |   6 +-
 gnu/packages/serialization.scm                     |   8 +-
 gnu/packages/sml.scm                               |   2 +-
 gnu/packages/statistics.scm                        |   8 +-
 gnu/packages/syncthing.scm                         |   6 +-
 gnu/packages/terminals.scm                         |  33 ++-
 gnu/packages/terraform.scm                         |  52 +++++
 gnu/packages/tex.scm                               |   2 +-
 gnu/packages/text-editors.scm                      |   8 +-
 gnu/packages/tls.scm                               |   6 +-
 gnu/packages/video.scm                             |   8 +-
 gnu/packages/virtualization.scm                    |   2 +-
 gnu/packages/vulkan.scm                            | 140 ++++++-----
 gnu/packages/web.scm                               |  20 +-
 gnu/packages/wget.scm                              |  28 +--
 gnu/packages/wine.scm                              |  15 +-
 gnu/packages/wm.scm                                |   2 +-
 gnu/packages/xdisorg.scm                           |  10 +-
 gnu/packages/xml.scm                               |  15 +-
 gnu/packages/xorg.scm                              |   2 +-
 gnu/services/databases.scm                         |   8 +-
 gnu/services/mcron.scm                             |   8 +-
 gnu/services/ssh.scm                               |   7 +
 gnu/system/vm.scm                                  |   1 +
 gnu/tests/base.scm                                 |   4 +-
 guix/download.scm                                  |   3 -
 guix/git-download.scm                              |   2 +-
 guix/git.scm                                       |  40 +++-
 guix/glob.scm                                      | 124 ++++++----
 guix/import/elpa.scm                               |  25 +-
 tests/elpa.scm                                     |  43 ++--
 tests/glob.scm                                     |  67 +++---
 100 files changed, 1294 insertions(+), 694 deletions(-)

diff --cc gnu/local.mk
index a03b482,490f07b..bc30cba
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@@ -857,8 -862,9 +859,7 @@@ dist_patch_DATA =                                  
        
    %D%/packages/patches/libssh-hostname-parser-bug.patch               \
    %D%/packages/patches/libssh2-fix-build-failure-with-gcrypt.patch    \
    %D%/packages/patches/libtar-CVE-2013-4420.patch             \
 -  %D%/packages/patches/libtasn1-CVE-2017-10790.patch          \
 -  %D%/packages/patches/libtasn1-CVE-2018-6003.patch           \
    %D%/packages/patches/libtheora-config-guess.patch           \
-   %D%/packages/patches/libtirpc-missing-headers.patch         \
    %D%/packages/patches/libtiff-CVE-2017-9935.patch            \
    %D%/packages/patches/libtiff-CVE-2017-18013.patch           \
    %D%/packages/patches/libtool-skip-tests2.patch              \
diff --cc gnu/packages/bash.scm
index 52d93e8,b98ffe1..64f7782
--- a/gnu/packages/bash.scm
+++ b/gnu/packages/bash.scm
@@@ -1,8 -1,9 +1,9 @@@
  ;;; GNU Guix --- Functional package management for GNU
  ;;; Copyright © 2012, 2013, 2014, 2015, 2016, 2017 Ludovic Courtès 
<address@hidden>
 -;;; Copyright © 2014, 2015 Mark H Weaver <address@hidden>
 +;;; Copyright © 2014, 2015, 2018 Mark H Weaver <address@hidden>
  ;;; Copyright © 2015, 2017 Leo Famulari <address@hidden>
  ;;; Copyright © 2016, 2017 Efraim Flashner <address@hidden>
+ ;;; Copyright © 2018 Tobias Geerinckx-Rice <address@hidden>
  ;;;
  ;;; This file is part of GNU Guix.
  ;;;
diff --cc gnu/packages/python-crypto.scm
index f35c8c5,3fbaf1c..f709ed9
--- a/gnu/packages/python-crypto.scm
+++ b/gnu/packages/python-crypto.scm
@@@ -563,11 -563,10 +563,11 @@@ PKCS#8, PKCS#12, PKCS#5, X.509 and TSP.
         (uri (pypi-uri "PyNaCl" version))
         (modules '((guix build utils)))
         ;; Remove bundled libsodium
 -       (snippet '(delete-file-recursively "src/libsodium"))
 +       (snippet '(begin (delete-file-recursively "src/libsodium")
 +                        #t))
         (sha256
          (base32
-          "135gz0020fqx8fbr9izpwyq49aww202nkqacq0cw61xz99sjpx9j"))))
+          "01vjq0pxyw1mxaqy013hzs8nknmvg3kpzlzmh69jxznyipgvria5"))))
      (build-system python-build-system)
      (arguments
       `(#:phases
diff --cc gnu/packages/ratpoison.scm
index b1f012e,1932187..901d6fc
--- a/gnu/packages/ratpoison.scm
+++ b/gnu/packages/ratpoison.scm
@@@ -76,9 -77,9 +76,9 @@@
         ("libXtst" ,libxtst)
         ("libX11" ,libx11)
         ("readline" ,readline)
 -       ("xextproto" ,xextproto)))
 +       ("xorgproto" ,xorgproto)))
      (native-inputs
-      `(("perl",perl)
+      `(("perl" ,perl)
         ("pkg-config" ,pkg-config)
         ("ratpoison.desktop" ,ratpoison.desktop)))
      (home-page "https://www.nongnu.org/ratpoison/";)



reply via email to

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