Merge branch 'master' into core-updates

This commit is contained in:
Marius Bakke 2019-02-09 21:11:00 +01:00
commit ebbb7286b9
No known key found for this signature in database
GPG key ID: A2A06DF2A33A54FA
139 changed files with 5304 additions and 2499 deletions

View file

@ -82,15 +82,6 @@ widely deployed SQL database engine in the world. The source code for SQLite
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))))))
;; This is used by Qt.
(define-public sqlite-with-column-metadata
(package/inherit sqlite