Dawoox/nixpkgs
1
1
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

lomiri.lomiri-calculator-app: 4.0.2 -> 4.1.0

Browse Source
This commit is contained in:
OPNA2608
2025-05-14 22:19:39 +02:00
parent ade73289c8
commit 545788aa01
1 changed files with 6 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
pkgs/desktops/lomiri/applications/lomiri-calculator-app/default.nix
View File

@@ -2,7 +2,6 @@
stdenv, stdenv,
lib, lib,
fetchFromGitLab, fetchFromGitLab,
fetchpatch,
gitUpdater, gitUpdater,
nixosTests, nixosTests,
cmake, cmake,
@@ -16,37 +15,15 @@
stdenv.mkDerivation (finalAttrs: { stdenv.mkDerivation (finalAttrs: {
pname = "lomiri-calculator-app"; pname = "lomiri-calculator-app";
version = "4.0.2"; version = "4.1.0";
src = fetchFromGitLab { src = fetchFromGitLab {
owner = "ubports"; owner = "ubports";
repo = "development/apps/lomiri-calculator-app"; repo = "development/apps/lomiri-calculator-app";
rev = "v${finalAttrs.version}"; tag = "v${finalAttrs.version}";
hash = "sha256-NyLEis+rIx2ELUiGrGCeFX/tlt43UgPBkb9aUs1tkgk="; hash = "sha256-RLg2B8LtYE3b7dRRvhPqIA4RAlwNO585q+02wBEedj8=";
}; };
patches = [
# Remove when version > 4.0.2
(fetchpatch {
name = "0001-lomiri-calculator-app-Fix-GNUInstallDirs-variable-concatenations.patch";
url = "https://gitlab.com/ubports/development/apps/lomiri-calculator-app/-/commit/0bd6ef6c3470bcecf90a88e1e5568a5ce5ad6d06.patch";
hash = "sha256-2FCLZ/LY3xTPGDmX+M8LiqlbcNQJu5hulkOf+V+3hWY=";
})
# Remove when version > 4.0.2
# Must apply separately because merge has hunk with changes to new file before hunk that inits said file
(fetchpatch {
name = "0002-lomiri-calculator-app-Migrate-to-C++-app.patch";
url = "https://gitlab.com/ubports/development/apps/lomiri-calculator-app/-/commit/035e5b8000ad1c8149a6b024fa8fed2667fbb659.patch";
hash = "sha256-2BTFOrH/gjIzXBmnTPMi+mPpUA7e/+6O/E3pdxhjZYQ=";
})
(fetchpatch {
name = "0003-lomiri-calculator-app-Call-i18n.bindtextdomain.patch";
url = "https://gitlab.com/ubports/development/apps/lomiri-calculator-app/-/commit/7cb5e56958e41a8f7a51e00d81d9b2bc24de32b0.patch";
hash = "sha256-k/Civ0+SCNDDok9bUdb48FKC+LPlM13ASFP6CbBvBVs=";
})
];
postPatch = postPatch =
# We don't want absolute paths in desktop files # We don't want absolute paths in desktop files
'' ''
@@ -99,7 +76,9 @@ stdenv.mkDerivation (finalAttrs: {
meta = { meta = {
description = "Powerful and easy to use calculator for Ubuntu Touch, with calculations history and formula validation"; description = "Powerful and easy to use calculator for Ubuntu Touch, with calculations history and formula validation";
homepage = "https://gitlab.com/ubports/development/apps/lomiri-calculator-app"; homepage = "https://gitlab.com/ubports/development/apps/lomiri-calculator-app";
changelog = "https://gitlab.com/ubports/development/apps/lomiri-calculator-app/-/blob/v${finalAttrs.version}/ChangeLog"; changelog = "https://gitlab.com/ubports/development/apps/lomiri-calculator-app/-/blob/${
if (!builtins.isNull finalAttrs.src.tag) then finalAttrs.src.tag else finalAttrs.src.rev
}/ChangeLog";
license = lib.licenses.gpl3Only; license = lib.licenses.gpl3Only;
mainProgram = "lomiri-calculator-app"; mainProgram = "lomiri-calculator-app";
teams = [ lib.teams.lomiri ]; teams = [ lib.teams.lomiri ];