Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

grass: pin to python 3.11 #325731

Merged
merged 3 commits into from
Jul 10, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 7 additions & 4 deletions pkgs/applications/gis/grass/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -23,14 +23,17 @@
, pkg-config
, postgresql
, proj
, python3Packages
fpletz marked this conversation as resolved.
Show resolved Hide resolved
, python311Packages
, readline
, sqlite
, wxGTK32
, zlib
, zstd
}:

let
pyPackages = python311Packages;
in
stdenv.mkDerivation (finalAttrs: {
pname = "grass";
version = "8.3.2";
Expand All @@ -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
Expand Down Expand Up @@ -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 = [
Expand Down Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions pkgs/applications/gis/qgis/unwrapped-ltr.nix
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
, postgresql
, proj
, protobuf
, python3
, python311
globin marked this conversation as resolved.
Show resolved Hide resolved
, qca-qt5
, qscintilla
, qt3d
Expand All @@ -48,7 +48,7 @@
}:

let
py = python3.override {
py = python311.override {
packageOverrides = self: super: {
pyqt5 = super.pyqt5.override {
withLocation = true;
Expand Down
4 changes: 2 additions & 2 deletions pkgs/applications/gis/qgis/unwrapped.nix
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
, postgresql
, proj
, protobuf
, python3
globin marked this conversation as resolved.
Show resolved Hide resolved
, python311
, qca-qt5
, qscintilla
, qt3d
Expand All @@ -48,7 +48,7 @@
}:

let
py = python3.override {
py = python311.override {
packageOverrides = self: super: {
pyqt5 = super.pyqt5.override {
withLocation = true;
Expand Down