Merge master into staging-next

This commit is contained in:
nixpkgs-ci[bot]
2025-01-16 06:10:38 +00:00
committed by GitHub
@@ -1,36 +1,38 @@
{
lib,
stdenv,
fetchFromGitHub,
buildGo123Module,
cmake,
extra-cmake-modules,
fetchFromGitHub,
git,
go_1_23,
wrapQtAppsHook,
qtbase,
qtdeclarative,
qtsvg,
qtwayland,
kconfig,
kcoreaddons,
kdbusaddons,
kguiaddons,
ki18n,
kirigami,
kirigami-addons,
knotifications,
kwindowsystem,
lib,
nlohmann_json,
qqc2-desktop-style,
qtbase,
qtdeclarative,
qtsvg,
qtwayland,
stdenv,
wrapQtAppsHook,
}:
let
version = "0.18.2";
version = "0.19.0";
src = fetchFromGitHub {
owner = "f-koehler";
repo = "KTailctl";
rev = "v${version}";
hash = "sha256-nxYgpIUNgWhWnrd5rqSH2r1QKhWPJwxlIQl6F9PmjpU=";
hash = "sha256-tKdzTfqKCSRf/cPw3AcvpuZ3ETQYSKm98r5Py14aC9w=";
};
goDeps =
@@ -38,7 +40,7 @@ let
pname = "ktailctl-go-wrapper";
inherit src version;
modRoot = "src/wrapper";
vendorHash = "sha256-UjgHfR+MJ8ROqOPIM0ZkqgFGVEkw8gKYlVQ6oxoIcgE=";
vendorHash = "sha256-xe2LUdh/F3ATRi2+5UbfLGAMgDnYj/J1ZIaB1lMPIkk=";
}).goModules;
in
stdenv.mkDerivation {
@@ -68,19 +70,21 @@ stdenv.mkDerivation {
];
buildInputs = [
qtbase
qtdeclarative
qtsvg
qtwayland
kconfig
kcoreaddons
kdbusaddons
kguiaddons
ki18n
kirigami
kirigami-addons
knotifications
kwindowsystem
nlohmann_json
qqc2-desktop-style
qtbase
qtdeclarative
qtsvg
qtwayland
];
meta = with lib; {