postgresql: 9.2.10 -> 9.2.11

5 files changed, 20 insertions, 39 deletions

diff --git a/pkgs/servers/sql/postgresql/8.4.x.nix b/pkgs/servers/sql/postgresql/8.4.x.nix
index 0254bbe951d..f946f9fc145 100644
--- a/pkgs/servers/sql/postgresql/8.4.x.nix
+++ b/pkgs/servers/sql/postgresql/8.4.x.nix
@@ -8,4 +8,6 @@ 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 dba42e4fb11..b2a53bfc4b1 100644
--- a/pkgs/servers/sql/postgresql/9.0.x.nix
+++ b/pkgs/servers/sql/postgresql/9.0.x.nix
@@ -8,4 +8,6 @@ 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 138bc4a3023..1debe457e1f 100644
--- a/pkgs/servers/sql/postgresql/9.1.x.nix
+++ b/pkgs/servers/sql/postgresql/9.1.x.nix
@@ -8,4 +8,6 @@ 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 3c21a96e9b2..477bb9d2484 100644
--- a/pkgs/servers/sql/postgresql/9.2.x.nix
+++ b/pkgs/servers/sql/postgresql/9.2.x.nix
@@ -1,40 +1,13 @@
-{ stdenv, fetchurl, zlib, readline, openssl }:
+{ callPackage, fetchurl, ... } @ args:
 
-let version = "9.2.10"; in
-
-stdenv.mkDerivation rec {
-  name = "postgresql-${version}";
+callPackage ./generic.nix (args // rec {
+  psqlSchema = "9.2";
+  version = "${psqlSchema}.11";
 
   src = fetchurl {
-    url = "mirror://postgresql/source/v${version}/${name}.tar.bz2";
-    sha256 = "1bbkinqzb3c8i0vfzcy2g7djrq0kxz63jgvzda9p0vylxazmnm1m";
+    url = "mirror://postgresql/source/v${version}/postgresql-${version}.tar.bz2";
+    sha256 = "1k5i73ninqyz76zzpi06ajj5qawf30zwr16x8wrgq6swzvsgbck5";
   };
 
-  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;
-  };
-}
+  patches = [ ./disable-resolve_symlinks.patch ];
+})
diff --git a/pkgs/servers/sql/postgresql/generic.nix b/pkgs/servers/sql/postgresql/generic.nix
index 74c7b2906b4..40c5ff660ce 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
-, version, src, psqlSchema
+, psqlSchema , version, src, patches ? [ ]
 , ...
 }:
 
@@ -25,6 +25,8 @@ let
   optLibxml2 = shouldUsePkg libxml2;
   optLibxslt = shouldUsePkg libxslt;
   optZlib = shouldUsePkg zlib;
+
+  patches' = [ ./less-is-more.patch ] ++ patches;
 in
 with stdenv.lib;
 stdenv.mkDerivation rec {
@@ -32,7 +34,7 @@ stdenv.mkDerivation rec {
 
   inherit src;
 
-  patches = [ ./less-is-more.patch ];
+  patches = patches';
 
   nativeBuildInputs = [ bison flex ];
   buildInputs = [
@@ -40,8 +42,6 @@ stdenv.mkDerivation rec {
     optLibossp_uuid optLibxml2 optLibxslt optZlib
   ];
 
-  #LC_ALL = "C";
-
   configureFlags = [
     (mkOther                            "sysconfdir"        "/etc")
     (mkOther                            "localstatedir"     "/var")
@@ -81,6 +81,8 @@ 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";