From 068c11900fb264304d9020a0d36a767032845e83 Mon Sep 17 00:00:00 2001 From: Kirill Radzikhovskyy Date: Fri, 2 Aug 2024 17:28:10 +1000 Subject: [PATCH 1/3] postgresqlPackages.postgis: enable tests --- pkgs/servers/sql/postgresql/ext/postgis.nix | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) diff --git a/pkgs/servers/sql/postgresql/ext/postgis.nix b/pkgs/servers/sql/postgresql/ext/postgis.nix index ee1669e5db18599..a44643014b52417 100644 --- a/pkgs/servers/sql/postgresql/ext/postgis.nix +++ b/pkgs/servers/sql/postgresql/ext/postgis.nix @@ -3,6 +3,7 @@ , perl , libxml2 , postgresql +, postgresqlTestHook , geos , proj , gdalMinimal @@ -11,6 +12,9 @@ , file , protobufc , libiconv +, libxslt +, docbook_xml_dtd_45 +, cunit , pcre2 , nixosTests , jitSupport @@ -36,10 +40,14 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ perl pkg-config ] ++ lib.optional jitSupport llvm; dontDisableStatic = true; + nativeCheckInputs = [ postgresqlTestHook cunit libxslt ]; + + postgresqlTestUserOptions = "LOGIN SUPERUSER"; + failureHook = "postgresqlStop"; + # postgis config directory assumes /include /lib from the same root for json-c library env.NIX_LDFLAGS = "-L${lib.getLib json_c}/lib"; - preConfigure = '' sed -i 's@/usr/bin/file@${file}/bin/file@' configure configureFlags="--datadir=$out/share/postgresql --datarootdir=$out/share/postgresql --bindir=$out/bin --docdir=$doc/share/doc/${pname} --with-gdalconfig=${gdal}/bin/gdal-config --with-jsondir=${json_c.dev} --disable-extension-upgrades-install" @@ -61,6 +69,15 @@ stdenv.mkDerivation rec { ln -s ${postgresql}/bin/postgres $out/bin/postgres ''; + doCheck = stdenv.isLinux; + + preCheck = '' + 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" + ''; + # create aliases for all commands adding version information postInstall = '' # Teardown the illusory postgres used for building; see postConfigure. From d3c9639c75b3261435ae7abbc992631e5c0dc9f7 Mon Sep 17 00:00:00 2001 From: Kirill Radzikhovskyy Date: Thu, 15 Aug 2024 13:55:26 +1000 Subject: [PATCH 2/3] postgresqlPackages.postgis: nixfmt-rfc-style --- pkgs/servers/sql/postgresql/ext/postgis.nix | 80 ++++++++++++++------- 1 file changed, 53 insertions(+), 27 deletions(-) diff --git a/pkgs/servers/sql/postgresql/ext/postgis.nix b/pkgs/servers/sql/postgresql/ext/postgis.nix index a44643014b52417..170d451b81b0265 100644 --- a/pkgs/servers/sql/postgresql/ext/postgis.nix +++ b/pkgs/servers/sql/postgresql/ext/postgis.nix @@ -1,24 +1,26 @@ -{ fetchurl -, lib, stdenv -, perl -, libxml2 -, postgresql -, postgresqlTestHook -, geos -, proj -, gdalMinimal -, json_c -, pkg-config -, file -, protobufc -, libiconv -, libxslt -, docbook_xml_dtd_45 -, cunit -, pcre2 -, nixosTests -, jitSupport -, llvm +{ + fetchurl, + lib, + stdenv, + perl, + libxml2, + postgresql, + postgresqlTestHook, + geos, + proj, + gdalMinimal, + json_c, + pkg-config, + file, + protobufc, + libiconv, + libxslt, + docbook_xml_dtd_45, + cunit, + pcre2, + nixosTests, + jitSupport, + llvm, }: let @@ -28,19 +30,37 @@ stdenv.mkDerivation rec { pname = "postgis"; version = "3.4.2"; - outputs = [ "out" "doc" ]; + outputs = [ + "out" + "doc" + ]; src = fetchurl { url = "https://download.osgeo.org/postgis/source/postgis-${version}.tar.gz"; sha256 = "sha256-yMh0wAukqYSocDCva/lUSCFQIGCtRz1clvHU0INcWJI="; }; - buildInputs = [ libxml2 postgresql geos proj gdal json_c protobufc pcre2.dev ] - ++ lib.optional stdenv.isDarwin libiconv; - nativeBuildInputs = [ perl pkg-config ] ++ lib.optional jitSupport llvm; + buildInputs = [ + libxml2 + postgresql + geos + proj + gdal + json_c + protobufc + pcre2.dev + ] ++ lib.optional stdenv.isDarwin libiconv; + nativeBuildInputs = [ + perl + pkg-config + ] ++ lib.optional jitSupport llvm; dontDisableStatic = true; - nativeCheckInputs = [ postgresqlTestHook cunit libxslt ]; + nativeCheckInputs = [ + postgresqlTestHook + cunit + libxslt + ]; postgresqlTestUserOptions = "LOGIN SUPERUSER"; failureHook = "postgresqlStop"; @@ -98,7 +118,13 @@ stdenv.mkDerivation rec { homepage = "https://postgis.net/"; changelog = "https://git.osgeo.org/gitea/postgis/postgis/raw/tag/${version}/NEWS"; license = licenses.gpl2Plus; - maintainers = with maintainers; teams.geospatial.members ++ [ marcweber wolfgangwalther ]; + maintainers = + with maintainers; + teams.geospatial.members + ++ [ + marcweber + wolfgangwalther + ]; inherit (postgresql.meta) platforms; }; } From b023a8a2f162b1b9aa1ee0eb6ba2200907f1b9b0 Mon Sep 17 00:00:00 2001 From: Kirill Radzikhovskyy Date: Thu, 15 Aug 2024 13:56:01 +1000 Subject: [PATCH 3/3] postgresqlPackages.postgis: sha256 -> hash --- pkgs/servers/sql/postgresql/ext/postgis.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/servers/sql/postgresql/ext/postgis.nix b/pkgs/servers/sql/postgresql/ext/postgis.nix index 170d451b81b0265..251d79ffe04a514 100644 --- a/pkgs/servers/sql/postgresql/ext/postgis.nix +++ b/pkgs/servers/sql/postgresql/ext/postgis.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://download.osgeo.org/postgis/source/postgis-${version}.tar.gz"; - sha256 = "sha256-yMh0wAukqYSocDCva/lUSCFQIGCtRz1clvHU0INcWJI="; + hash = "sha256-yMh0wAukqYSocDCva/lUSCFQIGCtRz1clvHU0INcWJI="; }; buildInputs = [