From e8e49a39637a5850f85775217a4c42fccb18f1c9 Mon Sep 17 00:00:00 2001 From: Yueh-Shun Li Date: Thu, 7 May 2026 16:44:14 +0800 Subject: [PATCH 1/3] [chore] python3Packages.plover: fix comment typo (cherry picked from commit 3df6649da63e864847973056b4415ec8ea40a37c) --- pkgs/top-level/python-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index d8233e9101ef..1b30c8cf67e2 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -12794,7 +12794,7 @@ self: super: with self; { plotpy = callPackage ../development/python-modules/plotpy { }; # Plover 5 moves from PyQt5 to PySide6, - # which is a backward-incompatible change to praphical plugins. + # which is a backward-incompatible change to graphical plugins. # Use Plover 4 for now (2026-04-26), # as the upstream still warns about this in every Plover 5 release, # List of unsupported plugins: From b19d3d49d5b7fd3a052043eb0246407770b9b20d Mon Sep 17 00:00:00 2001 From: Yueh-Shun Li Date: Thu, 7 May 2026 16:50:53 +0800 Subject: [PATCH 2/3] python3Packages.plover: change reference plover_4 -> plover_5 (cherry picked from commit 5821773664687e3573c24b73dbc1bca8a24c6ca9) --- pkgs/top-level/python-packages.nix | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 1b30c8cf67e2..6f31ae9c35a3 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -12793,13 +12793,16 @@ self: super: with self; { plotpy = callPackage ../development/python-modules/plotpy { }; + # Use Plover 5 as Plover 4 depends on setuptool's pkg_resources to discover plugins, + # which the setuptools upstream deprecated at version 81.0.0 and removed at version 82.0.0 + # Plover 5 has addressed this issue by switching to importlib.meta.distributions() + # + # NOTE: # Plover 5 moves from PyQt5 to PySide6, # which is a backward-incompatible change to graphical plugins. - # Use Plover 4 for now (2026-04-26), - # as the upstream still warns about this in every Plover 5 release, # List of unsupported plugins: # https://github.com/opensteno/plover_plugins_registry/blob/master/unsupported.json - plover = plover_4; + plover = plover_5; plover-dict-commands = callPackage ../development/python-modules/plover-dict-commands { }; From 7b8ab5a90c4b426f8f3cfcf1a493cb66ed20b9c4 Mon Sep 17 00:00:00 2001 From: Yueh-Shun Li Date: Thu, 7 May 2026 17:05:57 +0800 Subject: [PATCH 3/3] plover.dev: aliase to plover_4 (cherry picked from commit 6b416655a3d2f19dc9cfac8ceeaa4d8265829ef1) --- pkgs/by-name/pl/plover/package.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/pl/plover/package.nix b/pkgs/by-name/pl/plover/package.nix index 8753ebb0316c..8daff71626ed 100644 --- a/pkgs/by-name/pl/plover/package.nix +++ b/pkgs/by-name/pl/plover/package.nix @@ -3,7 +3,7 @@ config, python3Packages, # For aliases - plover, + plover_4, }: python3Packages.toPythonApplication python3Packages.plover # Aliases to now-dropped plover.stable and plover.dev @@ -11,7 +11,8 @@ python3Packages.toPythonApplication python3Packages.plover # TODO(@ShamrockLee): remove after Nixpkgs 25.11 EOL // lib.optionalAttrs (config.allowAliases && !(lib.oldestSupportedReleaseIsAtLeast 2605)) { dev = - lib.throwIf (lib.oldestSupportedReleaseIsAtLeast 2511) "plover.dev was renamed. Use plover instead." - plover; # Added 2026-04-26 + lib.throwIf (lib.oldestSupportedReleaseIsAtLeast 2511) + "plover.dev was renamed. Use plover, plover_5, or plover_4 instead." + plover_4; # Added 2026-05-07 stable = throw "plover.stable was renamed. Use plover instead."; # Added 2022-06-05; updated 2026-04-26 }