From d061af0b7e876c8536c12a050170e04a55dc3a00 Mon Sep 17 00:00:00 2001 From: OPNA2608 Date: Sat, 11 Oct 2025 00:24:47 +0200 Subject: [PATCH] lomiri.lomiri-push-qml: 0-unstable-2022-09-15 -> 0.3.1 Includes fix for CMake 4 compatibility. Also add an updateScript. --- .../lomiri/qml/lomiri-push-qml/default.nix | 19 ++++++------------- 1 file changed, 6 insertions(+), 13 deletions(-) diff --git a/pkgs/desktops/lomiri/qml/lomiri-push-qml/default.nix b/pkgs/desktops/lomiri/qml/lomiri-push-qml/default.nix index e6d9ff6ba3a3..b7621ad5cde1 100644 --- a/pkgs/desktops/lomiri/qml/lomiri-push-qml/default.nix +++ b/pkgs/desktops/lomiri/qml/lomiri-push-qml/default.nix @@ -2,7 +2,7 @@ stdenv, lib, fetchFromGitLab, - fetchpatch, + gitUpdater, cmake, lomiri-api, lomiri-indicator-network, @@ -13,24 +13,15 @@ stdenv.mkDerivation (finalAttrs: { pname = "lomiri-push-qml"; - version = "0-unstable-2022-09-15"; + version = "0.3.1"; src = fetchFromGitLab { owner = "ubports"; repo = "development/core/lomiri-push-qml"; - rev = "6f87ee5cf92e2af0e0ce672835e71704e236b8c0"; - hash = "sha256-ezLcQRJ7Sq/TVbeGJL3Vq2lzBe7StRRCrWXZs2CCUX8="; + tag = finalAttrs.version; + hash = "sha256-1HJkcAe5ixqmEACy4mSk5dSCPf4FsY3tzH6v09SSH+M="; }; - patches = [ - # Remove when https://gitlab.com/ubports/development/core/lomiri-push-qml/-/merge_requests/6 merged - (fetchpatch { - name = "0001-lomiri-push-qml-Stop-using-qt5_use_modules.patch"; - url = "https://gitlab.com/ubports/development/core/lomiri-push-qml/-/commit/a4268c98b9f50fdd52da69c173d377f78ea93104.patch"; - hash = "sha256-OijTB5+I9/wabT7dX+DkvoEROKzAUIKhBZkkhqq5Oig="; - }) - ]; - postPatch = '' # Queries QMake for QML install location, returns QtBase build path substituteInPlace src/*/PushNotifications/CMakeLists.txt \ @@ -64,6 +55,8 @@ stdenv.mkDerivation (finalAttrs: { export QT_PLUGIN_PATH=${lib.getBin qtbase}/${qtbase.qtPluginPrefix} ''; + passthru.updateScript = gitUpdater { }; + meta = with lib; { description = "Lomiri Push Notifications QML plugin"; homepage = "https://gitlab.com/ubports/development/core/lomiri-push-qml";