guix-commits
[Top][All Lists]
Advanced

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

01/11: Merge branch 'staging' into core-updates


From: guix-commits
Subject: 01/11: Merge branch 'staging' into core-updates
Date: Sun, 10 Mar 2019 13:51:31 -0400 (EDT)

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

commit 96ab233df7eefd4c868a9e9628b834458e9f18d3
Merge: b4d7689 a4de1a6
Author: Marius Bakke <address@hidden>
Date:   Sun Mar 10 18:47:02 2019 +0100

    Merge branch 'staging' into core-updates

 .dir-locals.el                                     |    1 +
 Makefile.am                                        |   11 +-
 doc/guix.texi                                      |   34 +-
 .../text-mode/guix-commit-message-add-package      |    7 +-
 .../text-mode/guix-commit-message-update-package   |   19 +-
 gnu/artwork.scm                                    |    4 +-
 gnu/build/accounts.scm                             |  561 +++
 gnu/build/activation.scm                           |  274 +-
 gnu/build/install.scm                              |    3 +-
 gnu/build/linux-modules.scm                        |   29 +-
 gnu/local.mk                                       |    9 +-
 gnu/packages/admin.scm                             |   11 +-
 .../linux-libre/{4.20-arm.conf => 5.0-arm.conf}    |  296 +-
 .../{4.20-arm64.conf => 5.0-arm64.conf}            |  418 ++-
 .../linux-libre/{4.20-i686.conf => 5.0-i686.conf}  |  342 +-
 .../{4.20-x86_64.conf => 5.0-x86_64.conf}          |  330 +-
 gnu/packages/benchmark.scm                         |   27 +-
 gnu/packages/bioconductor.scm                      |  476 ++-
 gnu/packages/bioinformatics.scm                    |  685 +---
 gnu/packages/bootloaders.scm                       |    8 +-
 gnu/packages/code.scm                              |    6 +-
 gnu/packages/compression.scm                       |   10 +-
 gnu/packages/cran.scm                              |  365 +-
 gnu/packages/cups.scm                              |    6 +
 gnu/packages/emacs-xyz.scm                         |    4 +-
 gnu/packages/emacs.scm                             |    6 +-
 gnu/packages/embedded.scm                          |    6 +-
 gnu/packages/engineering.scm                       |   47 +
 gnu/packages/finance.scm                           |    8 +-
 gnu/packages/fonts.scm                             |   53 +-
 gnu/packages/fontutils.scm                         |    4 +-
 gnu/packages/freedesktop.scm                       |    4 +-
 gnu/packages/games.scm                             |  192 +-
 gnu/packages/geo.scm                               |    4 +-
 gnu/packages/gimp.scm                              |    4 +-
 gnu/packages/gl.scm                                |    7 +-
 gnu/packages/glib.scm                              |    4 +-
 gnu/packages/gnome.scm                             |  752 ++--
 gnu/packages/gnunet.scm                            |   16 +-
 gnu/packages/golang.scm                            |    4 +-
 gnu/packages/graph.scm                             |    6 +-
 gnu/packages/gtk.scm                               |   70 +-
 gnu/packages/guile-xyz.scm                         |   97 +
 gnu/packages/hyperledger.scm                       |   93 +
 gnu/packages/ibus.scm                              |   10 +-
 gnu/packages/java.scm                              |   64 +-
 gnu/packages/linux.scm                             |  210 +-
 gnu/packages/machine-learning.scm                  |   23 +-
 gnu/packages/mail.scm                              |  210 +-
 gnu/packages/man.scm                               |   29 +-
 gnu/packages/maths.scm                             |   21 +-
 gnu/packages/mpd.scm                               |    4 +-
 gnu/packages/music.scm                             |   50 +-
 gnu/packages/networking.scm                        |    3 +-
 gnu/packages/package-management.scm                |    8 +-
 gnu/packages/patches/blast+-fix-makefile.patch     |   15 -
 .../patches/gcr-disable-failing-tests.patch        |  126 -
 ...-fix-collection-tests-to-work-with-gpg-21.patch |   31 -
 .../patches/gnome-todo-libical-compat.patch        |   17 -
 gnu/packages/patches/rust-1.30-gdb-llvm.patch      |   89 +
 gnu/packages/patches/valgrind-glibc-compat.patch   |   18 -
 gnu/packages/perl.scm                              |   26 +-
 gnu/packages/php.scm                               |   11 +-
 gnu/packages/python-xyz.scm                        |   17 +-
 gnu/packages/ruby.scm                              |  227 +-
 gnu/packages/rust.scm                              |   83 +-
 gnu/packages/scanner.scm                           |   28 +-
 gnu/packages/search.scm                            |    6 +-
 gnu/packages/statistics.scm                        |  125 +-
 gnu/packages/syncthing.scm                         |    4 +-
 gnu/packages/terminals.scm                         |    7 +-
 gnu/packages/tex.scm                               |   74 +
 gnu/packages/uml.scm                               |    7 +-
 gnu/packages/valgrind.scm                          |   23 +-
 gnu/packages/version-control.scm                   |    4 +-
 gnu/packages/video.scm                             |  103 +-
 gnu/packages/vim.scm                               |    7 +
 gnu/packages/virtualization.scm                    |   12 +-
 gnu/packages/vpn.scm                               |    8 +-
 gnu/packages/vulkan.scm                            |  292 +-
 gnu/packages/wget.scm                              |   90 +-
 gnu/packages/wm.scm                                |   33 +-
 gnu/packages/xdisorg.scm                           |   57 +-
 gnu/packages/xorg.scm                              |   12 +-
 gnu/services/dbus.scm                              |    8 +-
 gnu/system/accounts.scm                            |  109 +
 gnu/system/shadow.scm                              |   96 +-
 gnu/tests/base.scm                                 |    6 +
 guix/channels.scm                                  |    6 +
 guix/describe.scm                                  |   43 +-
 guix/inferior.scm                                  |   27 +-
 guix/licenses.scm                                  |    6 +
 guix/scripts/pack.scm                              |   27 +-
 guix/scripts/package.scm                           |   36 +-
 guix/store/database.scm                            |   52 +-
 guix/upstream.scm                                  |   53 +-
 po/guix/LINGUAS                                    |    1 +
 po/guix/sv.po                                      | 3619 ++++++++++++++++++++
 tests/accounts.scm                                 |  309 ++
 99 files changed, 9229 insertions(+), 2666 deletions(-)

