The postgresql distribution no longer contains the JDBC driver

svn path=/nixpkgs/trunk/; revision=3123

pkgs/servers/sql/postgresql/builder.sh

@@ -2,9 +2,9 @@
 
 export LANG=en_US
 
-configureFlags=""
-if test "$jdbcSupport"; then
-    configureFlags="--with-java $configureFlags"
-fi
+# configureFlags=""
+# if test "$jdbcSupport"; then
+#     configureFlags="--with-java $configureFlags"
+# fi
 
 genericBuild

pkgs/servers/sql/postgresql/default.nix

@@ -1,9 +1,8 @@
-{stdenv, fetchurl, zlib, ncurses, readline, jdbcSupport ? true, ant ? null}:
+{stdenv, fetchurl, zlib, ncurses, readline}:
 
 assert zlib != null;
 assert ncurses != null;
 assert readline != null;
-assert jdbcSupport -> ant != null;
 
 stdenv.mkDerivation {
   name = "postgresql-8.0.3";
@@ -14,9 +13,6 @@ stdenv.mkDerivation {
     md5 = "c0914a133ce6c1e0f1d8b93982d6e881";
   };
 
-  inherit readline jdbcSupport;
-  ant = if jdbcSupport then ant else null;
-
-  buildInputs =
-      [zlib ncurses readline (if jdbcSupport then [ant] else [])];
+  inherit readline;
+  buildInputs = [zlib ncurses readline];
 }

pkgs/system/all-packages-generic.nix

@@ -958,8 +958,6 @@ rec {
 
   postgresql = (import ../servers/sql/postgresql) {
     inherit fetchurl stdenv readline ncurses zlib;
-    jdbcSupport = true;
-    ant = apacheAntBlackdown14;
   };
 
   mysql = import ../servers/sql/mysql {