From 058460efa4e4fab9502a4967785f2d546ceb23f8 Mon Sep 17 00:00:00 2001 From: K900 Date: Fri, 1 May 2026 18:09:10 +0300 Subject: [PATCH] okteta: 0.26.25 -> 0.26.25-unstable-2026-04-28, build with Qt6 --- pkgs/applications/editors/okteta/default.nix | 47 +++++++++++--------- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 27 insertions(+), 22 deletions(-) diff --git a/pkgs/applications/editors/okteta/default.nix b/pkgs/applications/editors/okteta/default.nix index 9c5e90861df6..05336bb03039 100644 --- a/pkgs/applications/editors/okteta/default.nix +++ b/pkgs/applications/editors/okteta/default.nix @@ -1,50 +1,55 @@ { lib, stdenv, - fetchurl, + fetchFromGitLab, + cmake, extra-cmake-modules, - kdoctools, wrapQtAppsHook, - qtscript, - kconfig, - kinit, + shared-mime-info, + xz, + qttools, karchive, - kcrash, kcmutils, + kconfig, kconfigwidgets, + kcrash, knewstuff, kparts, - qca-qt5, - shared-mime-info, + qca, }: stdenv.mkDerivation (finalAttrs: { pname = "okteta"; - version = "0.26.25"; + version = "0.26.25-unstable-2026-04-28"; - src = fetchurl { - url = "mirror://kde/stable/okteta/${finalAttrs.version}/src/${finalAttrs.pname}-${finalAttrs.version}.tar.xz"; - sha256 = "sha256-K+GJG/SYyzgDDKXbGtAixQJVfBwLj/asP9rIJUpbt2s="; + src = fetchFromGitLab { + domain = "invent.kde.org"; + owner = "utilities"; + repo = "okteta"; + rev = "9ab055f50e7569c9a0bc401be4b5686dc1e61dcc"; + hash = "sha256-1ih0kFS7opA5w1QyB7MQAOYFoSAUPKNM8fRi1G/mq2U="; }; nativeBuildInputs = [ - qtscript + cmake extra-cmake-modules - kdoctools wrapQtAppsHook ]; - buildInputs = [ shared-mime-info ]; - propagatedBuildInputs = [ - kconfig - kinit + buildInputs = [ + shared-mime-info + xz + + qttools + + karchive kcmutils + kconfig kconfigwidgets + kcrash knewstuff kparts - qca-qt5 - karchive - kcrash + qca ]; outputs = [ diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1362cebb6d22..b08f79fff192 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9649,7 +9649,7 @@ with pkgs; ; k3s = k3s_1_35; - okteta = libsForQt5.callPackage ../applications/editors/okteta { }; + okteta = kdePackages.callPackage ../applications/editors/okteta { }; klayout = libsForQt5.callPackage ../applications/misc/klayout { };