Merge staging into closure-size

The most complex problems were from dealing with switches reverted in
the meantime (gcc5, gmp6, ncurses6).
It's likely that darwin is (still) broken nontrivially.
This commit is contained in:
Vladimír Čunát
2015-11-20 14:32:58 +01:00
1278 changed files with 105731 additions and 30012 deletions

View File

@@ -3,11 +3,11 @@
assert interactive -> readline != null && ncurses != null;
stdenv.mkDerivation {
name = "sqlite-3.8.11.1";
name = "sqlite-3.9.2";
src = fetchurl {
url = "http://sqlite.org/2015/sqlite-autoconf-3081101.tar.gz";
sha1 = "d0e22d7e361b6f50830a3cdeafe35311443f8f9a";
url = "http://sqlite.org/2015/sqlite-autoconf-3090200.tar.gz";
sha1 = "dae1ae5297fece9671ae0c434a7ecd0cda09c76a";
};
outputs = [ "dev" "out" "bin" ];
@@ -19,6 +19,7 @@ stdenv.mkDerivation {
NIX_CFLAGS_COMPILE = [
"-DSQLITE_ENABLE_COLUMN_METADATA"
"-DSQLITE_ENABLE_DBSTAT_VTAB"
"-DSQLITE_ENABLE_JSON1"
"-DSQLITE_ENABLE_FTS3"
"-DSQLITE_ENABLE_FTS3_PARENTHESIS"
"-DSQLITE_ENABLE_FTS4"