From d3eb4afbdadaa417b3ae7e91402678287a3a7af1 Mon Sep 17 00:00:00 2001 From: Wout Mertens Date: Sun, 16 Oct 2016 22:51:33 +0200 Subject: [PATCH 1/2] sqlite3: Bump to 3.15.0 Tested on Darwin --- pkgs/development/libraries/sqlite/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/sqlite/default.nix b/pkgs/development/libraries/sqlite/default.nix index 38eb1a06284f..1eab55141bfd 100644 --- a/pkgs/development/libraries/sqlite/default.nix +++ b/pkgs/development/libraries/sqlite/default.nix @@ -3,11 +3,11 @@ assert interactive -> readline != null && ncurses != null; stdenv.mkDerivation { - name = "sqlite-3.14.1"; + name = "sqlite-3.15.0"; src = fetchurl { - url = "http://sqlite.org/2016/sqlite-autoconf-3140100.tar.gz"; - sha256 = "19j73j44akqgc6m82wm98yvnmm3mfzmfqr8mp3n7n080d53q4wdw"; + url = "http://sqlite.org/2016/sqlite-autoconf-3150000.tar.gz"; + sha256 = "09zdipkrvavlbw9dj4kwnii0z1b20rljn9fmfxz6scx0njljs5kp"; }; outputs = [ "bin" "dev" "out" ]; From b16c240ca7f9313e39d0634f9e20beb2848df2d8 Mon Sep 17 00:00:00 2001 From: Wout Mertens Date: Sun, 16 Oct 2016 23:17:55 +0200 Subject: [PATCH 2/2] sqlite: Enable FTS5 extension See https://www.sqlite.org/fts5.html --- pkgs/development/libraries/sqlite/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/development/libraries/sqlite/default.nix b/pkgs/development/libraries/sqlite/default.nix index 1eab55141bfd..c557de1f39f1 100644 --- a/pkgs/development/libraries/sqlite/default.nix +++ b/pkgs/development/libraries/sqlite/default.nix @@ -24,6 +24,7 @@ stdenv.mkDerivation { "-DSQLITE_ENABLE_FTS3_PARENTHESIS" "-DSQLITE_ENABLE_FTS3_TOKENIZER" "-DSQLITE_ENABLE_FTS4" + "-DSQLITE_ENABLE_FTS5" "-DSQLITE_ENABLE_RTREE" "-DSQLITE_ENABLE_STMT_SCANSTATUS" "-DSQLITE_ENABLE_UNLOCK_NOTIFY" @@ -46,6 +47,9 @@ stdenv.mkDerivation { export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -DUSE_PREAD64 -D_LARGEFILE64_SOURCE" fi + # Necessary for FTS5 on Linux + export NIX_LDFLAGS="$NIX_LDFLAGS -lm" + echo "" echo "NIX_CFLAGS_COMPILE = $NIX_CFLAGS_COMPILE" echo ""