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: guix-commits
Subject: 01/01: Merge branch 'master' into core-updates
Date: Sat, 9 Feb 2019 15:17:46 -0500 (EST)

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

commit ebbb7286b91e21cb26153e3d0a3ea8017cf16224
Merge: d41f639 aefa291
Author: Marius Bakke <address@hidden>
Date:   Sat Feb 9 21:11:00 2019 +0100

    Merge branch 'master' into core-updates

 Makefile.am                                        |    2 +-
 doc/guix.texi                                      |   44 +-
 gnu/local.mk                                       |   40 +-
 gnu/packages/abiword.scm                           |    5 +-
 gnu/packages/accessibility.scm                     |    2 +-
 gnu/packages/admin.scm                             |  193 ++--
 gnu/packages/audio.scm                             |    2 +-
 gnu/packages/avr.scm                               |   23 +-
 gnu/packages/base.scm                              |   38 +-
 gnu/packages/bioinformatics.scm                    |   17 +-
 gnu/packages/boost.scm                             |   26 +-
 gnu/packages/build-tools.scm                       |    4 +-
 gnu/packages/cdrom.scm                             |   14 +-
 gnu/packages/certs.scm                             |    4 +-
 gnu/packages/check.scm                             |    2 +-
 gnu/packages/chemistry.scm                         |   27 +-
 gnu/packages/cmake.scm                             |    4 +-
 gnu/packages/compression.scm                       |   12 +-
 gnu/packages/compton.scm                           |   22 +-
 gnu/packages/coq.scm                               |   48 +
 gnu/packages/cups.scm                              |    8 +-
 gnu/packages/curl.scm                              |   18 +-
 gnu/packages/cyrus-sasl.scm                        |    9 +-
 gnu/packages/databases.scm                         |   13 +-
 gnu/packages/ebook.scm                             |   23 +-
 gnu/packages/emacs-xyz.scm                         |  158 +--
 gnu/packages/engineering.scm                       |   22 +
 gnu/packages/enlightenment.scm                     |    1 +
 gnu/packages/finance.scm                           |   52 +-
 gnu/packages/freedesktop.scm                       |    8 +-
 gnu/packages/game-development.scm                  |    6 +-
 gnu/packages/games.scm                             |   24 +-
 gnu/packages/geo.scm                               |    3 +-
 gnu/packages/ghostscript.scm                       |    8 +-
 gnu/packages/gl.scm                                |   31 +-
 gnu/packages/glib.scm                              |   27 +-
 gnu/packages/gnome.scm                             |   58 +-
 gnu/packages/gnuzilla.scm                          |   10 +-
 gnu/packages/gstreamer.scm                         |   32 +-
 gnu/packages/gtk.scm                               |   48 +-
 gnu/packages/guile-xyz.scm                         |   43 +-
 gnu/packages/icu4c.scm                             |    4 +-
 gnu/packages/image.scm                             |   12 +-
 gnu/packages/imagemagick.scm                       |    4 +-
 gnu/packages/libevent.scm                          |    4 +-
 gnu/packages/libreoffice.scm                       |   45 +-
 gnu/packages/libusb.scm                            |   53 +-
 gnu/packages/linux.scm                             |   82 +-
 gnu/packages/mail.scm                              |   21 +-
 gnu/packages/maths.scm                             |  512 +++++++++-
 gnu/packages/mpd.scm                               |    2 +-
 gnu/packages/mpi.scm                               |   38 +-
 gnu/packages/music.scm                             |   10 +-
 gnu/packages/nettle.scm                            |    4 +-
 gnu/packages/ocaml.scm                             | 1077 ++++++++++++++++++--
 gnu/packages/openldap.scm                          |   10 +-
 gnu/packages/package-management.scm                |   26 +-
 ...r.patch => allegro-mesa-18.2.5-and-later.patch} |    0
 ....patch => allegro4-mesa-18.2.5-and-later.patch} |   14 +-
 gnu/packages/patches/cairo-CVE-2016-9082.patch     |  122 ---
 gnu/packages/patches/cairo-setjmp-wrapper.patch    |   78 --
 .../cool-retro-term-dont-check-uninit-member.patch |   33 -
 .../patches/cool-retro-term-fix-array-size.patch   |   25 -
 .../patches/cool-retro-term-memory-leak-1.patch    |   32 -
 .../patches/cyrus-sasl-CVE-2013-4122.patch         |  130 ---
 gnu/packages/patches/efl-mesa-compat.patch         |   21 +
 gnu/packages/patches/fbreader-curl-7.62.patch      |   30 +
 .../patches/ghostscript-CVE-2018-16509.patch       |  193 ----
 gnu/packages/patches/ghostscript-bug-699708.patch  |  160 ---
 .../patches/glib-networking-connection.patch       |   51 +
 .../patches/glib-networking-ssl-cert-file.patch    |   29 -
 .../patches/gnutls-skip-pkgconfig-test.patch       |   24 -
 .../patches/gst-plugins-good-libvpx-compat.patch   |   58 ++
 .../patches/hdf5-1.8-mpi-deprecations.patch        |  169 +++
 gnu/packages/patches/hdf5-mpi-deprecations.patch   |   61 ++
 .../patches/inkscape-poppler-compat3.patch         |  499 +++++++++
 .../patches/json-glib-fix-tests-32bit.patch        |  174 ----
 gnu/packages/patches/libreoffice-boost.patch       |   17 +
 gnu/packages/patches/libtiff-CVE-2017-18013.patch  |   45 -
 gnu/packages/patches/libtiff-CVE-2017-9935.patch   |  162 ---
 gnu/packages/patches/libtiff-CVE-2018-10963.patch  |   40 -
 gnu/packages/patches/libtiff-CVE-2018-8905.patch   |   61 --
 .../patches/musescore-fix-use_webengine.patch      |  165 +++
 gnu/packages/patches/pingus-boost-headers.patch    |  379 +++++++
 gnu/packages/patches/poppler-CVE-2018-19149.patch  |   80 --
 .../postgresql-disable-resolve_symlinks.patch      |   25 +
 gnu/packages/patches/pyqt-public-sip.patch         |   70 +-
 gnu/packages/patches/qt-5-renameat2.patch          |   35 -
 gnu/packages/patches/sssd-curl-compat.patch        |   18 +
 .../superlu-dist-fix-mpi-deprecations.patch        |   57 ++
 .../texlive-bin-luatex-poppler-compat.patch        |  318 ++++++
 .../texlive-bin-pdftex-poppler-compat.patch        |  188 ++++
 .../patches/texlive-bin-xetex-poppler-compat.patch |   31 +
 gnu/packages/patches/wesnoth-newer-boost.patch     |   46 +
 .../zathura-plugindir-environment-variable.patch   |   32 -
 gnu/packages/pdf.scm                               |   21 +-
 gnu/packages/perl-compression.scm                  |   14 +-
 gnu/packages/photo.scm                             |    6 +-
 gnu/packages/php.scm                               |    2 +
 gnu/packages/python-compression.scm                |   19 +-
 gnu/packages/python-xyz.scm                        |   15 +-
 gnu/packages/qt.scm                                |  182 ++--
 gnu/packages/rdesktop.scm                          |    4 +-
 gnu/packages/ruby.scm                              |   25 +-
 gnu/packages/scribus.scm                           |   54 +-
 gnu/packages/sdl.scm                               |    4 +-
 gnu/packages/spice.scm                             |   10 +-
 gnu/packages/sqlite.scm                            |    9 -
 gnu/packages/sssd.scm                              |    1 +
 gnu/packages/storage.scm                           |    2 +-
 gnu/packages/terminals.scm                         |   24 +-
 gnu/packages/tex.scm                               |   10 +-
 gnu/packages/time.scm                              |   41 +
 gnu/packages/tls.scm                               |   17 +-
 gnu/packages/tor.scm                               |   15 +-
 gnu/packages/uml.scm                               |   10 +-
 gnu/packages/video.scm                             |   32 +-
 gnu/packages/virtualization.scm                    |    4 +-
 gnu/packages/vulkan.scm                            |   42 +-
 gnu/packages/web.scm                               |   26 +-
 gnu/packages/webkit.scm                            |    4 +-
 gnu/packages/wm.scm                                |   15 +-
 gnu/packages/xdisorg.scm                           |   46 +-
 gnu/services/databases.scm                         |   63 +-
 guix/build/download.scm                            |   16 +-
 guix/gexp.scm                                      |   15 +-
 guix/git.scm                                       |  136 ++-
 guix/import/opam.scm                               |   46 +-
 guix/monads.scm                                    |   15 +-
 guix/profiles.scm                                  |   34 +-
 guix/scripts/build.scm                             |    3 +-
 guix/scripts/pull.scm                              |   26 +-
 guix/status.scm                                    |    8 +-
 guix/ui.scm                                        |    8 +
 nix/libstore/build.cc                              |    4 +
 tests/guix-package.sh                              |    7 +-
 tests/opam.scm                                     |    4 +-
 tests/profiles.scm                                 |   17 +-
 tests/store.scm                                    |   13 +
 139 files changed, 5270 insertions(+), 2506 deletions(-)

