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: guix-commits
Subject: 01/01: Merge branch 'master' into staging
Date: Fri, 25 Jan 2019 09:20:49 -0500 (EST)

rekado pushed a commit to branch staging
in repository guix.

commit 02d38bd3a2c964698ef08524d6313b726ce63846
Merge: 2b96548 7762484
Author: Ricardo Wurmus <address@hidden>
Date:   Fri Jan 25 15:20:25 2019 +0100

    Merge branch 'master' into staging

 doc/guix.texi                                      |  67 +++++--
 gnu/local.mk                                       |   4 +-
 gnu/packages/admin.scm                             |   5 +-
 gnu/packages/algebra.scm                           |  71 +++----
 gnu/packages/android.scm                           |   2 +-
 gnu/packages/anthy.scm                             |   2 +-
 gnu/packages/antivirus.scm                         |   4 +-
 gnu/packages/aux-files/linux-libre/4.19-arm64.conf |   2 +-
 gnu/packages/aux-files/linux-libre/4.20-arm64.conf |   2 +-
 gnu/packages/axoloti.scm                           |  28 +--
 gnu/packages/benchmark.scm                         |   7 +-
 gnu/packages/cdrom.scm                             |  23 +--
 gnu/packages/code.scm                              |   5 +-
 gnu/packages/connman.scm                           |   7 +-
 gnu/packages/coq.scm                               |  66 +++----
 gnu/packages/crypto.scm                            |  15 +-
 gnu/packages/display-managers.scm                  |   2 +-
 gnu/packages/emacs-xyz.scm                         |  64 ++++++-
 gnu/packages/emacs.scm                             |  17 ++
 gnu/packages/embedded.scm                          |   8 +-
 gnu/packages/engineering.scm                       |   8 +-
 gnu/packages/entr.scm                              |  39 ++--
 gnu/packages/freedesktop.scm                       |   6 +-
 gnu/packages/ftp.scm                               |   6 +-
 gnu/packages/games.scm                             |   4 +-
 gnu/packages/gnucash.scm                           | 185 ++++++++++--------
 gnu/packages/gnupg.scm                             |  21 ++-
 gnu/packages/graphics.scm                          |   7 +-
 gnu/packages/guile.scm                             |  75 ++++----
 gnu/packages/haskell.scm                           |  90 +++++++++
 gnu/packages/image-viewers.scm                     |  52 ++----
 gnu/packages/linux.scm                             |  34 ++--
 gnu/packages/lirc.scm                              |  33 ++--
 gnu/packages/lisp.scm                              |   7 +-
 gnu/packages/messaging.scm                         |  62 +++---
 gnu/packages/multiprecision.scm                    |  10 +-
 gnu/packages/music.scm                             |   4 +-
 gnu/packages/ocaml.scm                             | 128 ++++++++-----
 gnu/packages/openstack.scm                         |   6 +-
 gnu/packages/password-utils.scm                    |  17 +-
 .../patches/gnucash-disable-failing-tests.patch    |  39 ----
 .../patches/gnucash-price-quotes-perl.patch        |  24 ---
 gnu/packages/python-check.scm                      |  58 ++++++
 gnu/packages/python-crypto.scm                     |  24 +--
 gnu/packages/python-xyz.scm                        | 187 ++++++++++--------
 gnu/packages/qt.scm                                |  12 +-
 gnu/packages/rdf.scm                               |  16 +-
 gnu/packages/regex.scm                             |   6 +-
 gnu/packages/samba.scm                             |  28 ++-
 gnu/packages/synergy.scm                           |  95 ++++------
 gnu/packages/tex.scm                               | 208 +++++++++++++++++----
 gnu/packages/textutils.scm                         |   4 +-
 gnu/packages/tls.scm                               |   6 +-
 gnu/packages/uucp.scm                              |   8 +-
 gnu/packages/vulkan.scm                            |   2 +-
 gnu/packages/wicd.scm                              |   2 +-
 gnu/packages/wine.scm                              |  88 ++++++++-
 gnu/packages/wm.scm                                |   2 +-
 gnu/packages/xfce.scm                              |   4 +-
 gnu/system/examples/bare-bones.tmpl                |  10 +-
 gnu/system/examples/beaglebone-black.tmpl          |  24 +--
 gnu/system/examples/desktop.tmpl                   |  32 ++--
 gnu/system/examples/lightweight-desktop.tmpl       |  16 +-
 gnu/system/examples/vm-image.tmpl                  |  12 +-
 guix/licenses.scm                                  |   9 +-
 guix/packages.scm                                  |  25 ++-
 guix/records.scm                                   |  54 +++---
 guix/scripts/refresh.scm                           |   6 +-
 guix/scripts/weather.scm                           | 174 ++++++++++++++++-
 guix/store/deduplication.scm                       |  11 +-
 guix/tests.scm                                     |  19 +-
 guix/ui.scm                                        |   2 +-
 tests/packages.scm                                 |  23 +++
 tests/services.scm                                 |   4 +-
 74 files changed, 1546 insertions(+), 883 deletions(-)

diff --cc gnu/local.mk
index 99603b3,7500571..f339f32
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@@ -829,9 -832,9 +830,8 @@@ dist_patch_DATA =                                  
        
    %D%/packages/patches/gmp-faulty-test.patch                  \
    %D%/packages/patches/gnome-todo-libical-compat.patch                \
    %D%/packages/patches/gnome-tweak-tool-search-paths.patch    \
-   %D%/packages/patches/gnucash-price-quotes-perl.patch                \
-   %D%/packages/patches/gnucash-disable-failing-tests.patch    \
+   %D%/packages/patches/gnucash-fix-test-transaction-failure.patch \
    %D%/packages/patches/gnutls-skip-trust-store-test.patch     \
 -  %D%/packages/patches/gnutls-skip-pkgconfig-test.patch               \
    %D%/packages/patches/gobject-introspection-absolute-shlib-path.patch \
    %D%/packages/patches/gobject-introspection-cc.patch         \
    %D%/packages/patches/gobject-introspection-girepository.patch       \



reply via email to

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