guix-commits
[Top][All Lists]
Advanced

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

01/01: Merge branch 'master' into staging


From: Marius Bakke
Subject: 01/01: Merge branch 'master' into staging
Date: Sat, 17 Mar 2018 20:13:24 -0400 (EDT)

mbakke pushed a commit to branch staging
in repository guix.

commit 7ace97395feedc4b3ec23be65f2ed63f29aac9a9
Merge: a248a9a be5ed14
Author: Marius Bakke <address@hidden>
Date:   Sun Mar 18 01:09:25 2018 +0100

    Merge branch 'master' into staging

 doc/guix.texi                                      |  30 +-
 gnu/build/vm.scm                                   | 103 +++---
 gnu/local.mk                                       |  12 +-
 gnu/packages/ada.scm                               | 101 ++++++
 gnu/packages/admin.scm                             |  27 +-
 gnu/packages/android.scm                           |   2 +-
 gnu/packages/autotools.scm                         |  25 +-
 gnu/packages/avahi.scm                             |  16 +-
 gnu/packages/bioinformatics.scm                    | 348 +++++++++++++++++++--
 gnu/packages/bootloaders.scm                       |   2 +-
 gnu/packages/build-tools.scm                       |   2 +-
 gnu/packages/calcurse.scm                          |   5 +-
 gnu/packages/cdrom.scm                             |  14 +-
 gnu/packages/chemistry.scm                         |   4 +-
 gnu/packages/code.scm                              |  34 +-
 gnu/packages/compression.scm                       |  49 ++-
 gnu/packages/connman.scm                           |   4 +-
 gnu/packages/cran.scm                              | 326 +++++++++++++++++--
 gnu/packages/curl.scm                              |  30 +-
 gnu/packages/databases.scm                         | 124 +++++++-
 gnu/packages/datamash.scm                          |   4 +-
 gnu/packages/debian.scm                            | 170 ++++++++++
 gnu/packages/django.scm                            |  64 +++-
 gnu/packages/dns.scm                               |   7 +-
 gnu/packages/emacs.scm                             |  47 ++-
 gnu/packages/emulators.scm                         |   2 +-
 gnu/packages/engineering.scm                       |   4 +-
 gnu/packages/enlightenment.scm                     |   7 +-
 gnu/packages/file-systems.scm                      |   2 +-
 gnu/packages/flashing-tools.scm                    |   6 +-
 gnu/packages/freedesktop.scm                       |   6 +-
 gnu/packages/fvwm.scm                              |  21 ++
 gnu/packages/game-development.scm                  |   4 +-
 gnu/packages/games.scm                             |  26 +-
 gnu/packages/geo.scm                               | 121 +++++++
 gnu/packages/gimp.scm                              |  12 +-
 gnu/packages/gl.scm                                |   2 +-
 gnu/packages/gnome.scm                             |  19 +-
 gnu/packages/gnunet.scm                            |   4 +-
 gnu/packages/gnupg.scm                             |  61 +++-
 gnu/packages/gnuzilla.scm                          |  32 +-
 gnu/packages/golang.scm                            |  52 +++
 gnu/packages/gps.scm                               |   1 +
 gnu/packages/graph.scm                             |  37 ++-
 gnu/packages/graphics.scm                          |  33 +-
 gnu/packages/gtk.scm                               |   5 +-
 gnu/packages/guile.scm                             |  69 ++--
 gnu/packages/haskell-web.scm                       |  12 +
 gnu/packages/haskell.scm                           | 210 ++++++++++++-
 gnu/packages/idris.scm                             |  64 +++-
 gnu/packages/image.scm                             |  64 ++++
 gnu/packages/inkscape.scm                          |  15 +-
 gnu/packages/irc.scm                               |   2 +-
 gnu/packages/java.scm                              | 252 ++++++++-------
 gnu/packages/julia.scm                             |   7 +-
 gnu/packages/kde-frameworks.scm                    |  36 +--
 gnu/packages/language.scm                          |   8 +-
 gnu/packages/libevent.scm                          |   4 +-
 gnu/packages/libusb.scm                            |   1 +
 gnu/packages/linux.scm                             |  62 ++--
 gnu/packages/lisp.scm                              |   1 +
 gnu/packages/logging.scm                           |   4 +-
 gnu/packages/lua.scm                               |  10 +-
 gnu/packages/mail.scm                              |   4 +-
 gnu/packages/make-bootstrap.scm                    |   2 +-
 gnu/packages/man.scm                               |   7 +-
 gnu/packages/mate.scm                              |   4 +-
 gnu/packages/maths.scm                             |  97 +++++-
 gnu/packages/messaging.scm                         |  24 +-
 gnu/packages/mingw.scm                             |  20 +-
 gnu/packages/monitoring.scm                        |  31 ++
 gnu/packages/music.scm                             |  11 +-
 gnu/packages/networking.scm                        |  41 +--
 gnu/packages/node.scm                              |  67 ++--
 gnu/packages/ocaml.scm                             |  25 +-
 gnu/packages/openstack.scm                         |   4 +-
 gnu/packages/package-management.scm                |   2 +-
 gnu/packages/password-utils.scm                    |   4 +-
 gnu/packages/patches/java-jeromq-fix-tests.patch   | 253 +++++++++++++++
 .../patches/java-simple-xml-fix-tests.patch        |  37 +++
 gnu/packages/patches/lrzip-CVE-2017-8842.patch     |  23 ++
 gnu/packages/patches/shadow-CVE-2018-7169.patch    | 191 +++++++++++
 .../patches/util-linux-CVE-2018-7738.patch         |  49 +++
 gnu/packages/patches/zsh-CVE-2018-7548.patch       |  48 +++
 gnu/packages/patches/zsh-CVE-2018-7549.patch       |  56 ++++
 gnu/packages/perl.scm                              |  66 ++--
 gnu/packages/photo.scm                             |   2 +-
 gnu/packages/protobuf.scm                          |   6 +-
 gnu/packages/pulseaudio.scm                        |   1 +
 gnu/packages/python-crypto.scm                     |   9 +-
 gnu/packages/python-web.scm                        |   6 +-
 gnu/packages/python.scm                            | 178 ++++++++---
 gnu/packages/qt.scm                                |   2 +-
 gnu/packages/ratpoison.scm                         |   2 +-
 gnu/packages/rdesktop.scm                          |   7 +-
 gnu/packages/samba.scm                             |   8 +-
 gnu/packages/sawfish.scm                           |   2 +-
 gnu/packages/scheme.scm                            |   4 +-
 gnu/packages/sdl.scm                               |   6 +-
 gnu/packages/serialization.scm                     |  88 +++++-
 gnu/packages/shells.scm                            |   2 +
 gnu/packages/sml.scm                               |   2 +-
 gnu/packages/spice.scm                             |   1 +
 gnu/packages/sssd.scm                              |   6 +-
 gnu/packages/statistics.scm                        |  81 ++---
 gnu/packages/suckless.scm                          |   4 +-
 gnu/packages/syncthing.scm                         |   6 +-
 gnu/packages/terminals.scm                         |  16 +-
 gnu/packages/terraform.scm                         |  52 +++
 gnu/packages/tex.scm                               | 322 +++++++++++--------
 gnu/packages/text-editors.scm                      |   8 +-
 gnu/packages/textutils.scm                         |   3 +-
 gnu/packages/time.scm                              |   6 +-
 gnu/packages/tls.scm                               |   6 +-
 gnu/packages/version-control.scm                   |   6 +-
 gnu/packages/video.scm                             |  18 +-
 gnu/packages/virtualization.scm                    |   6 +-
 gnu/packages/vpn.scm                               |   1 +
 gnu/packages/vulkan.scm                            | 140 ++++-----
 gnu/packages/web.scm                               |  20 +-
 gnu/packages/webkit.scm                            |  14 +-
 gnu/packages/wget.scm                              |  28 +-
 gnu/packages/wine.scm                              |  96 ++++--
 gnu/packages/wm.scm                                |   6 +-
 gnu/packages/xdisorg.scm                           |  37 ++-
 gnu/packages/xiph.scm                              |  15 +-
 gnu/packages/xml.scm                               |  25 +-
 gnu/packages/xorg.scm                              |  74 ++---
 gnu/packages/zile.scm                              |   4 +-
 gnu/services/base.scm                              |  67 ++--
 gnu/services/databases.scm                         |  93 ++++--
 gnu/services/mail.scm                              | 147 ++++-----
 gnu/services/shepherd.scm                          |  26 +-
 gnu/services/ssh.scm                               |   7 +
 gnu/system/install.scm                             |   4 +-
 gnu/system/linux-initrd.scm                        |  36 +--
 gnu/system/mapped-devices.scm                      |  51 ++-
 gnu/tests/databases.scm                            |  55 ++++
 gnu/tests/mail.scm                                 | 120 ++++++-
 guix/build-system/minify.scm                       |   3 +-
 guix/download.scm                                  |   3 -
 guix/git.scm                                       |  40 ++-
 guix/import/elpa.scm                               |  10 +-
 guix/scripts/system.scm                            |  18 +-
 po/guix/POTFILES.in                                |   2 +-
 tests/guix-build.sh                                |   2 +-
 tests/packages.scm                                 |  19 +-
 147 files changed, 4608 insertions(+), 1315 deletions(-)

