commit dfde9c83bce9e6c2bc903dfc1bca3bf93b3f52de · pyrox.dev/nixpkgs

+1 -1

nixos/tests/postgis.nix

···

       9
       9
        
             { pkgs, ... }:

     

       10
       10
        
       

     

       11
       11
        
             {

     

       12
       12
       -
               services.postgresql = let mypg = pkgs.postgresql_11; in {

     

       12
       12
       +
               services.postgresql = let mypg = pkgs.postgresql; in {

     

       13
       13
        
                   enable = true;

     

       14
       14
        
                   package = mypg;

     

       15
       15
        
                   extraPlugins = with mypg.pkgs; [

+4 -3

pkgs/servers/sql/postgresql/ext/postgis.nix

···

       16
       16
        
       }:

     

       17
       17
        
       stdenv.mkDerivation rec {

     

       18
       18
        
         pname = "postgis";

     

       19
       19
       -
         version = "3.3.3";

     

       19
       19
       +
         version = "3.4.0";

     

       20
       20
        
       

     

       21
       21
        
         outputs = [ "out" "doc" ];

     

       22
       22
        
       

     

       23
       23
        
         src = fetchurl {

     

       24
       24
        
           url = "https://download.osgeo.org/postgis/source/postgis-${version}.tar.gz";

     

       25
       25
       -
           sha256 = "sha256-dOs1bj+F8UIzeRATNgiBtnSPeAgcxoj/nW8PZzp2LRM=";

     

       25
       25
       +
           sha256 = "sha256-rum2CmyITTVBZLMJbEZX8yRFQYZgf4WdHOBdiZeYr50=";

     

       26
       26
        
         };

     

       27
       27
        
       

     

       28
       28
        
         buildInputs = [ libxml2 postgresql geos proj gdal json_c protobufc pcre2.dev ]

     
···

       35
       35
        
       

     

       36
       36
        
         preConfigure = ''

     

       37
       37
        
           sed -i 's@/usr/bin/file@${file}/bin/file@' configure

     

       38
       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}"

     

       38
       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
       39
        
       

     

       40
       40
        
           makeFlags="PERL=${perl}/bin/perl datadir=$out/share/postgresql pkglibdir=$out/lib bindir=$out/bin docdir=$doc/share/doc/${pname}"

     

       41
       41
        
         '';

     
···

       76
       76
        
           license = licenses.gpl2;

     

       77
       77
        
           maintainers = [ maintainers.marcweber ];

     

       78
       78
        
           inherit (postgresql.meta) platforms;

     

       79
       79
       +
           broken = versionOlder postgresql.version "12";

     

       79
       80
        
         };

     

       80
       81
        
       }