From a54b897d69094ab5cc61b60ab46104cdeb4ca73e Mon Sep 17 00:00:00 2001 From: OPNA2608 Date: Sat, 6 Dec 2025 02:30:31 +0100 Subject: [PATCH] lomiri.libusermetrics: 1.3.3 -> 1.4.0 --- .../lomiri/development/libusermetrics/default.nix | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) diff --git a/pkgs/desktops/lomiri/development/libusermetrics/default.nix b/pkgs/desktops/lomiri/development/libusermetrics/default.nix index c0747a929675..4be4ab92d133 100644 --- a/pkgs/desktops/lomiri/development/libusermetrics/default.nix +++ b/pkgs/desktops/lomiri/development/libusermetrics/default.nix @@ -2,7 +2,6 @@ stdenv, lib, fetchFromGitLab, - fetchpatch, gitUpdater, testers, cmake, @@ -28,13 +27,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "libusermetrics"; - version = "1.3.3"; + version = "1.4.0"; src = fetchFromGitLab { owner = "ubports"; repo = "development/core/libusermetrics"; rev = finalAttrs.version; - hash = "sha256-V4vxNyHMs2YYBILkpco79FN9xnooULgB+z2Kf3V0790="; + hash = "sha256-Zh6a+laSsdZMyoaGoZAKTo5ShJ1NyPZrqR/zBjlOdbk="; }; outputs = [ @@ -43,15 +42,6 @@ stdenv.mkDerivation (finalAttrs: { "doc" ]; - patches = [ - # Remove when https://gitlab.com/ubports/development/core/libusermetrics/-/merge_requests/17 merged & in release - (fetchpatch { - name = "0001-libusermetrics-BUILD_TESTING.patch"; - url = "https://gitlab.com/ubports/development/core/libusermetrics/-/commit/c1e4847601cc4522034a766755ce491d48132d77.patch"; - hash = "sha256-UWc9/ngpuiSm0Rd6eBK/R3N/NwDRtMxie78seN3+y/8="; - }) - ]; - postPatch = '' # Tries to query QMake for QT_INSTALL_QML variable, would return broken paths into /build/qtbase- even if qmake was available substituteInPlace src/modules/UserMetrics/CMakeLists.txt \