diff --cc gnu/packages/build-tools.scm
index 6a759f2,73eacf7..b1534e0
--- a/gnu/packages/build-tools.scm
+++ b/gnu/packages/build-tools.scm
@@@ -79,18 -79,9 +79,18 @@@ makes a few sacrifices to acquire fast 
                                    version ".tar.gz"))
                (sha256
                 (base32
 -                "06r8limj38mv884s5riiz6lpzw37cvhbf9jd0smzcbi7fwmv3yah"))))
 +                "1r3wlimllakrswx2rb4mbdk1iricqk6myvdvib6dkyx362yanm9l"))))
      (build-system python-build-system)
 +    (arguments
 +     `(;; FIXME: Tests require many additional inputs, a fix for the RUNPATH
 +       ;; patch in meson-for-build, and patching many hard-coded file system
 +       ;; locations in "run_unittests.py".
 +       #:tests? #f
 +       #:phases (modify-phases %standard-phases
 +                  ;; Meson calls the various executables in out/bin through 
the
 +                  ;; Python interpreter, so we cannot use the shell wrapper.
 +                  (delete 'wrap))))
-     (inputs `(("ninja", ninja)))
+     (inputs `(("ninja" ,ninja)))
      (propagated-inputs `(("python" ,python)))
      (home-page "https://mesonbuild.com/";)
      (synopsis "Build system designed to be fast and user-friendly")



reply via email to

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