diff options
| author | nixpkgs-ci[bot] <190413589+nixpkgs-ci[bot]@users.noreply.github.com> | 2025-03-12 15:18:04 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-03-12 15:18:04 +0000 |
| commit | ba25dfd627ce708cdecbbb2a8a97e4696efc805e (patch) | |
| tree | 65c82f4d065015a2bd9f2146a9b9533a78fe2a54 /pkgs/development/python-modules | |
| parent | 715bf028cbae97c4822c598c1ae967b3e97288b9 (diff) | |
| parent | ae9083275692f28b28a5f02a0191afb951d62e92 (diff) | |
Merge master into staging-next
Diffstat (limited to 'pkgs/development/python-modules')
4 files changed, 16 insertions, 6 deletions
diff --git a/pkgs/development/python-modules/pyqt/6.x.nix b/pkgs/development/python-modules/pyqt/6.x.nix index eba98a79c9c8..ad7ee1e1ff61 100644 --- a/pkgs/development/python-modules/pyqt/6.x.nix +++ b/pkgs/development/python-modules/pyqt/6.x.nix @@ -38,8 +38,7 @@ buildPythonPackage rec { patches = [ # Fix some wrong assumptions by ./project.py # TODO: figure out how to send this upstream - # FIXME: make a version for PyQt6? - # ./pyqt5-fix-dbus-mainloop-support.patch + ./pyqt6-fix-dbus-mainloop-support.patch # confirm license when installing via pyqt6_sip ./pyqt5-confirm-license.patch # Fix build with Qt 6.8.2 diff --git a/pkgs/development/python-modules/pyqt/pyqt6-fix-dbus-mainloop-support.patch b/pkgs/development/python-modules/pyqt/pyqt6-fix-dbus-mainloop-support.patch new file mode 100644 index 000000000000..382f37163326 --- /dev/null +++ b/pkgs/development/python-modules/pyqt/pyqt6-fix-dbus-mainloop-support.patch @@ -0,0 +1,11 @@ +--- a/project.py ++++ b/project.py +@@ -247,7 +247,7 @@ + dbus_lib_dirs = [] + dbus_libs = [] + +- args = ['pkg-config', '--cflags-only-I', '--libs dbus-1'] ++ args = ['pkg-config', '--cflags-only-I', '--libs dbus-1', 'dbus-python'] + + for line in self.read_command_pipe(args, fatal=False): + for flag in line.strip().split(): diff --git a/pkgs/development/python-modules/semchunk/default.nix b/pkgs/development/python-modules/semchunk/default.nix index 73f2400cf01e..ff8002361d49 100644 --- a/pkgs/development/python-modules/semchunk/default.nix +++ b/pkgs/development/python-modules/semchunk/default.nix @@ -9,12 +9,12 @@ buildPythonPackage rec { pname = "semchunk"; - version = "3.1.1"; + version = "3.1.2"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-c4FwgDVheAHfokbIoJYCBCpcK5w9NZRDFtoi1SOMv2s="; + hash = "sha256-JF/7/sj/IJ6gwtTIQ1BCb6jUYKJaRgzB7Y7rNrtjKVw="; }; build-system = [ diff --git a/pkgs/development/python-modules/simplesqlite/default.nix b/pkgs/development/python-modules/simplesqlite/default.nix index 7272c8866184..48ba62e46612 100644 --- a/pkgs/development/python-modules/simplesqlite/default.nix +++ b/pkgs/development/python-modules/simplesqlite/default.nix @@ -14,14 +14,14 @@ buildPythonPackage rec { pname = "SimpleSQLite"; - version = "1.5.3"; + version = "1.5.4"; pyproject = true; src = fetchFromGitHub { owner = "thombashi"; repo = "SimpleSQLite"; tag = "v${version}"; - hash = "sha256-jwty2c8xelLU/m73aodHBj9V9jSw6jjJI7HIzqDTy3A="; + hash = "sha256-PObyZmmECxp6keRymYFGi4Uf07yNHu6rUIqSrRx2bPE="; }; nativeBuildInputs = [ setuptools ]; |