public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

sqlite: Update to 3.8.7

Browse Source
This commit is contained in:
Eelco Dolstra 2014-10-24 11:38:52 +02:00
parent 9e1ab43459
commit b4db4db322
2 changed files with 8 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
pkgs/development/libraries/sqlite/default.nix
View File

@ -1,21 +1,20 @@
{ stdenv, fetchurl, readline ? null, ncurses ? null }: { lib, stdenv, fetchurl, interactive ? false, readline ? null, ncurses ? null }:
assert readline != null -> ncurses != null; assert interactive -> readline != null && ncurses != null;
stdenv.mkDerivation { stdenv.mkDerivation {
name = "sqlite-3.8.6"; name = "sqlite-3.8.7";
src = fetchurl { src = fetchurl {
url = "http://www.sqlite.org/2014/sqlite-autoconf-3080600.tar.gz"; url = "http://www.sqlite.org/2014/sqlite-autoconf-3080700.tar.gz";
sha1 = "c4b2911bc4a6e1dc2b411aa21d8c4f524113eb64"; sha1 = "8b773b006db46f3ffcbabe065e927823d13bf5c0";
}; };
buildInputs = [ readline ncurses ]; buildInputs = lib.optionals interactive [ readline ncurses ];
configureFlags = "--enable-threadsafe"; configureFlags = "--enable-threadsafe";
CFLAGS = "-DSQLITE_ENABLE_COLUMN_METADATA=1 -DSQLITE_SECURE_DELETE=1 -DSQLITE_ENABLE_UNLOCK_NOTIFY=1"; CFLAGS = "-DSQLITE_ENABLE_COLUMN_METADATA=1 -DSQLITE_SECURE_DELETE=1 -DSQLITE_ENABLE_UNLOCK_NOTIFY=1";
LDFLAGS = if readline != null then "-lncurses" else "";
meta = { meta = {
homepage = http://www.sqlite.org/; homepage = http://www.sqlite.org/;

9
pkgs/top-level/all-packages.nix
View File

@ -6674,14 +6674,9 @@ let
srtp_linphone = callPackage ../development/libraries/srtp/linphone.nix { }; srtp_linphone = callPackage ../development/libraries/srtp/linphone.nix { };
sqlite = lowPrio (callPackage ../development/libraries/sqlite { sqlite = lowPrio (callPackage ../development/libraries/sqlite { });
readline = null;
ncurses = null;
});
sqliteInteractive = appendToName "interactive" (sqlite.override { sqliteInteractive = appendToName "interactive" (sqlite.override { interactive = true; });
inherit readline ncurses;
});
sqlcipher = lowPrio (callPackage ../development/libraries/sqlcipher { sqlcipher = lowPrio (callPackage ../development/libraries/sqlcipher {
readline = null; readline = null;