Clone of https://github.com/NixOS/nixpkgs.git (to stress-test knotserver)

postgresqlPackages.postgis: 3.3.3 -> 3.4.0

Changelog: https://git.osgeo.org/gitea/postgis/postgis/raw/tag/3.4.0/NEWS

+5 -4
+1 -1
nixos/tests/postgis.nix
··· 9 { pkgs, ... }: 10 11 { 12 - services.postgresql = let mypg = pkgs.postgresql_11; in { 13 enable = true; 14 package = mypg; 15 extraPlugins = with mypg.pkgs; [
··· 9 { pkgs, ... }: 10 11 { 12 + services.postgresql = let mypg = pkgs.postgresql; in { 13 enable = true; 14 package = mypg; 15 extraPlugins = with mypg.pkgs; [
+4 -3
pkgs/servers/sql/postgresql/ext/postgis.nix
··· 16 }: 17 stdenv.mkDerivation rec { 18 pname = "postgis"; 19 - version = "3.3.3"; 20 21 outputs = [ "out" "doc" ]; 22 23 src = fetchurl { 24 url = "https://download.osgeo.org/postgis/source/postgis-${version}.tar.gz"; 25 - sha256 = "sha256-dOs1bj+F8UIzeRATNgiBtnSPeAgcxoj/nW8PZzp2LRM="; 26 }; 27 28 buildInputs = [ libxml2 postgresql geos proj gdal json_c protobufc pcre2.dev ] ··· 35 36 preConfigure = '' 37 sed -i 's@/usr/bin/file@${file}/bin/file@' configure 38 - 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}" 39 40 makeFlags="PERL=${perl}/bin/perl datadir=$out/share/postgresql pkglibdir=$out/lib bindir=$out/bin docdir=$doc/share/doc/${pname}" 41 ''; ··· 76 license = licenses.gpl2; 77 maintainers = [ maintainers.marcweber ]; 78 inherit (postgresql.meta) platforms; 79 }; 80 }
··· 16 }: 17 stdenv.mkDerivation rec { 18 pname = "postgis"; 19 + version = "3.4.0"; 20 21 outputs = [ "out" "doc" ]; 22 23 src = fetchurl { 24 url = "https://download.osgeo.org/postgis/source/postgis-${version}.tar.gz"; 25 + sha256 = "sha256-rum2CmyITTVBZLMJbEZX8yRFQYZgf4WdHOBdiZeYr50="; 26 }; 27 28 buildInputs = [ libxml2 postgresql geos proj gdal json_c protobufc pcre2.dev ] ··· 35 36 preConfigure = '' 37 sed -i 's@/usr/bin/file@${file}/bin/file@' configure 38 + 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" 39 40 makeFlags="PERL=${perl}/bin/perl datadir=$out/share/postgresql pkglibdir=$out/lib bindir=$out/bin docdir=$doc/share/doc/${pname}" 41 ''; ··· 76 license = licenses.gpl2; 77 maintainers = [ maintainers.marcweber ]; 78 inherit (postgresql.meta) platforms; 79 + broken = versionOlder postgresql.version "12"; 80 }; 81 }