Revert "postgresql: 9.1.15 -> 9.1.16"

This reverts commit be94d4bc25e27583ee36024dd9b45ead29c7f796.

2 files changed, 38 insertions, 8 deletions

diff --git a/pkgs/servers/sql/postgresql/9.1.x.nix b/pkgs/servers/sql/postgresql/9.1.x.nix
index b481f292ec54..87ed9abe6901 100644
--- a/pkgs/servers/sql/postgresql/9.1.x.nix
+++ b/pkgs/servers/sql/postgresql/9.1.x.nix
@@ -1,10 +1,42 @@
-{ callPackage, fetchurl, ... } @ args:
+{ stdenv, fetchurl, zlib, readline, openssl }:
 
-callPackage ./generic.nix (args // rec {
-  version = "9.1.16";
+let version = "9.1.15"; in
+
+stdenv.mkDerivation rec {
+  name = "postgresql-${version}";
 
   src = fetchurl {
-    url = "mirror://postgresql/source/v${version}/postgresql-${version}.tar.bz2";
-    sha256 = "0mllj1r1648iwm0qj3cj9qxizhlyhqmz94iydnwhf48psvvy4r9b";
+    url = "mirror://postgresql/source/v${version}/${name}.tar.bz2";
+    sha256 = "0pyyw0cy91z9wkqf8qzkwsy8cyjps0s94c9czz6mzhyd2npxxmk7";
+  };
+
+  buildInputs = [ zlib readline openssl ];
+
+  enableParallelBuilding = true;
+
+  LC_ALL = "C";
+
+  configureFlags = [ "--with-openssl" ];
+
+  patches = [ ./less-is-more.patch ];
+
+  postInstall =
+    ''
+      mkdir -p $out/share/man
+      cp -rvd doc/src/sgml/man1 $out/share/man
+    '';
+
+  passthru = {
+    inherit readline;
+    psqlSchema = "9.1";
+  };
+
+  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 06e6d1e79d69..b2af6dd53316 100644
--- a/pkgs/servers/sql/postgresql/generic.nix
+++ b/pkgs/servers/sql/postgresql/generic.nix
@@ -77,8 +77,6 @@ stdenv.mkDerivation rec {
     (mkWith   (optLibxml2 != null)      "libxml"            null)
     (mkWith   (optLibxslt != null)      "libxslt"           null)
     (mkWith   (optZlib != null)         "zlib"              null)
-  ] ++ optionals (versionAtLeast version "9.1.0") [
-    (mkWith   false                     "selinux"           null)
   ];
 
   meta = with stdenv.lib; {