From 12ede4793f3af87d49a00213d5d64c08b42b78ef Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 21 Jun 2010 20:43:05 +0000
Subject: [PATCH] * Add ftp-archives.postgresql.org as a fallback for
 PostgreSQL   downloads. * PostgreSQL updated to 8.3.11, 8.4.4.

svn path=/nixpkgs/trunk/; revision=22365
---
 pkgs/build-support/fetchurl/mirrors.nix | 1 +
 pkgs/servers/sql/postgresql/8.3.x.nix   | 6 +++---
 pkgs/servers/sql/postgresql/8.4.x.nix   | 6 +++---
 3 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/pkgs/build-support/fetchurl/mirrors.nix b/pkgs/build-support/fetchurl/mirrors.nix
index 7a8385a9e14..cd53f0d0d55 100644
--- a/pkgs/build-support/fetchurl/mirrors.nix
+++ b/pkgs/build-support/fetchurl/mirrors.nix
@@ -244,6 +244,7 @@ rec {
     http://ftp2.nl.postgresql.org/
     ftp://ftp.nl.postgresql.org/pub/mirror/postgresql/
     ftp://ftp.postgresql.org/pub/
+    ftp://ftp-archives.postgresql.org/pub/
   ];
 
 }
diff --git a/pkgs/servers/sql/postgresql/8.3.x.nix b/pkgs/servers/sql/postgresql/8.3.x.nix
index d6ec490a31c..973df7b5d58 100644
--- a/pkgs/servers/sql/postgresql/8.3.x.nix
+++ b/pkgs/servers/sql/postgresql/8.3.x.nix
@@ -1,16 +1,16 @@
 { stdenv, fetchurl, zlib, ncurses, readline }:
 
-let version = "8.3.9"; in
+let version = "8.3.11"; in
 
 stdenv.mkDerivation rec {
   name = "postgresql-${version}";
   
   src = fetchurl {
     url = "mirror://postgresql/source/v${version}/${name}.tar.bz2";
-    sha256 = "08z6p3hha0v5841kzz5mhz1gsyvriijssx5p8bah8cvw4i00xcaw";
+    sha256 = "1nvjcsa0218849r2913mxia58cjgcw6rikkf1g7kmjb902lv3aw1";
   };
 
-  buildInputs = [zlib ncurses readline];
+  buildInputs = [ zlib ncurses readline ];
 
   LC_ALL = "en_US";
 
diff --git a/pkgs/servers/sql/postgresql/8.4.x.nix b/pkgs/servers/sql/postgresql/8.4.x.nix
index 0d40e4708d2..aaade4d1b56 100644
--- a/pkgs/servers/sql/postgresql/8.4.x.nix
+++ b/pkgs/servers/sql/postgresql/8.4.x.nix
@@ -1,16 +1,16 @@
 { stdenv, fetchurl, zlib, ncurses, readline }:
 
-let version = "8.4.2"; in
+let version = "8.4.4"; in
 
 stdenv.mkDerivation rec {
   name = "postgresql-${version}";
   
   src = fetchurl {
     url = "mirror://postgresql/source/v${version}/${name}.tar.bz2";
-    sha256 = "1wk9k1nsz304c8mxrx4iix1ss38fpp13by46x5v5s6cn0g4wbcxd";
+    sha256 = "0zp35f0q84id3jz2nlwgp2qxplywh4lfg2p5i9nv2zszas6kjsz6";
   };
 
-  buildInputs = [zlib ncurses readline];
+  buildInputs = [ zlib ncurses readline ];
 
   LC_ALL = "C";