diff --git a/nixos/tests/postgis.nix b/nixos/tests/postgis.nix index dacf4e576c07..5b63e2ba73eb 100644 --- a/nixos/tests/postgis.nix +++ b/nixos/tests/postgis.nix @@ -26,5 +26,13 @@ import ./make-test-python.nix ({ pkgs, ...} : { master.succeed("sudo -u postgres psql -c 'CREATE EXTENSION postgis;'") master.succeed("sudo -u postgres psql -c 'CREATE EXTENSION postgis_raster;'") master.succeed("sudo -u postgres psql -c 'CREATE EXTENSION postgis_topology;'") + master.succeed("sudo -u postgres psql -c 'select postgis_version();'") + master.succeed("[ \"$(sudo -u postgres psql --no-psqlrc --tuples-only -c 'select postgis_version();')\" = \" ${ + pkgs.lib.versions.major pkgs.postgis.version + }.${ + pkgs.lib.versions.minor pkgs.postgis.version + } USE_GEOS=1 USE_PROJ=1 USE_STATS=1\" ]") + # st_makepoint goes through c code + master.succeed("sudo -u postgres psql --no-psqlrc --tuples-only -c 'select st_makepoint(1, 1)'") ''; }) diff --git a/pkgs/servers/sql/postgresql/ext/postgis.nix b/pkgs/servers/sql/postgresql/ext/postgis.nix index 109876b6e9d2..aa62c778a3fd 100644 --- a/pkgs/servers/sql/postgresql/ext/postgis.nix +++ b/pkgs/servers/sql/postgresql/ext/postgis.nix @@ -15,7 +15,7 @@ protobufc, libiconv, libxslt, - docbook_xml_dtd_45, + docbook5, cunit, pcre2, nixosTests, @@ -28,7 +28,7 @@ let in stdenv.mkDerivation rec { pname = "postgis"; - version = "3.4.3"; + version = "3.5.0"; outputs = [ "out" @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://download.osgeo.org/postgis/source/postgis-${version}.tar.gz"; - hash = "sha256-+N7VBdrrj1dlnaK55Xf/ceGDqqCUcI0u7OLFbZM2H2I="; + hash = "sha256-ymmKIswrKzRnrE4GO0OihBPzAE3dUFvczddMVqZH9RA="; }; buildInputs = [ @@ -95,7 +95,7 @@ stdenv.mkDerivation rec { substituteInPlace regress/run_test.pl --replace-fail "/share/contrib/postgis" "$out/share/postgresql/contrib/postgis" substituteInPlace regress/Makefile --replace-fail 's,\$$libdir,$(REGRESS_INSTALLDIR)/lib,g' "s,\\$\$libdir,$PWD/regress/00-regress-install$out/lib,g" \ --replace-fail '$(REGRESS_INSTALLDIR)/share/contrib/postgis/*.sql' "$PWD/regress/00-regress-install$out/share/postgresql/contrib/postgis/*.sql" - substituteInPlace doc/postgis-out.xml --replace-fail "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" "${docbook_xml_dtd_45}/xml/dtd/docbook/docbookx.dtd" + substituteInPlace doc/postgis-out.xml --replace-fail "http://docbook.org/xml/5.0/dtd/docbook.dtd" "${docbook5}/xml/dtd/docbook/docbookx.dtd" # The test suite hardcodes it to use /tmp. export PGIS_REG_TMPDIR="$TMPDIR/pgis_reg" '';