Upgrades of postgresql, jetty, and ant to the latest versions.

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

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

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";
   };
 }

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;