about summary refs log tree commit diff
diff options
context:
space:
mode:
-rw-r--r--pkgs/development/libraries/sqlite/3.6.23.1.nix (renamed from pkgs/development/libraries/sqlite/3.6.x.nix)0
-rw-r--r--pkgs/development/libraries/sqlite/3.7.14.1.nix24
-rw-r--r--pkgs/development/libraries/sqlite/3.7.16.1.nix (renamed from pkgs/development/libraries/sqlite/default.nix)0
-rw-r--r--pkgs/development/libraries/sqlite/3.7.9-full.nix (renamed from pkgs/development/libraries/sqlite/full.nix)0
-rw-r--r--pkgs/top-level/all-packages.nix12
5 files changed, 31 insertions, 5 deletions
diff --git a/pkgs/development/libraries/sqlite/3.6.x.nix b/pkgs/development/libraries/sqlite/3.6.23.1.nix
index 6a1c02dede1a..6a1c02dede1a 100644
--- a/pkgs/development/libraries/sqlite/3.6.x.nix
+++ b/pkgs/development/libraries/sqlite/3.6.23.1.nix
diff --git a/pkgs/development/libraries/sqlite/3.7.14.1.nix b/pkgs/development/libraries/sqlite/3.7.14.1.nix
new file mode 100644
index 000000000000..be3a24c1e4ce
--- /dev/null
+++ b/pkgs/development/libraries/sqlite/3.7.14.1.nix
@@ -0,0 +1,24 @@
+{ stdenv, fetchurl, readline ? null, ncurses ? null }:
+
+assert readline != null -> ncurses != null;
+
+stdenv.mkDerivation {
+  name = "sqlite-3.7.14.1";
+
+  src = fetchurl {
+    url = http://www.sqlite.org/sqlite-autoconf-3071401.tar.gz;
+    sha1 = "c464e0e3efe98227c6546b9b1e786b51b8b642fc";
+  };
+
+  buildInputs = [ readline ncurses ];
+
+  configureFlags = "--enable-threadsafe";
+
+  CFLAGS = "-DSQLITE_ENABLE_COLUMN_METADATA=1 -DSQLITE_SECURE_DELETE=1 -DSQLITE_ENABLE_UNLOCK_NOTIFY=1";
+  LDFLAGS = if readline != null then "-lncurses" else "";
+
+  meta = {
+    homepage = http://www.sqlite.org/;
+    description = "A self-contained, serverless, zero-configuration, transactional SQL database engine";
+  };
+}
diff --git a/pkgs/development/libraries/sqlite/default.nix b/pkgs/development/libraries/sqlite/3.7.16.1.nix
index 08d0396a53d9..08d0396a53d9 100644
--- a/pkgs/development/libraries/sqlite/default.nix
+++ b/pkgs/development/libraries/sqlite/3.7.16.1.nix
diff --git a/pkgs/development/libraries/sqlite/full.nix b/pkgs/development/libraries/sqlite/3.7.9-full.nix
index c6ef448ea122..c6ef448ea122 100644
--- a/pkgs/development/libraries/sqlite/full.nix
+++ b/pkgs/development/libraries/sqlite/3.7.9-full.nix
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index ba4959b78ff7..8856e99fc8ab 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3054,7 +3054,7 @@ let
   autoconf = callPackage ../development/tools/misc/autoconf { };
 
   autoconf213 = callPackage ../development/tools/misc/autoconf/2.13.nix { };
- 
+
   autocutsel = callPackage ../tools/X11/autocutsel{ };
 
   automake = automake112x;
@@ -4998,21 +4998,23 @@ let
 
   srtp = callPackage ../development/libraries/srtp {};
 
-  sqlite = lowPrio (callPackage ../development/libraries/sqlite {
+  sqlite_3_7_16_1 = lowPrio (callPackage ../development/libraries/sqlite/3.7.16.1.nix {
     readline = null;
     ncurses = null;
   });
 
-  sqlite36 = callPackage ../development/libraries/sqlite/3.6.x.nix {
+  sqlite_3_7_14_1 = lowPrio (callPackage ../development/libraries/sqlite/3.7.14.1.nix {
     readline = null;
     ncurses = null;
-  };
+  });
+
+  sqlite = sqlite_3_7_16_1;
 
   sqliteInteractive = appendToName "interactive" (sqlite.override {
     inherit readline ncurses;
   });
 
-  sqliteFull = lowPrio (callPackage ../development/libraries/sqlite/full.nix {
+  sqliteFull = lowPrio (callPackage ../development/libraries/sqlite/3.7.9-full.nix {
     inherit readline ncurses;
   });