Merge pull request #506 from imincik/weekly-update-2024.29

pkgs: weekly update (weekly-update-2024.29)

pkgs/gdal/master-rev.nix

@@ -1,4 +1,4 @@
 {
-  rev = "1b32f9f";
-  hash = "sha256-CwUx3JsQNhXyPZXCGlDT8AkqLraECErxgcAS/r+uHj8=";
+  rev = "dd3396b";
+  hash = "sha256-V0lUwPnZ5wZqdFGjYaOnfmMcDeEfMPkGLWE6BuGiNH4=";
 }

pkgs/geos/default.nix

@@ -12,7 +12,7 @@ stdenv.mkDerivation (finalAttrs: {
   version = "3.12.2";
 
   src = fetchurl {
-    url = "https://download.osgeo.org/geos/${finalAttrs.pname}-${finalAttrs.version}.tar.bz2";
+    url = "https://download.osgeo.org/geos/geos-${finalAttrs.version}.tar.bz2";
     hash = "sha256-NMd3C/AJDuiEiK+Ydn0I53nxJPozQ34Kq+yKvUYJ/sY=";
   };
 

pkgs/grass/default.nix

@@ -23,14 +23,17 @@
 , pkg-config
 , postgresql
 , proj
-, python3Packages
+, python311Packages
 , readline
 , sqlite
 , wxGTK32
 , zlib
 , zstd
 }:
 
+let
+  pyPackages = python311Packages;
+in
 stdenv.mkDerivation (finalAttrs: {
   pname = "grass";
   version = "8.3.2";
@@ -53,7 +56,7 @@ stdenv.mkDerivation (finalAttrs: {
     libmysqlclient # for `mysql_config`
     netcdf # for `nc-config`
     pkg-config
-  ] ++ (with python3Packages; [ python-dateutil numpy wxpython ]);
+  ] ++ (with pyPackages; [ python-dateutil numpy wxpython ]);
 
   buildInputs = [
     blas
@@ -86,7 +89,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   # Correct mysql_config query
   postPatch = ''
-      substituteInPlace configure --replace "--libmysqld-libs" "--libs"
+    substituteInPlace configure --replace "--libmysqld-libs" "--libs"
   '';
 
   configureFlags = [
@@ -127,7 +130,7 @@ stdenv.mkDerivation (finalAttrs: {
   postInstall = ''
     wrapProgram $out/bin/grass \
     --set PYTHONPATH $PYTHONPATH \
-    --set GRASS_PYTHON ${python3Packages.python.interpreter} \
+    --set GRASS_PYTHON ${pyPackages.python.interpreter} \
     --suffix LD_LIBRARY_PATH ':' '${gdal}/lib'
     ln -s $out/grass*/lib $out/lib
     ln -s $out/grass*/include $out/include

pkgs/owslib/default.nix

@@ -1,6 +1,5 @@
 {
   lib,
-  stdenv,
   buildPythonPackage,
   fetchFromGitHub,
 

pkgs/pdal/default.nix

@@ -19,6 +19,7 @@
 , pkg-config
 , postgresql
 , proj
+, sqlite
 , tiledb
 , xercesc
 , zlib
@@ -27,13 +28,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "pdal";
-  version = "2.7.1";
+  version = "2.7.2";
 
   src = fetchFromGitHub {
     owner = "PDAL";
     repo = "PDAL";
     rev = finalAttrs.version;
-    sha256 = "sha256-JoHBxJ0hCWH7ZhmeJk4huT2k0AK5CzIV58NWCjWj5T0=";
+    sha256 = "sha256-ukBZLr/iyYQ68sv9JWrR4YP0ahHfGhytgcWKPzrF3Ps=";
   };
 
   nativeBuildInputs = [
@@ -52,6 +53,7 @@ stdenv.mkDerivation (finalAttrs: {
     openscenegraph
     postgresql
     proj
+    sqlite
     tiledb
     xercesc
     zlib
@@ -87,11 +89,6 @@ stdenv.mkDerivation (finalAttrs: {
   doCheck = true;
 
   disabledTests = [
-    # Failing due to GDAL 3.9 change in coordinates precision.
-    # See: https://github.com/PDAL/PDAL/issues/4403
-    # This test should be re-enabled once https://github.com/PDAL/PDAL/pull/4411
-    # is merged !
-    "pdal_io_ogr_writer_test"
     # Tests failing due to TileDB library implementation, disabled also
     # by upstream CI.
     # See: https://github.com/PDAL/PDAL/blob/bc46bc77f595add4a6d568a1ff923d7fe20f7e74/.github/workflows/linux.yml#L81

pkgs/pdal/nixpkgs/laszip-name.patch

@@ -20,11 +20,3 @@ index c035460..eb96889 100644
      libgeotiff
      libtiff
      libxml2
-@@ -92,7 +92,6 @@ stdenv.mkDerivation (finalAttrs: {
-     # This test should be re-enabled once https://github.com/PDAL/PDAL/pull/4411
-     # is merged !
-     "pdal_io_ogr_writer_test"
--
-     # Tests failing due to TileDB library implementation, disabled also
-     # by upstream CI.
-     # See: https://github.com/PDAL/PDAL/blob/bc46bc77f595add4a6d568a1ff923d7fe20f7e74/.github/workflows/linux.yml#L81

pkgs/qgis/nixpkgs/qgis-ltr-python.patch

@@ -0,0 +1,37 @@
+diff --git b/pkgs/qgis/unwrapped-ltr.nix a/pkgs/qgis/unwrapped-ltr.nix
+index c1d3349..f161741 100644
+--- b/pkgs/qgis/unwrapped-ltr.nix
++++ a/pkgs/qgis/unwrapped-ltr.nix
+@@ -16,6 +16,7 @@
+ , fcgi
+ , flex
+ , geos
++, gdal
+ , grass
+ , gsl
+ , hdf5
+@@ -29,7 +30,7 @@
+ , postgresql
+ , proj
+ , protobuf
+-, python311
++, python3
+ , qca-qt5
+ , qscintilla
+ , qt3d
+@@ -48,13 +49,8 @@
+ }:
+
+ let
+-  py = python311.override {
+-    packageOverrides = self: super: {
+-      pyqt5 = super.pyqt5.override {
+-        withLocation = true;
+-      };
+-    };
+-  };
++  # pyqt5 override was moved to flake.nix
++  py = python3;
+
+   pythonBuildInputs = with py.pkgs; [
+     chardet

pkgs/qgis/nixpkgs/qgis-ltr-unwrapped.patch

@@ -0,0 +1,23 @@
+diff --git b/pkgs/qgis/ltr.nix a/pkgs/qgis/ltr.nix
+index b551fe0..f4ce94a 100644
+--- b/pkgs/qgis/ltr.nix
++++ a/pkgs/qgis/ltr.nix
+@@ -4,14 +4,14 @@
+ , symlinkJoin
+
+ , extraPythonPackages ? (ps: [ ])
++, qgis-ltr-unwrapped
+
+ , libsForQt5
+ }:
+-let
+-  qgis-ltr-unwrapped = libsForQt5.callPackage ./unwrapped-ltr.nix {  };
+-in symlinkJoin rec {
+
+-  inherit (qgis-ltr-unwrapped) version;
++symlinkJoin rec {
++
++  inherit (qgis-ltr-unwrapped) version src;
+   name = "qgis-${version}";
+
+   paths = [ qgis-ltr-unwrapped ];

pkgs/qgis/nixpkgs/qgis-python.patch

@@ -0,0 +1,38 @@
+diff --git b/pkgs/qgis/unwrapped.nix a/pkgs/qgis/unwrapped.nix
+index 850ff7c..3ffd5ef 100644
+--- b/pkgs/qgis/unwrapped.nix
++++ a/pkgs/qgis/unwrapped.nix
+@@ -15,6 +15,7 @@
+ , exiv2
+ , fcgi
+ , flex
++, gdal
+ , geos
+ , grass
+ , gsl
+@@ -29,7 +30,7 @@
+ , postgresql
+ , proj
+ , protobuf
+-, python311
++, python3
+ , qca-qt5
+ , qscintilla
+ , qt3d
+@@ -48,14 +49,8 @@
+ }:
+
+ let
+-  py = python311.override {
+-    packageOverrides = self: super: {
+-      pyqt5 = super.pyqt5.override {
+-        withLocation = true;
+-        withSerialPort = true;
+-      };
+-    };
+-  };
++  # pyqt5 override was moved to flake.nix
++  py = python3;
+
+   pythonBuildInputs = with py.pkgs; [
+     chardet

pkgs/qgis/nixpkgs/qgis-unwrapped.patch

@@ -0,0 +1,23 @@
+diff --git b/pkgs/qgis/default.nix a/pkgs/qgis/default.nix
+index 8b19c70..93d7b6f 100644
+--- b/pkgs/qgis/default.nix
++++ a/pkgs/qgis/default.nix
+@@ -4,14 +4,14 @@
+ , symlinkJoin
+
+ , extraPythonPackages ? (ps: [ ])
++, qgis-unwrapped
+
+ , libsForQt5
+ }:
+-let
+-  qgis-unwrapped = libsForQt5.callPackage ./unwrapped.nix {  };
+-in symlinkJoin rec {
+
+-  inherit (qgis-unwrapped) version;
++symlinkJoin rec {
++
++  inherit (qgis-unwrapped) version src;
+   name = "qgis-${version}";
+
+   paths = [ qgis-unwrapped ];