From f99d7d50b03ff833c4edde70d46e05aaaa2d20ff Mon Sep 17 00:00:00 2001
From: Martin Bravenboer <martin.bravenboer@logicblox.com>
Date: Tue, 24 May 2005 15:32:57 +0000
Subject: [PATCH] Separate package for postgresql-jdbc driver

svn path=/nixpkgs/trunk/; revision=3124
---
 pkgs/servers/sql/postgresql/jdbc/builder.sh  | 10 ++++++++++
 pkgs/servers/sql/postgresql/jdbc/default.nix | 13 +++++++++++++
 pkgs/system/all-packages-generic.nix         |  5 +++++
 pkgs/system/populate-cache.nix               |  1 +
 4 files changed, 29 insertions(+)
 create mode 100755 pkgs/servers/sql/postgresql/jdbc/builder.sh
 create mode 100644 pkgs/servers/sql/postgresql/jdbc/default.nix

diff --git a/pkgs/servers/sql/postgresql/jdbc/builder.sh b/pkgs/servers/sql/postgresql/jdbc/builder.sh
new file mode 100755
index 00000000000..61afeab6646
--- /dev/null
+++ b/pkgs/servers/sql/postgresql/jdbc/builder.sh
@@ -0,0 +1,10 @@
+. $stdenv/setup
+
+set -e
+
+tar zxvf $src
+cd postgresql-jdbc-*
+ant
+
+ensureDir $out/share/java
+cp jars/*.jar $out/share/java
diff --git a/pkgs/servers/sql/postgresql/jdbc/default.nix b/pkgs/servers/sql/postgresql/jdbc/default.nix
new file mode 100644
index 00000000000..39c3e654759
--- /dev/null
+++ b/pkgs/servers/sql/postgresql/jdbc/default.nix
@@ -0,0 +1,13 @@
+{stdenv, fetchurl, ant}:
+
+stdenv.mkDerivation {
+  name = "postgresql-jdbc-8.0";
+  builder = ./builder.sh;
+
+  src = fetchurl {
+    url = http://jdbc.postgresql.org/download/postgresql-jdbc-8.0-311.src.tar.gz;
+    md5 = "e31b6e68141883e5c89a3a9b0fb95c02";
+  };
+
+  buildInputs = [ant];
+}
diff --git a/pkgs/system/all-packages-generic.nix b/pkgs/system/all-packages-generic.nix
index f02fdc23728..7e2d4834a47 100644
--- a/pkgs/system/all-packages-generic.nix
+++ b/pkgs/system/all-packages-generic.nix
@@ -960,6 +960,11 @@ rec {
     inherit fetchurl stdenv readline ncurses zlib;
   };
 
+  postgresql_jdbc = (import ../servers/sql/postgresql/jdbc) {
+    inherit fetchurl stdenv;
+    ant = apacheAntBlackdown14;
+  };
+
   mysql = import ../servers/sql/mysql {
     inherit fetchurl stdenv ncurses zlib perl;
     ps = procps; /* !!! Linux only */
diff --git a/pkgs/system/populate-cache.nix b/pkgs/system/populate-cache.nix
index 2f8bb2c2086..119ae2c8f00 100644
--- a/pkgs/system/populate-cache.nix
+++ b/pkgs/system/populate-cache.nix
@@ -88,6 +88,7 @@ let {
 
     mysql
     postgresql
+    postgresql_jdbc
     jetty
     blackdown
     apacheAntBlackdown14