From 83540a3c4ca8958727fcb95f4c9ab261e6c3a397 Mon Sep 17 00:00:00 2001 From: Guy Chronister Date: Mon, 25 May 2026 10:50:41 -0500 Subject: [PATCH] okteta: migrate to by-name --- .../ok/okteta/package.nix} | 35 +++++++------------ pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 13 insertions(+), 24 deletions(-) rename pkgs/{applications/editors/okteta/default.nix => by-name/ok/okteta/package.nix} (72%) diff --git a/pkgs/applications/editors/okteta/default.nix b/pkgs/by-name/ok/okteta/package.nix similarity index 72% rename from pkgs/applications/editors/okteta/default.nix rename to pkgs/by-name/ok/okteta/package.nix index 05336bb03039..2334c29eb9bd 100644 --- a/pkgs/applications/editors/okteta/default.nix +++ b/pkgs/by-name/ok/okteta/package.nix @@ -3,19 +3,10 @@ stdenv, fetchFromGitLab, cmake, - extra-cmake-modules, - wrapQtAppsHook, shared-mime-info, xz, - qttools, - karchive, - kcmutils, - kconfig, - kconfigwidgets, - kcrash, - knewstuff, - kparts, - qca, + kdePackages, + qt6, }: stdenv.mkDerivation (finalAttrs: { @@ -32,24 +23,24 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ cmake - extra-cmake-modules - wrapQtAppsHook + kdePackages.extra-cmake-modules + qt6.wrapQtAppsHook ]; buildInputs = [ shared-mime-info xz - qttools + qt6.qttools - karchive - kcmutils - kconfig - kconfigwidgets - kcrash - knewstuff - kparts - qca + kdePackages.karchive + kdePackages.kcmutils + kdePackages.kconfig + kdePackages.kconfigwidgets + kdePackages.kcrash + kdePackages.knewstuff + kdePackages.kparts + kdePackages.qca ]; outputs = [ diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 2f9e52e654f5..06b16725a391 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9477,8 +9477,6 @@ with pkgs; ; k3s = k3s_1_35; - okteta = kdePackages.callPackage ../applications/editors/okteta { }; - klayout = qt6Packages.callPackage ../applications/misc/klayout { }; kotatogram-desktop =