diff --cc gnu/local.mk
index e6830f0,7da2e1f..47996dc
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@@ -665,10 -669,8 +668,9 @@@ dist_patch_DATA =                                 
        
    %D%/packages/patches/bazaar-CVE-2017-14176.patch            \
    %D%/packages/patches/beets-python-3.7-fix.patch             \
    %D%/packages/patches/beignet-correct-file-names.patch               \
 +  %D%/packages/patches/binutils-boot-2.20.1a.patch            \
    %D%/packages/patches/biber-fix-encoding-write.patch         \
    %D%/packages/patches/binutils-loongson-workaround.patch     \
-   %D%/packages/patches/blast+-fix-makefile.patch              \
    %D%/packages/patches/boost-fix-icu-build.patch              \
    %D%/packages/patches/byobu-writable-status.patch            \
    %D%/packages/patches/calibre-no-updates-dialog.patch                \
diff --cc gnu/packages/mpd.scm
index 56ffe17,bb386f5..3b21378
--- a/gnu/packages/mpd.scm
+++ b/gnu/packages/mpd.scm
@@@ -100,10 -100,20 +100,10 @@@ interfacing MPD in the C, C++ & Objecti
                                "/mpd-" version ".tar.xz"))
                (sha256
                 (base32
-                 "1ix52vfa8k8my4xyr8b0phg8605b2xchyzyva908m08vpzm14w94"))))
+                 "1y8fbch4xp96i4mz6czivnwvaf7g8pnfix5d0pbybnkv7bmz1a9f"))))
      (build-system meson-build-system)
      (arguments
 -     `(#:configure-flags '("-Ddocumentation=true") ; The default is 'false'...
 -       #:phases
 -       (modify-phases %standard-phases
 -         (add-before 'configure 'expand-C++-include-path
 -           ;; Make <gcc>/include/c++/ext/string_conversions.h find <stdlib.h>.
 -           (lambda* (#:key inputs #:allow-other-keys)
 -             (let* ((path "CPLUS_INCLUDE_PATH")
 -                    (gcc  (assoc-ref inputs "gcc"))
 -                    (c++  (string-append gcc "/include/c++")))
 -               (setenv path (string-append c++ ":" (getenv path)))
 -               #t))))))
 +     `(#:configure-flags '("-Ddocumentation=true"))) ;the default is 
'false'...
      (inputs `(("ao" ,ao)
                ("alsa-lib" ,alsa-lib)
                ("avahi" ,avahi)



reply via email to

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