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鈥檒l occasionally send you account related emails.

Already on GitHub? Sign in to your account

qgis: fix sip and pyqt5-sip compatibility #274408

Merged
merged 1 commit into from
Jan 19, 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.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
31 changes: 31 additions & 0 deletions pkgs/applications/gis/qgis/pyqt5-sip.nix
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
# FIX sip and pyqt5_sip compatibility. See: https://github.com/NixOS/nixpkgs/issues/273561
# Remove this fix in NixOS 24.05.

{ lib
, buildPythonPackage
, fetchPypi
}:

buildPythonPackage rec {
pname = "pyqt5-sip";
version = "12.12.1";

src = fetchPypi {
pname = "PyQt5_sip";
inherit version;
hash = "sha256-j9xuAUir0S2Xeh04KOe3mq6VjoPGy1ra5hSRbYiKaxA=";
};

# There is no test code and the check phase fails with:
# > error: could not create 'PyQt5/sip.cpython-38-x86_64-linux-gnu.so': No such file or directory
doCheck = false;
pythonImportsCheck = ["PyQt5.sip"];

meta = with lib; {
description = "Python bindings for Qt5";
homepage = "https://www.riverbankcomputing.com/software/sip/";
license = licenses.gpl3Only;
platforms = platforms.mesaPlatforms;
maintainers = with maintainers; [ sander ];
};
}
4 changes: 3 additions & 1 deletion pkgs/applications/gis/qgis/unwrapped-ltr.nix
Original file line number Diff line number Diff line change
Expand Up @@ -46,11 +46,13 @@
}:

let

py = python3.override {
packageOverrides = self: super: {
pyqt5 = super.pyqt5.override {
withLocation = true;
# FIX sip and pyqt5_sip compatibility. See: https://github.com/NixOS/nixpkgs/issues/273561
# Remove this fix in NixOS 24.05.
pyqt5_sip = python3.pkgs.callPackage ./pyqt5-sip.nix { };
};
};
};
Expand Down
3 changes: 3 additions & 0 deletions pkgs/applications/gis/qgis/unwrapped.nix
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,9 @@ let
packageOverrides = self: super: {
pyqt5 = super.pyqt5.override {
withLocation = true;
# FIX sip and pyqt5_sip compatibility. See: https://github.com/NixOS/nixpkgs/issues/273561
# Remove this fix in NixOS 24.05.
pyqt5_sip = python3.pkgs.callPackage ./pyqt5-sip.nix { };
};
};
};
Expand Down