diff options
| author | Orivej Desh <orivej@gmx.fr> | 2017-11-16 02:17:45 +0000 |
|---|---|---|
| committer | Orivej Desh <orivej@gmx.fr> | 2017-11-16 02:17:45 +0000 |
| commit | 68a703b4059a59e8411db7e01b1a308fce5ac561 (patch) | |
| tree | 1f19eb7dce44d4f9db71fa92a7ef3a94498a21b4 /pkgs/servers/sql | |
| parent | 3835526a9479e6aa19e36bf045fc19ca2ad89002 (diff) | |
| download | nixlib-68a703b4059a59e8411db7e01b1a308fce5ac561.tar nixlib-68a703b4059a59e8411db7e01b1a308fce5ac561.tar.gz nixlib-68a703b4059a59e8411db7e01b1a308fce5ac561.tar.bz2 nixlib-68a703b4059a59e8411db7e01b1a308fce5ac561.tar.lz nixlib-68a703b4059a59e8411db7e01b1a308fce5ac561.tar.xz nixlib-68a703b4059a59e8411db7e01b1a308fce5ac561.tar.zst nixlib-68a703b4059a59e8411db7e01b1a308fce5ac561.zip | |
pgpool: 3.4.2 -> 3.4.14
Fixes the build with glibc 2.26. Tracking issue: #31696
Diffstat (limited to 'pkgs/servers/sql')
| -rw-r--r-- | pkgs/servers/sql/pgpool/default.nix | 8 | ||||
| -rw-r--r-- | pkgs/servers/sql/pgpool/pgpool-II-3.4.14-glibc-2.26.patch | 12 |
2 files changed, 18 insertions, 2 deletions
diff --git a/pkgs/servers/sql/pgpool/default.nix b/pkgs/servers/sql/pgpool/default.nix index 775621e64b44..781d25490d21 100644 --- a/pkgs/servers/sql/pgpool/default.nix +++ b/pkgs/servers/sql/pgpool/default.nix @@ -1,14 +1,16 @@ { stdenv, fetchurl, postgresql, openssl, pam ? null, libmemcached ? null }: stdenv.mkDerivation rec { - name = "pgpool-II-3.4.2"; + name = "pgpool-II-3.4.14"; src = fetchurl { name = "${name}.tar.gz"; url = "http://www.pgpool.net/download.php?f=${name}.tar.gz"; - sha256 = "0lf3fvwc2ib4md25a3hnv822nhy9ac06vg0ndw8q9bry66hzwcfh"; + sha256 = "1paak83f4lv48xckmf2znryrvhmdz86w4v97mcw2gxm50hcl74sw"; }; + patches = [ ./pgpool-II-3.4.14-glibc-2.26.patch ]; + buildInputs = [ postgresql openssl pam libmemcached ]; configureFlags = [ @@ -22,6 +24,8 @@ stdenv.mkDerivation rec { "sysconfdir=\${out}/etc" ]; + enableParallelBuilding = true; + meta = with stdenv.lib; { homepage = http://pgpool.net/mediawiki/index.php; description = "A middleware that works between postgresql servers and postgresql clients"; diff --git a/pkgs/servers/sql/pgpool/pgpool-II-3.4.14-glibc-2.26.patch b/pkgs/servers/sql/pgpool/pgpool-II-3.4.14-glibc-2.26.patch new file mode 100644 index 000000000000..6efffff0c6d9 --- /dev/null +++ b/pkgs/servers/sql/pgpool/pgpool-II-3.4.14-glibc-2.26.patch @@ -0,0 +1,12 @@ +diff --git a/src/watchdog/wd_lifecheck.c b/src/watchdog/wd_lifecheck.c +index 1e72307..5cf68a3 100644 +--- a/src/watchdog/wd_lifecheck.c ++++ b/src/watchdog/wd_lifecheck.c +@@ -26,6 +26,7 @@ + #include <ctype.h> + #include <time.h> + #include <string.h> ++#include <stdint.h> + #include <stdlib.h> + #include <unistd.h> + #include <netdb.h> |