diff --cc gnu/packages/sqlite.scm
index d40fc11,05d7ce6..794c030
--- a/gnu/packages/sqlite.scm
+++ b/gnu/packages/sqlite.scm
@@@ -82,15 -83,26 +82,6 @@@ widely deployed SQL database engine in 
  is in the public domain.")
     (license license:public-domain)))
  
- ;; This is used by Tracker.
- (define-public sqlite-with-fts5
-   (package/inherit sqlite
-     (name "sqlite-with-fts5")
-     (arguments
-      (substitute-keyword-arguments (package-arguments sqlite)
-        ((#:configure-flags flags)
-         `(cons "--enable-fts5" ,flags))))))
 -(define-public sqlite-3.26.0
 -  (package (inherit sqlite)
 -    (version "3.26.0")
 -    (source (origin
 -              (method url-fetch)
 -              (uri (let ((numeric-version
 -                          (match (string-split version #\.)
 -                            ((first-digit other-digits ...)
 -                             (string-append first-digit
 -                                            (string-pad-right
 -                                             (string-concatenate
 -                                              (map (cut string-pad <> 2 #\0)
 -                                                   other-digits))
 -                                             6 #\0))))))
 -                     (string-append "https://sqlite.org/2018/sqlite-autoconf-";
 -                                    numeric-version ".tar.gz")))
 -              (sha256
 -               (base32
 -                "0pdzszb4sp73hl36siiv3p300jvfvbcdxi2rrmkwgs6inwznmajx"))))))
--
  ;; This is used by Qt.
  (define-public sqlite-with-column-metadata
    (package/inherit sqlite



reply via email to

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