Merge branch 'master' into core-updates

This commit is contained in:
Marius Bakke 2018-11-05 23:56:22 +01:00
commit f4a5faa9dc
No known key found for this signature in database
GPG key ID: A2A06DF2A33A54FA
116 changed files with 72776 additions and 3938 deletions

View file

@ -503,10 +503,9 @@ applications.")
#t))
(replace 'build
(lambda _
(zero? (apply system*
`("scons"
(apply invoke `("scons"
,@common-options
"mongod" "mongo" "mongos")))))
"mongod" "mongo" "mongos"))))
(replace 'check
(lambda* (#:key tests? inputs #:allow-other-keys)
(setenv "TZDIR"
@ -1227,6 +1226,18 @@ is in the public domain.")
((#:configure-flags flags)
`(cons "--enable-fts5" ,flags))))))
;; This is used by Qt.
(define-public sqlite-with-column-metadata
(package (inherit sqlite)
(name "sqlite-with-column-metadata")
(arguments
(substitute-keyword-arguments (package-arguments sqlite)
((#:configure-flags flags)
`(list (string-append "CFLAGS=-O2 -DSQLITE_SECURE_DELETE "
"-DSQLITE_ENABLE_UNLOCK_NOTIFY "
"-DSQLITE_ENABLE_DBSTAT_VTAB "
"-DSQLITE_ENABLE_COLUMN_METADATA")))))))
(define-public tdb
(package
(name "tdb")