diff options
| author | Frederik Rietdijk <fridh@fridh.nl> | 2019-10-24 08:34:33 +0200 |
|---|---|---|
| committer | Frederik Rietdijk <fridh@fridh.nl> | 2019-10-24 08:34:33 +0200 |
| commit | 612f0525b303119229336a01affba142d026b9e7 (patch) | |
| tree | 7313353f5d86ccd765b938d638a1b0563e450f23 /pkgs/servers/sql | |
| parent | 27263992a093232be677adc57cae9df66435718a (diff) | |
| parent | 32389de159a0983f4daf7de446da6439a92a29a2 (diff) | |
| download | nixlib-612f0525b303119229336a01affba142d026b9e7.tar nixlib-612f0525b303119229336a01affba142d026b9e7.tar.gz nixlib-612f0525b303119229336a01affba142d026b9e7.tar.bz2 nixlib-612f0525b303119229336a01affba142d026b9e7.tar.lz nixlib-612f0525b303119229336a01affba142d026b9e7.tar.xz nixlib-612f0525b303119229336a01affba142d026b9e7.tar.zst nixlib-612f0525b303119229336a01affba142d026b9e7.zip | |
Merge staging-next into staging
Diffstat (limited to 'pkgs/servers/sql')
| -rw-r--r-- | pkgs/servers/sql/pgbouncer/default.nix | 10 | ||||
| -rw-r--r-- | pkgs/servers/sql/postgresql/ext/postgis.nix | 4 |
2 files changed, 8 insertions, 6 deletions
diff --git a/pkgs/servers/sql/pgbouncer/default.nix b/pkgs/servers/sql/pgbouncer/default.nix index 76b35a345b5b..f71afc2b674e 100644 --- a/pkgs/servers/sql/pgbouncer/default.nix +++ b/pkgs/servers/sql/pgbouncer/default.nix @@ -2,17 +2,19 @@ stdenv.mkDerivation rec { pname = "pgbouncer"; - version = "1.11.0"; + version = "1.12.0"; src = fetchurl { url = "https://pgbouncer.github.io/downloads/files/${version}/${pname}-${version}.tar.gz"; - sha256 = "0w3y53kwnkcm9fmf28zbjvqk6ivfic5f2k3nflvca1i8iaj2z044"; + sha256 = "0gi7ggmyjqd4kxdwm5csmzmjmfrjx7q20dfzk3da1bvc6xj6ag0v"; }; - buildInputs = [ libevent openssl c-ares pkg-config ]; + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ libevent openssl c-ares ]; + enableParallelBuilding = true; meta = with stdenv.lib; { - homepage = https://pgbouncer.github.io; + homepage = "https://pgbouncer.github.io"; description = "Lightweight connection pooler for PostgreSQL"; license = licenses.isc; platforms = platforms.all; diff --git a/pkgs/servers/sql/postgresql/ext/postgis.nix b/pkgs/servers/sql/postgresql/ext/postgis.nix index 88090636ff21..c7bceb232f66 100644 --- a/pkgs/servers/sql/postgresql/ext/postgis.nix +++ b/pkgs/servers/sql/postgresql/ext/postgis.nix @@ -14,13 +14,13 @@ }: stdenv.mkDerivation rec { pname = "postgis"; - version = "2.5.3"; + version = "3.0.0"; outputs = [ "out" "doc" ]; src = fetchurl { url = "https://download.osgeo.org/postgis/source/postgis-${version}.tar.gz"; - sha256 = "16jm9v9y25dhfwd4hvhnynj6k3ikjbr3z3dpn8py50gr82fjds3j"; + sha256 = "15557fbk0xkngihwhqsbdyz2ng49blisf5zydw81j0gabk6x4vy0"; }; buildInputs = [ libxml2 postgresql geos proj gdal json_c protobufc ] |