diff options
| author | Mario Rodas <marsam@users.noreply.github.com> | 2023-09-08 04:20:00 +0000 |
|---|---|---|
| committer | Mario Rodas <marsam@users.noreply.github.com> | 2023-09-08 04:20:00 +0000 |
| commit | dfde9c83bce9e6c2bc903dfc1bca3bf93b3f52de (patch) | |
| tree | 223bc3d77c8af334fd69daf6f45e32ce70c251f3 | |
| parent | 0b458fbc462ced7fc03c8b68cf1b1bd0d92af465 (diff) | |
| download | nixpkgs-dfde9c83bce9e6c2bc903dfc1bca3bf93b3f52de.tar nixpkgs-dfde9c83bce9e6c2bc903dfc1bca3bf93b3f52de.tar.gz nixpkgs-dfde9c83bce9e6c2bc903dfc1bca3bf93b3f52de.tar.bz2 nixpkgs-dfde9c83bce9e6c2bc903dfc1bca3bf93b3f52de.tar.lz nixpkgs-dfde9c83bce9e6c2bc903dfc1bca3bf93b3f52de.tar.xz nixpkgs-dfde9c83bce9e6c2bc903dfc1bca3bf93b3f52de.tar.zst nixpkgs-dfde9c83bce9e6c2bc903dfc1bca3bf93b3f52de.zip | |
postgresqlPackages.postgis: 3.3.3 -> 3.4.0
Changelog: https://git.osgeo.org/gitea/postgis/postgis/raw/tag/3.4.0/NEWS
| -rw-r--r-- | nixos/tests/postgis.nix | 2 | ||||
| -rw-r--r-- | pkgs/servers/sql/postgresql/ext/postgis.nix | 7 |
2 files changed, 5 insertions, 4 deletions
diff --git a/nixos/tests/postgis.nix b/nixos/tests/postgis.nix index 9d81ebaad85..d0685abc510 100644 --- a/nixos/tests/postgis.nix +++ b/nixos/tests/postgis.nix @@ -9,7 +9,7 @@ import ./make-test-python.nix ({ pkgs, ...} : { { pkgs, ... }: { - services.postgresql = let mypg = pkgs.postgresql_11; in { + services.postgresql = let mypg = pkgs.postgresql; in { enable = true; package = mypg; extraPlugins = with mypg.pkgs; [ diff --git a/pkgs/servers/sql/postgresql/ext/postgis.nix b/pkgs/servers/sql/postgresql/ext/postgis.nix index 328f2f64eba..5745630964e 100644 --- a/pkgs/servers/sql/postgresql/ext/postgis.nix +++ b/pkgs/servers/sql/postgresql/ext/postgis.nix @@ -16,13 +16,13 @@ }: stdenv.mkDerivation rec { pname = "postgis"; - version = "3.3.3"; + version = "3.4.0"; outputs = [ "out" "doc" ]; src = fetchurl { url = "https://download.osgeo.org/postgis/source/postgis-${version}.tar.gz"; - sha256 = "sha256-dOs1bj+F8UIzeRATNgiBtnSPeAgcxoj/nW8PZzp2LRM="; + sha256 = "sha256-rum2CmyITTVBZLMJbEZX8yRFQYZgf4WdHOBdiZeYr50="; }; buildInputs = [ libxml2 postgresql geos proj gdal json_c protobufc pcre2.dev ] @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { 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}" + 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" makeFlags="PERL=${perl}/bin/perl datadir=$out/share/postgresql pkglibdir=$out/lib bindir=$out/bin docdir=$doc/share/doc/${pname}" ''; @@ -76,5 +76,6 @@ stdenv.mkDerivation rec { license = licenses.gpl2; maintainers = [ maintainers.marcweber ]; inherit (postgresql.meta) platforms; + broken = versionOlder postgresql.version "12"; }; } |