From fa581fb67486c5910177d79d4115b441f0899409 Mon Sep 17 00:00:00 2001 From: Aliaksandr Date: Sat, 3 Jan 2026 03:06:49 +0200 Subject: [PATCH] retext: migrate to by-name --- .../re/retext/package.nix} | 23 ++++++++----------- pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 10 insertions(+), 15 deletions(-) rename pkgs/{applications/editors/retext/default.nix => by-name/re/retext/package.nix} (85%) diff --git a/pkgs/applications/editors/retext/default.nix b/pkgs/by-name/re/retext/package.nix similarity index 85% rename from pkgs/applications/editors/retext/default.nix rename to pkgs/by-name/re/retext/package.nix index 5bd6ace5f54f..1bf3d35234bb 100644 --- a/pkgs/applications/editors/retext/default.nix +++ b/pkgs/by-name/re/retext/package.nix @@ -1,12 +1,9 @@ { lib, - python3, + python3Packages, fetchzip, fetchFromGitHub, - wrapQtAppsHook, - qtbase, - qttools, - qtsvg, + qt6, buildEnv, aspellDicts, # Use `lib.collect lib.isDerivation aspellDicts;` to make all dictionaries @@ -17,7 +14,7 @@ ], }: -python3.pkgs.buildPythonApplication rec { +python3Packages.buildPythonApplication rec { pname = "retext"; version = "8.1.0"; pyproject = true; @@ -34,19 +31,19 @@ python3.pkgs.buildPythonApplication rec { hash = "sha256-nqKAUg9nTzGPPxr80KTn6JX9JgCUJwpcwp8aOIlcxPY="; }; - build-system = with python3.pkgs; [ setuptools ]; + build-system = with python3Packages; [ setuptools ]; nativeBuildInputs = [ - wrapQtAppsHook - qttools.dev + qt6.wrapQtAppsHook + qt6.qttools.dev ]; buildInputs = [ - qtbase - qtsvg + qt6.qtbase + qt6.qtsvg ]; - dependencies = with python3.pkgs; [ + dependencies = with python3Packages; [ chardet docutils markdown @@ -81,7 +78,7 @@ python3.pkgs.buildPythonApplication rec { }" ) - cp ${toolbarIcons}/* $out/${python3.pkgs.python.sitePackages}/ReText/icons + cp ${toolbarIcons}/* $out/${python3Packages.python.sitePackages}/ReText/icons substituteInPlace $out/share/applications/me.mitya57.ReText.desktop \ --replace-fail "Exec=retext-${version}.data/scripts/retext %F" "Exec=retext %F" \ diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 2129725b48b2..d232b88e9c88 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3485,8 +3485,6 @@ with pkgs; ratarmount = with python3Packages; toPythonApplication ratarmount; - retext = qt6Packages.callPackage ../applications/editors/retext { }; - inherit (callPackage ../tools/security/rekor { }) rekor-cli rekor-server