BoomMicrophone/nixpkgs-suyu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

sqlite: clean up

Browse source 
- Add version 3.7.14.1 again, so that we can work around issues caused
   by the recent 3.7.16.1 update.

 - Drop obsolete version 3.6.x.

 - Consistently use the sqlite version number to name the file of the
   expression.
This commit is contained in:
Peter Simons 2013-04-26 22:46:45 +02:00
parent 00101b66fe
commit 319ac481b8
5 changed files with 31 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

0
pkgs/development/libraries/sqlite/3.6.x.nix → pkgs/development/libraries/sqlite/3.6.23.1.nix
View file

24
pkgs/development/libraries/sqlite/3.7.14.1.nix Normal file
View file

@ -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";
};
}

0
pkgs/development/libraries/sqlite/default.nix → pkgs/development/libraries/sqlite/3.7.16.1.nix
View file

0
pkgs/development/libraries/sqlite/full.nix → pkgs/development/libraries/sqlite/3.7.9-full.nix
View file

12
pkgs/top-level/all-packages.nix
View file

@ -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;
});