From e3a47a07edb585f09390450c5142643277357524 Mon Sep 17 00:00:00 2001
From: Martin Bravenboer <martin.bravenboer@logicblox.com>
Date: Tue, 24 May 2005 14:57:41 +0000
Subject: [PATCH] Upgrades of postgresql, jetty, and ant to the latest
 versions.

svn path=/nixpkgs/trunk/; revision=3122
---
 .../tools/build-managers/apache-ant/core-apache-ant.nix  | 8 ++++----
 pkgs/servers/http/jetty/bin-builder.sh                   | 2 +-
 pkgs/servers/http/jetty/default.nix                      | 9 +++++----
 pkgs/servers/sql/postgresql/default.nix                  | 6 +++---
 pkgs/system/all-packages-generic.nix                     | 2 +-
 5 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/pkgs/development/tools/build-managers/apache-ant/core-apache-ant.nix b/pkgs/development/tools/build-managers/apache-ant/core-apache-ant.nix
index 1fd0810ede4a..125e987c1253 100644
--- a/pkgs/development/tools/build-managers/apache-ant/core-apache-ant.nix
+++ b/pkgs/development/tools/build-managers/apache-ant/core-apache-ant.nix
@@ -1,12 +1,12 @@
 {stdenv, fetchurl}:
 
 stdenv.mkDerivation {
-  name = "core-apache-ant-1.6.2";
-  realname = "apache-ant-1.6.2";
+  name = "core-apache-ant-1.6.4";
+  realname = "apache-ant-1.6.4";
 
   builder = ./core-builder.sh;
   src = fetchurl {
-    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/apache-ant-1.6.2-bin.tar.bz2;
-    md5 = "a568c7271c3f168771c0313926d060fa";
+    url = http://apache.surfnet.nl/ant/binaries/apache-ant-1.6.4-bin.tar.bz2;
+    md5 = "2dd6f927cfe3cbac0970816396b7ad4e";
   };
 }
diff --git a/pkgs/servers/http/jetty/bin-builder.sh b/pkgs/servers/http/jetty/bin-builder.sh
index 42cb9cdd86be..bfd8f95b5404 100644
--- a/pkgs/servers/http/jetty/bin-builder.sh
+++ b/pkgs/servers/http/jetty/bin-builder.sh
@@ -2,6 +2,6 @@ set -e
 
 . $stdenv/setup
 
-tar zxf $src
+unzip $src
 mkdir $out
 mv jetty*/* $out
diff --git a/pkgs/servers/http/jetty/default.nix b/pkgs/servers/http/jetty/default.nix
index b561b56b351c..62bb5da51773 100644
--- a/pkgs/servers/http/jetty/default.nix
+++ b/pkgs/servers/http/jetty/default.nix
@@ -1,12 +1,13 @@
-{stdenv, fetchurl}:
+{stdenv, fetchurl, unzip}:
 
 stdenv.mkDerivation {
-  name = "jetty-4.2.22";
+  name = "jetty-5.1.3";
 
   builder = ./bin-builder.sh;
+  buildInputs = [unzip];
 
   src = fetchurl {
-    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/jetty-4.2.22.tar.gz;
-    md5 = "e89c582d1846cd7d31e402abaf801e17";
+    url = http://puzzle.dl.sourceforge.net/sourceforge/jetty/jetty-5.1.3.zip;
+    md5 = "24d1d3163795a7e2390c9e711c919180";
   };
 }
diff --git a/pkgs/servers/sql/postgresql/default.nix b/pkgs/servers/sql/postgresql/default.nix
index e587ca7a9579..acb0b1d41a36 100644
--- a/pkgs/servers/sql/postgresql/default.nix
+++ b/pkgs/servers/sql/postgresql/default.nix
@@ -6,12 +6,12 @@ assert readline != null;
 assert jdbcSupport -> ant != null;
 
 stdenv.mkDerivation {
-  name = "postgresql-7.4.5";
+  name = "postgresql-8.0.3";
   builder = ./builder.sh;
 
   src = fetchurl {
-    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/postgresql-7.4.5.tar.bz2;
-    md5 = "97e750c8e69c208b75b6efedc5a36efb";
+    url = ftp://ftp2.nl.postgresql.org/mirror/postgresql/source/v8.0.3/postgresql-8.0.3.tar.bz2;
+    md5 = "c0914a133ce6c1e0f1d8b93982d6e881";
   };
 
   inherit readline jdbcSupport;
diff --git a/pkgs/system/all-packages-generic.nix b/pkgs/system/all-packages-generic.nix
index 43e36fe16dd1..599b4b26edba 100644
--- a/pkgs/system/all-packages-generic.nix
+++ b/pkgs/system/all-packages-generic.nix
@@ -968,7 +968,7 @@ rec {
   };
 
   jetty = (import ../servers/http/jetty) {
-    inherit fetchurl stdenv;
+    inherit fetchurl stdenv unzip;
   };