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

The postgresql distribution no longer contains the JDBC driver

Browse Source 
svn path=/nixpkgs/trunk/; revision=3123
This commit is contained in:
Martin Bravenboer 2005-05-24 15:09:04 +00:00
parent e3a47a07ed
commit c76a931faa
3 changed files with 7 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pkgs/servers/sql/postgresql/builder.sh
View File

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

10
pkgs/servers/sql/postgresql/default.nix
View File

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

2
pkgs/system/all-packages-generic.nix
View File

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