Revert "postgresql: 9.2.10 -> 9.2.11"

This reverts commit 601e713bb84a9c4f27a38d7d4595b49301b98dcc.

5 files changed, 39 insertions, 20 deletions

diff --git a/pkgs/servers/sql/postgresql/8.4.x.nix b/pkgs/servers/sql/postgresql/8.4.x.nix
index f946f9fc1459..0254bbe951d6 100644
--- a/pkgs/servers/sql/postgresql/8.4.x.nix
+++ b/pkgs/servers/sql/postgresql/8.4.x.nix
@@ -8,6 +8,4 @@ callPackage ./generic.nix (args // rec {
     url = "mirror://postgresql/source/v${version}/postgresql-${version}.tar.bz2";
     sha256 = "09iqr9sldiq7jz1rdnywp2wv36lxy5m8kch3vpchd1s4fz75c7aw";
   };
-
-  patches = [ ./disable-resolve_symlinks.patch ];
 })
diff --git a/pkgs/servers/sql/postgresql/9.0.x.nix b/pkgs/servers/sql/postgresql/9.0.x.nix
index b2a53bfc4b1f..dba42e4fb110 100644
--- a/pkgs/servers/sql/postgresql/9.0.x.nix
+++ b/pkgs/servers/sql/postgresql/9.0.x.nix
@@ -8,6 +8,4 @@ callPackage ./generic.nix (args // rec {
     url = "mirror://postgresql/source/v${version}/postgresql-${version}.tar.bz2";
     sha256 = "0vxa90d1ghv6vg4c6kxvm2skypahvlq4sd968q7l9ff3dl145z02";
   };
-
-  patches = [ ./disable-resolve_symlinks.patch ];
 })
diff --git a/pkgs/servers/sql/postgresql/9.1.x.nix b/pkgs/servers/sql/postgresql/9.1.x.nix
index 1debe457e1fd..138bc4a30232 100644
--- a/pkgs/servers/sql/postgresql/9.1.x.nix
+++ b/pkgs/servers/sql/postgresql/9.1.x.nix
@@ -8,6 +8,4 @@ callPackage ./generic.nix (args // rec {
     url = "mirror://postgresql/source/v${version}/postgresql-${version}.tar.bz2";
     sha256 = "0mllj1r1648iwm0qj3cj9qxizhlyhqmz94iydnwhf48psvvy4r9b";
   };
-
-  patches = [ ./disable-resolve_symlinks.patch ];
 })
diff --git a/pkgs/servers/sql/postgresql/9.2.x.nix b/pkgs/servers/sql/postgresql/9.2.x.nix
index 477bb9d2484d..3c21a96e9b27 100644
--- a/pkgs/servers/sql/postgresql/9.2.x.nix
+++ b/pkgs/servers/sql/postgresql/9.2.x.nix
@@ -1,13 +1,40 @@
-{ callPackage, fetchurl, ... } @ args:
+{ stdenv, fetchurl, zlib, readline, openssl }:
 
-callPackage ./generic.nix (args // rec {
-  psqlSchema = "9.2";
-  version = "${psqlSchema}.11";
+let version = "9.2.10"; in
+
+stdenv.mkDerivation rec {
+  name = "postgresql-${version}";
 
   src = fetchurl {
-    url = "mirror://postgresql/source/v${version}/postgresql-${version}.tar.bz2";
-    sha256 = "1k5i73ninqyz76zzpi06ajj5qawf30zwr16x8wrgq6swzvsgbck5";
+    url = "mirror://postgresql/source/v${version}/${name}.tar.bz2";
+    sha256 = "1bbkinqzb3c8i0vfzcy2g7djrq0kxz63jgvzda9p0vylxazmnm1m";
   };
 
-  patches = [ ./disable-resolve_symlinks.patch ];
-})
+  buildInputs = [ zlib readline openssl ];
+
+  enableParallelBuilding = true;
+
+  makeFlags = [ "world" ];
+
+  configureFlags = [ "--with-openssl" ];
+
+  patches = [ ./disable-resolve_symlinks.patch ./less-is-more.patch ];
+
+  installTargets = [ "install-world" ];
+
+  LC_ALL = "C";
+
+  passthru = {
+    inherit readline;
+    psqlSchema = "9.2";
+  };
+
+  meta = with stdenv.lib; {
+    homepage = http://www.postgresql.org/;
+    description = "A powerful, open source object-relational database system";
+    license = licenses.postgresql;
+    maintainers = with maintaiers; [ ocharles ];
+    platforms = platforms.unix;
+    hydraPlatforms = platforms.linux;
+  };
+}
diff --git a/pkgs/servers/sql/postgresql/generic.nix b/pkgs/servers/sql/postgresql/generic.nix
index 40c5ff660ced..74c7b2906b4a 100644
--- a/pkgs/servers/sql/postgresql/generic.nix
+++ b/pkgs/servers/sql/postgresql/generic.nix
@@ -10,7 +10,7 @@
 , walBlockSizeKB ? 8, walSegmentSizeMB ? 16
 
 # Version specific arguments
-, psqlSchema , version, src, patches ? [ ]
+, version, src, psqlSchema
 , ...
 }:
 
@@ -25,8 +25,6 @@ let
   optLibxml2 = shouldUsePkg libxml2;
   optLibxslt = shouldUsePkg libxslt;
   optZlib = shouldUsePkg zlib;
-
-  patches' = [ ./less-is-more.patch ] ++ patches;
 in
 with stdenv.lib;
 stdenv.mkDerivation rec {
@@ -34,7 +32,7 @@ stdenv.mkDerivation rec {
 
   inherit src;
 
-  patches = patches';
+  patches = [ ./less-is-more.patch ];
 
   nativeBuildInputs = [ bison flex ];
   buildInputs = [
@@ -42,6 +40,8 @@ stdenv.mkDerivation rec {
     optLibossp_uuid optLibxml2 optLibxslt optZlib
   ];
 
+  #LC_ALL = "C";
+
   configureFlags = [
     (mkOther                            "sysconfdir"        "/etc")
     (mkOther                            "localstatedir"     "/var")
@@ -81,8 +81,6 @@ stdenv.mkDerivation rec {
     (mkWith   false                     "selinux"           null)
   ];
 
-  enableParallelBuilding = true;
-
   meta = with stdenv.lib; {
     homepage = http://www.postgresql.org/;
     description = "A powerful, open source object-relational database system";