From a0d8db6c7e11367267d3cec7771a20e2592c5f3a Mon Sep 17 00:00:00 2001 From: K900 Date: Fri, 5 Apr 2024 14:17:19 +0300 Subject: [PATCH] ktailctl: 0.9.0 -> 0.16.0, qt6ify --- .../networking/ktailctl/default.nix | 19 +++++++++++-------- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 12 insertions(+), 9 deletions(-) diff --git a/pkgs/applications/networking/ktailctl/default.nix b/pkgs/applications/networking/ktailctl/default.nix index 2b0e870ed485..8e5e9abb0fb4 100644 --- a/pkgs/applications/networking/ktailctl/default.nix +++ b/pkgs/applications/networking/ktailctl/default.nix @@ -8,31 +8,33 @@ , go , wrapQtAppsHook , qtbase -, qtquickcontrols2 +, qtdeclarative +, qtsvg , kconfig , kcoreaddons , kguiaddons , ki18n -, kirigami2 +, kirigami , kirigami-addons , knotifications +, nlohmann_json }: let - version = "0.9.0"; + version = "0.16.0"; src = fetchFromGitHub { owner = "f-koehler"; repo = "KTailctl"; rev = "v${version}"; - hash = "sha256-nY6DEHkDVWIlvc64smXb9KshrhNgNLKiilYydbMKCqc="; + hash = "sha256-fIx6XfNGK+jDpeaoCzTKwv3J01yWoHOgWxjbwTGVK1U="; }; goDeps = (buildGoModule { pname = "tailwrap"; inherit src version; modRoot = "tailwrap"; - vendorHash = "sha256-Y9xhoTf3vCtiNi5qOPg020EQmASo58BZI3rAoUEC8qE="; + vendorHash = "sha256-egTzSdOKrhdEBKarIfROxZUsxbnR9F1JDbdoKzGf9UM="; }).goModules; in stdenv.mkDerivation { @@ -63,14 +65,15 @@ stdenv.mkDerivation { buildInputs = [ qtbase - qtquickcontrols2 + qtdeclarative + qtsvg kconfig kcoreaddons kguiaddons ki18n - kirigami2 - kirigami-addons + kirigami knotifications + nlohmann_json ]; meta = with lib; { diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5717c09857c4..99d55ce43cb6 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10240,7 +10240,7 @@ with pkgs; keama = callPackage ../tools/networking/keama { }; - ktailctl = libsForQt5.callPackage ../applications/networking/ktailctl {}; + ktailctl = kdePackages.callPackage ../applications/networking/ktailctl {}; iredis = callPackage ../tools/admin/iredis { };