pgpool: 3.4.1 -> 3.4.2

This commit is contained in:
William A. Kennington III 2015-04-08 12:10:31 -07:00
parent aec35dfa58
commit 9308b8e121
2 changed files with 22 additions and 15 deletions

View File

@ -1,14 +1,26 @@
{ stdenv, fetchurl, postgresql }: { stdenv, fetchurl, postgresql, openssl, pam ? null, libmemcached ? null }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "pgpool-II-3.4.1"; name = "pgpool-II-3.4.2";
src = fetchurl { src = fetchurl {
name = "${name}.tar.gz";
url = "http://www.pgpool.net/download.php?f=${name}.tar.gz"; url = "http://www.pgpool.net/download.php?f=${name}.tar.gz";
sha256 = "11fy4lvh2n04zmywy4vhp229yxdw8fbirrlvz44j1vnarkb664pd"; sha256 = "0lf3fvwc2ib4md25a3hnv822nhy9ac06vg0ndw8q9bry66hzwcfh";
}; };
buildInputs = [ postgresql ]; buildInputs = [ postgresql openssl pam libmemcached ];
configureFlags = [
"--sysconfdir=/etc"
"--localstatedir=/var"
"--with-openssl"
] ++ stdenv.lib.optional (pam != null) "--with-pam"
++ stdenv.lib.optional (libmemcached != null) "--with-memcached=${libmemcached}";
installFlags = [
"sysconfdir=\${out}/etc"
];
meta = with stdenv.lib; { meta = with stdenv.lib; {
homepage = http://pgpool.net/mediawiki/index.php; homepage = http://pgpool.net/mediawiki/index.php;

View File

@ -8462,20 +8462,15 @@ let
seabios = callPackage ../applications/virtualization/seabios { }; seabios = callPackage ../applications/virtualization/seabios { };
pgpool92 = callPackage ../servers/sql/pgpool/default.nix { pgpool92 = pgpool.override { postgresql = postgresql92; };
postgresql = postgresql92; pgpool93 = pgpool.override { postgresql = postgresql93; };
}; pgpool94 = pgpool.override { postgresql = postgresql94; };
pgpool93 = callPackage ../servers/sql/pgpool/default.nix { pgpool = callPackage ../servers/sql/pgpool/default.nix {
postgresql = postgresql93; pam = if stdenv.isLinux then pam else null;
libmemcached = null; # Detection is broken upstream
}; };
pgpool94 = callPackage ../servers/sql/pgpool/default.nix {
postgresql = postgresql94;
};
pgpool = pgpool92;
postgresql = postgresql92; postgresql = postgresql92;
postgresql84 = callPackage ../servers/sql/postgresql/8.4.x.nix { }; postgresql84 = callPackage ../servers/sql/postgresql/8.4.x.nix { };