From d555d8ed904eb00ccb08923bd3a4055105593b24 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 4 Feb 2026 15:55:33 +0100 Subject: [PATCH] lomiri.lomiri-push-qml: 0.3.1 -> 0.4.0 --- pkgs/desktops/lomiri/qml/lomiri-push-qml/default.nix | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/pkgs/desktops/lomiri/qml/lomiri-push-qml/default.nix b/pkgs/desktops/lomiri/qml/lomiri-push-qml/default.nix index b870545ae031..25e59f222ec9 100644 --- a/pkgs/desktops/lomiri/qml/lomiri-push-qml/default.nix +++ b/pkgs/desktops/lomiri/qml/lomiri-push-qml/default.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "lomiri-push-qml"; - version = "0.3.1"; + version = "0.4.0"; src = fetchFromGitLab { owner = "ubports"; repo = "development/core/lomiri-push-qml"; tag = finalAttrs.version; - hash = "sha256-1HJkcAe5ixqmEACy4mSk5dSCPf4FsY3tzH6v09SSH+M="; + hash = "sha256-QpkW/fbl0Px5HsKfz/gv+D1S+iSpMZM8TiZCuAq1myk="; }; postPatch = '' @@ -46,8 +46,8 @@ stdenv.mkDerivation (finalAttrs: { dontWrapQtApps = true; cmakeFlags = [ - # In case anything still depends on deprecated hints - (lib.cmakeBool "ENABLE_UBUNTU_COMPAT" true) + (lib.cmakeBool "ENABLE_QT6" (lib.strings.versionAtLeast qtbase.version "6")) + (lib.cmakeBool "ENABLE_UBUNTU_COMPAT" (!lib.strings.versionAtLeast qtbase.version "6")) ]; preBuild = '' @@ -60,7 +60,9 @@ stdenv.mkDerivation (finalAttrs: { meta = { description = "Lomiri Push Notifications QML plugin"; homepage = "https://gitlab.com/ubports/development/core/lomiri-push-qml"; - # License file indicates gpl3Only, but de87869c2cdb9819c2ca7c9eca9c5fb8b500a01f says it should be lgpl3Only + changelog = "https://gitlab.com/ubports/development/core/lomiri-push-qml/-/blob/${ + if (!isNull finalAttrs.src.tag) then finalAttrs.src.tag else finalAttrs.src.rev + }/ChangeLog"; license = lib.licenses.lgpl3Only; teams = [ lib.teams.lomiri ]; platforms = lib.platforms.linux;