diff --git a/pkgs/applications/gis/grass/default.nix b/pkgs/applications/gis/grass/default.nix index 4eb10a34d2e24..41d560a4ebd52 100644 --- a/pkgs/applications/gis/grass/default.nix +++ b/pkgs/applications/gis/grass/default.nix @@ -23,7 +23,7 @@ , pkg-config , postgresql , proj -, python3Packages +, python311Packages , readline , sqlite , wxGTK32 @@ -31,6 +31,9 @@ , 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 diff --git a/pkgs/applications/gis/qgis/unwrapped-ltr.nix b/pkgs/applications/gis/qgis/unwrapped-ltr.nix index 3515294150255..c1d334909e1f0 100644 --- a/pkgs/applications/gis/qgis/unwrapped-ltr.nix +++ b/pkgs/applications/gis/qgis/unwrapped-ltr.nix @@ -29,7 +29,7 @@ , postgresql , proj , protobuf -, python3 +, python311 , qca-qt5 , qscintilla , qt3d @@ -48,7 +48,7 @@ }: let - py = python3.override { + py = python311.override { packageOverrides = self: super: { pyqt5 = super.pyqt5.override { withLocation = true; diff --git a/pkgs/applications/gis/qgis/unwrapped.nix b/pkgs/applications/gis/qgis/unwrapped.nix index 3efce9160d051..dfee6b06b598a 100644 --- a/pkgs/applications/gis/qgis/unwrapped.nix +++ b/pkgs/applications/gis/qgis/unwrapped.nix @@ -29,7 +29,7 @@ , postgresql , proj , protobuf -, python3 +, python311 , qca-qt5 , qscintilla , qt3d @@ -48,7 +48,7 @@ }: let - py = python3.override { + py = python311.override { packageOverrides = self: super: { pyqt5 = super.pyqt5.override { withLocation = true;