Merge pull request #187860 from SuperSandro2000/pgpool

pgpool: remove broken libmemcached, update download URL

pkgs/servers/sql/pgpool/default.nix

···
-{ lib, stdenv, fetchurl, postgresql, openssl, pam ? null, libmemcached ? null }:
+{ lib
+, stdenv
+, fetchurl
+, postgresql
+, openssl
+, withPam ? stdenv.isLinux
+, pam
+}:
 
 stdenv.mkDerivation rec {
   pname = "pgpool-II";
   version = "4.3.3";
 
   src = fetchurl {
-    name = "${pname}-${version}.tar.gz";
-    url = "http://www.pgpool.net/download.php?f=${pname}-${version}.tar.gz";
+    url = "https://www.pgpool.net/mediawiki/download.php?f=pgpool-II-${version}.tar.gz";
+    name = "pgpool-II-${version}.tar.gz";
     sha256 = "sha256-bHNDS67lgThqlVX+WWKL9GeCD31b2+M0F2g5mgOCyXk=";
   };
 
-  buildInputs = [ postgresql openssl pam libmemcached ];
+  buildInputs = [
+    postgresql
+    openssl
+  ] ++ lib.optional withPam pam;
 
   configureFlags = [
     "--sysconfdir=/etc"
     "--localstatedir=/var"
     "--with-openssl"
-  ] ++ lib.optional (pam != null) "--with-pam"
-    ++ lib.optional (libmemcached != null) "--with-memcached=${libmemcached}";
+  ] ++ lib.optional withPam "--with-pam";
 
   installFlags = [
     "sysconfdir=\${out}/etc"
···
     description = "A middleware that works between postgresql servers and postgresql clients";
     license = licenses.free;
     platforms = platforms.unix;
+    maintainers = with maintainers; [ ];
   };
 }

pkgs/top-level/all-packages.nix

···
 
   pgbouncer = callPackage ../servers/sql/pgbouncer { };
 
-  pgpool = callPackage ../servers/sql/pgpool {
-    pam = if stdenv.isLinux then pam else null;
-    libmemcached = null; # Detection is broken upstream
-  };
+  pgpool = callPackage ../servers/sql/pgpool { };
 
   tang = callPackage ../servers/tang {
     asciidoc = asciidoc-full;