diff --git a/pkgs/applications/misc/plover/default.nix b/pkgs/development/python-modules/plover/4.nix similarity index 82% rename from pkgs/applications/misc/plover/default.nix rename to pkgs/development/python-modules/plover/4.nix index af6620404e52..9c3cd4926213 100644 --- a/pkgs/applications/misc/plover/default.nix +++ b/pkgs/development/python-modules/plover/4.nix @@ -3,36 +3,27 @@ config, stdenv, plover, - buildPythonPackage ? python3Packages.buildPythonPackage, + buildPythonPackage, fetchFromGitHub, fetchpatch, versionCheckHook, - python3Packages, - libsForQt5, + appdirs, + babel, + evdev, + mock, + pyqt5, + pyserial, + pytestCheckHook, + pytest-qt, + plover-stroke, + rtf-tokenize, + setuptools, + wcwidth, + wheel, + xlib, + wrapQtAppsHook, }: -let - inherit (python3Packages) - buildPythonPackage - appdirs - babel - evdev - mock - pyqt5 - pyserial - pytestCheckHook - pytest-qt - plover-stroke - rtf-tokenize - setuptools - wcwidth - wheel - xlib - ; - inherit (libsForQt5) - wrapQtAppsHook - ; -in buildPythonPackage rec { pname = "plover"; version = "4.0.2"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 04f00495197a..7eb9ca19ac99 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10132,8 +10132,6 @@ with pkgs; plex-mpv-shim = python3Packages.callPackage ../applications/video/plex-mpv-shim { }; - plover = callPackage ../applications/misc/plover { }; - # perhaps there are better apps for this task? It's how I had configured my previous system. # And I don't want to rewrite all rules profanity = callPackage ../applications/networking/instant-messengers/profanity ( diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 455b6d84bcf2..50ad5bc32506 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -12666,6 +12666,10 @@ self: super: with self; { plover-stroke = callPackage ../development/python-modules/plover-stroke { }; + plover_4 = callPackage ../development/python-modules/plover/4.nix { + inherit (pkgs.libsForQt5) wrapQtAppsHook; + }; + pluggy = callPackage ../development/python-modules/pluggy { }; pluginbase = callPackage ../development/python-modules/pluginbase { };