From 14b4884f7adb0b89bac98c34bc9e1606ebdc60f1 Mon Sep 17 00:00:00 2001 From: Yueh-Shun Li Date: Sun, 26 Apr 2026 01:36:07 +0800 Subject: [PATCH] plover: init referencing python3Packages.plover with aliases Co-authored-by: Gavin John --- pkgs/by-name/pl/plover/package.nix | 17 +++++++++++++++++ pkgs/development/python-modules/plover/4.nix | 11 ----------- 2 files changed, 17 insertions(+), 11 deletions(-) create mode 100644 pkgs/by-name/pl/plover/package.nix diff --git a/pkgs/by-name/pl/plover/package.nix b/pkgs/by-name/pl/plover/package.nix new file mode 100644 index 000000000000..8753ebb0316c --- /dev/null +++ b/pkgs/by-name/pl/plover/package.nix @@ -0,0 +1,17 @@ +{ + lib, + config, + python3Packages, + # For aliases + plover, +}: +python3Packages.toPythonApplication python3Packages.plover +# Aliases to now-dropped plover.stable and plover.dev +# Added 2026-04-22 +# 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 + stable = throw "plover.stable was renamed. Use plover instead."; # Added 2022-06-05; updated 2026-04-26 +} diff --git a/pkgs/development/python-modules/plover/4.nix b/pkgs/development/python-modules/plover/4.nix index 9c3cd4926213..4d65eb0875eb 100644 --- a/pkgs/development/python-modules/plover/4.nix +++ b/pkgs/development/python-modules/plover/4.nix @@ -1,8 +1,6 @@ { lib, - config, stdenv, - plover, buildPythonPackage, fetchFromGitHub, fetchpatch, @@ -93,12 +91,3 @@ buildPythonPackage rec { broken = stdenv.hostPlatform.isDarwin; }; } -// lib.optionalAttrs config.allowAliases { - # TODO: After 26.05 branch-off, remove these aliases - dev = - if lib.versionOlder "25.05" lib.version then - throw "plover.dev was renamed. Use plover-dev instead." # added 2025-06-05` - else - plover; - stable = throw "plover.stable was renamed. Use plover instead."; # added 2022-06-05; updated 2025-06-27 -}