From 11305d5df56405191cc24457fc8010f740912d2b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=A9clairevoyant?= <848000+eclairevoyant@users.noreply.github.com> Date: Thu, 30 Apr 2026 00:38:30 -0400 Subject: [PATCH 1/2] plover_5: 5.0.0.dev2 -> 5.3.0 --- pkgs/development/python-modules/plover/5.nix | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/plover/5.nix b/pkgs/development/python-modules/plover/5.nix index 460a7e8fb14e..ce411a70335d 100644 --- a/pkgs/development/python-modules/plover/5.nix +++ b/pkgs/development/python-modules/plover/5.nix @@ -28,20 +28,22 @@ xlib, qtbase, wrapQtAppsHook, + hidapi, + xkbcommon, }: buildPythonPackage (finalAttrs: { __structuredAttrs = true; pname = "plover"; - version = "5.0.0.dev2"; + version = "5.3.0"; pyproject = true; src = fetchFromGitHub { owner = "openstenoproject"; repo = "plover"; tag = "v${finalAttrs.version}"; - hash = "sha256-PZwxVrdQPhgbj+YmWZIUETngeJGs6IQty0hY43tLQO0="; + hash = "sha256-1NpZmUDq806geKANqswPYglHwInxum/c/Hxq7JhTpbc="; }; # pythonRelaxDeps seemingly doesn't work here @@ -50,6 +52,8 @@ buildPythonPackage (finalAttrs: { sed -i /PySide6-Essentials/d pyproject.toml ''; + pythonRelaxDeps = [ "xkbcommon" ]; + build-system = [ babel setuptools @@ -72,6 +76,7 @@ buildPythonPackage (finalAttrs: { dependencies = [ appdirs evdev + hidapi packaging pkginfo psutil @@ -85,6 +90,7 @@ buildPythonPackage (finalAttrs: { rtf-tokenize setuptools wcwidth + xkbcommon xlib ] ++ readme-renderer.optional-dependencies.md; @@ -103,8 +109,10 @@ buildPythonPackage (finalAttrs: { mock ]; - # Segfaults?! - disabledTestPaths = [ "test/gui_qt/test_dictionaries_widget.py" ]; + disabledTestPaths = [ + "test/gui_qt/test_dictionaries_widget.py" # segfaults + "test/gui_qt/test_i18n_files.py" # babel errors + ]; preFixup = '' makeWrapperArgs+=("''${qtWrapperArgs[@]}") From 47f45a7fb4abd206057f0d0ddc3013930787e378 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=A9clairevoyant?= <848000+eclairevoyant@users.noreply.github.com> Date: Wed, 6 May 2026 18:13:44 -0400 Subject: [PATCH 2/2] plover_5: fix darwin build --- pkgs/development/python-modules/plover/5.nix | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/plover/5.nix b/pkgs/development/python-modules/plover/5.nix index ce411a70335d..1abbf78609e9 100644 --- a/pkgs/development/python-modules/plover/5.nix +++ b/pkgs/development/python-modules/plover/5.nix @@ -30,6 +30,10 @@ wrapQtAppsHook, hidapi, xkbcommon, + pyobjc-framework-Quartz, + pyobjc-framework-Cocoa, + appnope, + pyobjc-core, }: buildPythonPackage (finalAttrs: { @@ -75,7 +79,6 @@ buildPythonPackage (finalAttrs: { ]; dependencies = [ appdirs - evdev hidapi packaging pkginfo @@ -93,7 +96,14 @@ buildPythonPackage (finalAttrs: { xkbcommon xlib ] - ++ readme-renderer.optional-dependencies.md; + ++ readme-renderer.optional-dependencies.md + ++ lib.optionals stdenv.hostPlatform.isLinux [ evdev ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ + appnope + pyobjc-core + pyobjc-framework-Cocoa + pyobjc-framework-Quartz + ]; nativeBuildInputs = [ wrapQtAppsHook ]; @@ -134,6 +144,5 @@ buildPythonPackage (finalAttrs: { ]; license = lib.licenses.gpl2Plus; platforms = lib.platforms.unix; - broken = stdenv.hostPlatform.isDarwin; }; })