diff --git a/pkgs/applications/editors/formiko/default.nix b/pkgs/by-name/fo/formiko/package.nix similarity index 65% rename from pkgs/applications/editors/formiko/default.nix rename to pkgs/by-name/fo/formiko/package.nix index d2f0fc1791b6..cc639774d6ce 100644 --- a/pkgs/applications/editors/formiko/default.nix +++ b/pkgs/by-name/fo/formiko/package.nix @@ -1,46 +1,52 @@ { lib, - buildPythonApplication, + python3Packages, fetchFromGitHub, wrapGAppsHook3, gobject-introspection, gtk3, - docutils, - gtksourceview, + gtksourceview4, gtkspell3, librsvg, - pygobject3, webkitgtk_4_1, }: -buildPythonApplication (finalAttrs: { +python3Packages.buildPythonApplication (finalAttrs: { pname = "formiko"; version = "1.5.0"; - format = "setuptools"; + pyproject = true; src = fetchFromGitHub { owner = "ondratu"; repo = "formiko"; tag = finalAttrs.version; - sha256 = "sha256-slfpkckCvxHJ/jlBP7QAhzaf9TAcS6biDQBZcBTyTKI="; + hash = "sha256-slfpkckCvxHJ/jlBP7QAhzaf9TAcS6biDQBZcBTyTKI="; }; + build-system = [ + python3Packages.setuptools + ]; + nativeBuildInputs = [ wrapGAppsHook3 gobject-introspection gtk3 ]; - propagatedBuildInputs = [ - docutils + + buildInputs = [ gobject-introspection gtk3 - gtksourceview + gtksourceview4 gtkspell3 librsvg - pygobject3 webkitgtk_4_1 ]; + dependencies = [ + python3Packages.pygobject3 + python3Packages.docutils + ]; + # Needs a display doCheck = false; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8259d7508ad5..764a3e9b7377 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9491,12 +9491,6 @@ with pkgs; pname = "floorp-bin"; }; - formiko = - with python3Packages; - callPackage ../applications/editors/formiko { - inherit buildPythonApplication; - }; - inherit ({ freeoffice = callPackage ../applications/office/softmaker/freeoffice.nix { };