From 43a7b570f6331f2a229bfe2f361768da1c9577ce Mon Sep 17 00:00:00 2001 From: K900 Date: Sun, 26 Apr 2026 15:52:00 +0300 Subject: [PATCH] kronometer: 2.3.0 -> 2.3.0-unstable-2026-04-06, build with Qt6 --- pkgs/tools/misc/kronometer/default.nix | 47 +++++++++++++------------- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 25 insertions(+), 24 deletions(-) diff --git a/pkgs/tools/misc/kronometer/default.nix b/pkgs/tools/misc/kronometer/default.nix index 812128c0c029..bc24c8869673 100644 --- a/pkgs/tools/misc/kronometer/default.nix +++ b/pkgs/tools/misc/kronometer/default.nix @@ -1,30 +1,41 @@ { - fetchurl, + fetchFromGitLab, stdenv, - fetchpatch, lib, + cmake, extra-cmake-modules, kdoctools, wrapQtAppsHook, kconfig, kcrash, - kinit, + kwidgetsaddons, + kxmlgui, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "kronometer"; - version = "2.3.0"; + version = "2.3.0-unstable-2026-04-06"; - src = fetchurl { - url = "mirror://kde/stable/kronometer/${version}/src/kronometer-${version}.tar.xz"; - sha256 = "sha256-dbnhom8PRo0Bay3DzS2P0xQSrJaMXD51UadQL3z6xHY="; + src = fetchFromGitLab { + domain = "invent.kde.org"; + owner = "utilities"; + repo = "kronometer"; + rev = "ca1e662f4e58540bd072982103204fa1418f5657"; + hash = "sha256-IhKlFGxUqr7wKcNKnRA6gK9QJeR0QyQaSwYlIsr0wyE="; }; - patches = [ - (fetchpatch { - url = "https://invent.kde.org/utilities/kronometer/-/commit/949f1dccd48f4a1e3068e24d241c5ce73fe2ab8f.patch"; - hash = "sha256-zv9ty25vQXr3xB1S7QmXx3YIouOVUoMpdZ9gHBD1gMQ="; - }) + nativeBuildInputs = [ + cmake + extra-cmake-modules + kdoctools + wrapQtAppsHook + ]; + + buildInputs = [ + kconfig + kcrash + kwidgetsaddons + kxmlgui ]; meta = { @@ -34,14 +45,4 @@ stdenv.mkDerivation rec { maintainers = with lib.maintainers; [ peterhoeg ]; mainProgram = "kronometer"; }; - nativeBuildInputs = [ - extra-cmake-modules - kdoctools - wrapQtAppsHook - ]; - propagatedBuildInputs = [ - kconfig - kcrash - kinit - ]; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 390738b02649..96bb87875af1 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2631,7 +2631,7 @@ with pkgs; inherit (darwin) sigtool; }; - kronometer = libsForQt5.callPackage ../tools/misc/kronometer { }; + kronometer = kdePackages.callPackage ../tools/misc/kronometer { }; kwalletcli = libsForQt5.callPackage ../tools/security/kwalletcli { };