From 6602decb96b8da3eebb68ab91b723885f0dabee9 Mon Sep 17 00:00:00 2001 From: Rebecca Turner Date: Mon, 26 Aug 2024 14:39:19 -0400 Subject: [PATCH] postgis: Do not hardcode test suite path (#336889) postgis: Fix test suite Fixes this failure: ``` Creating database 'postgis_reg-3.4'. sh: line 1: /tmp/pgis_reg/regress_log: Permission denied 2024-08-23 19:26:18.810 UTC [3295760] FATAL: database "postgis_reg-3.4" does not exist psql: error: FATAL: database "postgis_reg-3.4" does not exist Loading unpackaged components from /tmp/nix-build-postgis-3.4.2.drv-0/postgis-3.4.2/regress/00-regress-install/nix/store/kg8g82wxhar9iadxrd3pra3af174khpb-postgis-3.4.2/share/postgresql/contrib/postgis Loading PostGIS into 'postgis_reg-3.4' sh: line 1: /tmp/pgis_reg/regress_log: Permission denied failed (Error encountered loading /tmp/nix-build-postgis-3.4.2.drv-0/postgis-3.4.2/regress/00-regress-install/nix/store/kg8g82wxhar9iadxrd3pra3af174khpb-postgis-3.4.2/share/postgresql/contrib/postgis/postgis.sql: /tmp/pgis_reg/regress_log) make: *** [regress/runtest.mk:24: check-regress] Error 1 ``` --- pkgs/servers/sql/postgresql/ext/postgis.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/servers/sql/postgresql/ext/postgis.nix b/pkgs/servers/sql/postgresql/ext/postgis.nix index 251d79ffe04a..5b4e4543ec96 100644 --- a/pkgs/servers/sql/postgresql/ext/postgis.nix +++ b/pkgs/servers/sql/postgresql/ext/postgis.nix @@ -96,6 +96,8 @@ stdenv.mkDerivation rec { 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" + # The test suite hardcodes it to use /tmp. + export PGIS_REG_TMPDIR="$TMPDIR/pgis_reg" ''; # create aliases for all commands adding version information