Merge branch 'master' of github.com:imincik/geospatial-nix

flake.nix

@@ -9,7 +9,7 @@
   };
 
   inputs = {
-    nixpkgs.url = "github:NixOS/nixpkgs/nixos-23.11";
+    nixpkgs.url = "github:NixOS/nixpkgs/nixos-24.05";
 
     nixgl = {
       url = "github:nix-community/nixGL";
@@ -61,6 +61,7 @@
                 "postgresql_13"
                 "postgresql_14"
                 "postgresql_15"
+                "postgresql_16"
               ];
               forAllPostgresqlVersions = f: genAttrs postgresqlVersions (postgresql: f postgresql);
 
@@ -142,9 +143,6 @@
                   };
 
                   pyqt5 = py.pkgs.pyqt5.override {
-                    # FIX sip and pyqt5_sip compatibility. See: https://github.com/NixOS/nixpkgs/issues/273561
-                    # Remove this fix in NixOS 24.05.
-                    pyqt5_sip = py.pkgs.callPackage ./pkgs/qgis/pyqt5-sip.nix { };
                     withLocation = true;
                     withSerialPort = true;
                   };
@@ -189,6 +187,8 @@
 
                     gdalMinimal = gdal-minimal;
                     postgresql = pg;
+
+                    jitSupport = false;
                   };
 
                   # all packages (single Postgresql version)

pkgs/fiona/default.nix

@@ -3,7 +3,7 @@
   buildPythonPackage,
   pythonOlder,
   fetchFromGitHub,
-  cython_3,
+  cython,
   gdal,
   oldest-supported-numpy,
   setuptools,
@@ -35,7 +35,7 @@ buildPythonPackage rec {
   };
 
   nativeBuildInputs = [
-    cython_3
+    cython
     gdal # for gdal-config
     oldest-supported-numpy
     setuptools

pkgs/gdal/master-rev.nix

@@ -1,4 +1,4 @@
 {
-  rev = "c89aeb4";
-  hash = "sha256-aiYwZaXonn8FHz8jYDCSl+tLSnoQO1Xkdrx84HcgdxY=";
+  rev = "1b32f9f";
+  hash = "sha256-CwUx3JsQNhXyPZXCGlDT8AkqLraECErxgcAS/r+uHj8=";
 }

pkgs/grass/default.nix

@@ -3,7 +3,7 @@
 , callPackage
 , fetchFromGitHub
 , makeWrapper
-, wrapGAppsHook
+, wrapGAppsHook3
 
 , bison
 , blas
@@ -44,7 +44,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   nativeBuildInputs = [
     makeWrapper
-    wrapGAppsHook
+    wrapGAppsHook3
 
     bison
     flex
@@ -53,7 +53,7 @@ stdenv.mkDerivation (finalAttrs: {
     libmysqlclient # for `mysql_config`
     netcdf # for `nc-config`
     pkg-config
-  ] ++ (with python3Packages; [ python-dateutil numpy wxPython_4_2 ]);
+  ] ++ (with python3Packages; [ python-dateutil numpy wxpython ]);
 
   buildInputs = [
     blas

pkgs/pg_featureserv/default.nix

@@ -17,12 +17,12 @@ buildGoModule rec {
     # fix default configuration file location
     substituteInPlace \
       internal/conf/config.go \
-      --replace "viper.AddConfigPath(\"/etc\")" "viper.AddConfigPath(\"$out/share/config\")"
+      --replace-fail "viper.AddConfigPath(\"/etc\")" "viper.AddConfigPath(\"$out/share/config\")"
 
     # fix assets location in configuration file
     substituteInPlace \
       config/pg_featureserv.toml.example \
-      --replace "AssetsPath = \"./assets\"" "AssetsPath = \"$out/share/assets\""
+      --replace-fail "AssetsPath = \"./assets\"" "AssetsPath = \"$out/share/assets\""
   '';
 
   ldflags = [ "-s" "-w" "-X github.com/CrunchyData/pg_featureserv/conf.setVersion=${version}" ];

pkgs/pg_tileserv/default.nix

@@ -17,12 +17,12 @@ buildGoModule rec {
     # fix default configuration file location
     substituteInPlace \
       main.go \
-      --replace "viper.AddConfigPath(\"/etc\")" "viper.AddConfigPath(\"$out/share/config\")"
+      --replace-fail "viper.AddConfigPath(\"/etc\")" "viper.AddConfigPath(\"$out/share/config\")"
 
     # fix assets location in configuration file
     substituteInPlace \
       config/pg_tileserv.toml.example \
-      --replace "# AssetsPath = \"/usr/share/pg_tileserv/assets\"" "AssetsPath = \"$out/share/assets\""
+      --replace-fail "# AssetsPath = \"/usr/share/pg_tileserv/assets\"" "AssetsPath = \"$out/share/assets\""
   '';
 
   ldflags = [ "-s" "-w" "-X main.programVersion=${version}" ];

pkgs/postgis/postgis.nix

@@ -13,6 +13,8 @@
 , libiconv
 , pcre2
 , nixosTests
+, jitSupport
+, llvm
 }:
 
 let
@@ -31,13 +33,11 @@ stdenv.mkDerivation rec {
 
   buildInputs = [ libxml2 postgresql geos proj gdal json_c protobufc pcre2.dev ]
                 ++ lib.optional stdenv.isDarwin libiconv;
-  nativeBuildInputs = [ perl pkg-config ] ++ lib.optional postgresql.jitSupport postgresql.llvm;
+  nativeBuildInputs = [ perl pkg-config ] ++ lib.optional jitSupport llvm;
   dontDisableStatic = true;
 
   # postgis config directory assumes /include /lib from the same root for json-c library
-  NIX_LDFLAGS = "-L${lib.getLib json_c}/lib"
-    # Work around https://github.com/NixOS/nixpkgs/issues/166205.
-    + lib.optionalString (stdenv.cc.isClang && stdenv.cc.libcxx != null) " -l${stdenv.cc.libcxx.cxxabi.libName}";
+  env.NIX_LDFLAGS = "-L${lib.getLib json_c}/lib";
 
 
   preConfigure = ''
@@ -81,8 +81,7 @@ 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 ];
+    maintainers = with maintainers; teams.geospatial.members ++ [ marcweber wolfgangwalther ];
     inherit (postgresql.meta) platforms;
-    broken = versionOlder postgresql.version "12";
   };
 }