From 36361138abfe203bb8f72001671f4dd7123478c4 Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Fri, 11 Jul 2025 22:21:28 -0500 Subject: [PATCH 1/2] kdePackages.kquickimageedit: 0.3.0 -> 0.5.1 --- .../libraries/kquickimageedit/0.3.0.nix | 37 +++++++++++++++++++ .../libraries/kquickimageedit/default.nix | 7 ++-- pkgs/top-level/qt5-packages.nix | 2 +- 3 files changed, 42 insertions(+), 4 deletions(-) create mode 100644 pkgs/development/libraries/kquickimageedit/0.3.0.nix diff --git a/pkgs/development/libraries/kquickimageedit/0.3.0.nix b/pkgs/development/libraries/kquickimageedit/0.3.0.nix new file mode 100644 index 000000000000..358105ed2c1b --- /dev/null +++ b/pkgs/development/libraries/kquickimageedit/0.3.0.nix @@ -0,0 +1,37 @@ +{ + lib, + stdenv, + fetchFromGitLab, + extra-cmake-modules, + qtbase, + qtdeclarative, +}: + +stdenv.mkDerivation rec { + pname = "kquickimageeditor"; + version = "0.3.0"; + + src = fetchFromGitLab { + domain = "invent.kde.org"; + owner = "libraries"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-+BByt07HMb4u6j9bVZqkUPvyRaElKvJ2MjKlPakL87E="; + }; + + nativeBuildInputs = [ extra-cmake-modules ]; + buildInputs = [ + qtbase + qtdeclarative + ]; + cmakeFlags = [ "-DQT_MAJOR_VERSION=${lib.versions.major qtbase.version}" ]; + dontWrapQtApps = true; + + meta = with lib; { + description = "Set of QtQuick components providing basic image editing capabilities"; + homepage = "https://invent.kde.org/libraries/kquickimageeditor"; + license = licenses.lgpl21Plus; + platforms = platforms.unix; + badPlatforms = platforms.darwin; + }; +} diff --git a/pkgs/development/libraries/kquickimageedit/default.nix b/pkgs/development/libraries/kquickimageedit/default.nix index 358105ed2c1b..6b7950d4fd8b 100644 --- a/pkgs/development/libraries/kquickimageedit/default.nix +++ b/pkgs/development/libraries/kquickimageedit/default.nix @@ -3,28 +3,29 @@ stdenv, fetchFromGitLab, extra-cmake-modules, + kdePackages, qtbase, qtdeclarative, }: stdenv.mkDerivation rec { pname = "kquickimageeditor"; - version = "0.3.0"; + version = "0.5.1"; src = fetchFromGitLab { domain = "invent.kde.org"; owner = "libraries"; repo = pname; rev = "v${version}"; - sha256 = "sha256-+BByt07HMb4u6j9bVZqkUPvyRaElKvJ2MjKlPakL87E="; + sha256 = "sha256-8TJBg42E9lNbLpihjtc5Z/drmmSGQmic8yO45yxSNQ4="; }; nativeBuildInputs = [ extra-cmake-modules ]; buildInputs = [ + kdePackages.kirigami qtbase qtdeclarative ]; - cmakeFlags = [ "-DQT_MAJOR_VERSION=${lib.versions.major qtbase.version}" ]; dontWrapQtApps = true; meta = with lib; { diff --git a/pkgs/top-level/qt5-packages.nix b/pkgs/top-level/qt5-packages.nix index 0e635efa2316..e4d3d4582ab0 100644 --- a/pkgs/top-level/qt5-packages.nix +++ b/pkgs/top-level/qt5-packages.nix @@ -174,7 +174,7 @@ makeScopeWithSplicing' { kreport = callPackage ../development/libraries/kreport { }; - kquickimageedit = callPackage ../development/libraries/kquickimageedit { }; + kquickimageedit = callPackage ../development/libraries/kquickimageedit/0.3.0.nix { }; kuserfeedback = callPackage ../development/libraries/kuserfeedback { }; From 1112944ee3b09625112b3e57985c4275cac0da68 Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Fri, 11 Jul 2025 22:21:34 -0500 Subject: [PATCH 2/2] kaidan: 0.11.0 -> 0.12.2 --- pkgs/by-name/ka/kaidan/package.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ka/kaidan/package.nix b/pkgs/by-name/ka/kaidan/package.nix index 396212ad3de8..95beeba72cf8 100644 --- a/pkgs/by-name/ka/kaidan/package.nix +++ b/pkgs/by-name/ka/kaidan/package.nix @@ -6,6 +6,7 @@ extra-cmake-modules, pkg-config, kdePackages, + kdsingleapplication, zxing-cpp, qxmpp, gst_all_1, @@ -14,14 +15,14 @@ stdenv.mkDerivation (finalAttrs: { pname = "kaidan"; - version = "0.11.0"; + version = "0.12.2"; src = fetchFromGitLab { domain = "invent.kde.org"; owner = "network"; repo = "kaidan"; tag = "v${finalAttrs.version}"; - hash = "sha256-8pC4vINeKSYY+LlVgCXUtBq9UjraPdTikBOwLBLeQ3Y="; + hash = "sha256-+9L1NuyHnyX7yThC3LGqKJd9XU8Mo7NAdnGoJSdq4TM="; }; nativeBuildInputs = [ @@ -44,6 +45,7 @@ stdenv.mkDerivation (finalAttrs: { kdePackages.qtlocation kdePackages.qqc2-desktop-style kdePackages.sonnet + kdsingleapplication zxing-cpp qxmpp gst_all_1.gstreamer