From ba0632d2480d83245afbc258d0d7a484730567e9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Mon, 22 Aug 2022 14:12:40 +0200 Subject: [PATCH] pgpool: remove broken libmemcached, update download URL libmemcache support is broken since 2015 https://github.com/NixOS/nixpkgs/commit/9308b8e1216186053e1a5a94ee1b462f39de4a6b --- pkgs/servers/sql/pgpool/default.nix | 22 ++++++++++++++++------ pkgs/top-level/all-packages.nix | 5 +---- 2 files changed, 17 insertions(+), 10 deletions(-) diff --git a/pkgs/servers/sql/pgpool/default.nix b/pkgs/servers/sql/pgpool/default.nix index 16502571375a..436217f2e63e 100644 --- a/pkgs/servers/sql/pgpool/default.nix +++ b/pkgs/servers/sql/pgpool/default.nix @@ -1,23 +1,32 @@ -{ 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" @@ -30,5 +39,6 @@ stdenv.mkDerivation rec { description = "A middleware that works between postgresql servers and postgresql clients"; license = licenses.free; platforms = platforms.unix; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 99ca3ec35085..c6ce626d14ca 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -23160,10 +23160,7 @@ with pkgs; 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;