From 5a756162648ace359e00dd924e2389e237b789ef Mon Sep 17 00:00:00 2001 From: Mats Date: Mon, 5 Dec 2022 21:09:43 +0100 Subject: [PATCH 1/2] trilium-{desktop,server}: 0.56.2 -> 0.57.3 --- pkgs/applications/office/trilium/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/office/trilium/default.nix b/pkgs/applications/office/trilium/default.nix index 0ac2f4eac134..1499e1393435 100644 --- a/pkgs/applications/office/trilium/default.nix +++ b/pkgs/applications/office/trilium/default.nix @@ -10,13 +10,13 @@ let maintainers = with maintainers; [ fliegendewurst ]; }; - version = "0.56.2"; + version = "0.57.3"; desktopSource.url = "https://github.com/zadam/trilium/releases/download/v${version}/trilium-linux-x64-${version}.tar.xz"; - desktopSource.sha256 = "1rqfkbxgcd32kpi6xfd590nivd1ga0d0kf5zvffyypyy28q95pyz"; + desktopSource.sha256 = "0ch2l0raysdzkm131rq3xgsk52f9h2f1nx1zjc0zzlvs4qz657l3"; serverSource.url = "https://github.com/zadam/trilium/releases/download/v${version}/trilium-linux-x64-server-${version}.tar.xz"; - serverSource.sha256 = "1pyi2b649n2rihr4dcz8brfkqrbvssbzhr3dnmyrhrp3qdyxamb6"; + serverSource.sha256 = "0666pm2pzh1srzpdvs36nw1w2yp4k67k3idz6pyargziqh9pkyqf"; in { From 668c2b8246663e5c130e66d242db90304caaacfc Mon Sep 17 00:00:00 2001 From: Mats Date: Mon, 5 Dec 2022 23:11:01 +0100 Subject: [PATCH 2/2] trilium-desktop: stop auto generating desktop item --- pkgs/applications/office/trilium/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/applications/office/trilium/default.nix b/pkgs/applications/office/trilium/default.nix index 1499e1393435..73d595cf699d 100644 --- a/pkgs/applications/office/trilium/default.nix +++ b/pkgs/applications/office/trilium/default.nix @@ -49,6 +49,11 @@ in { }) ]; + # Remove trilium-portable.sh, so trilium knows it is packaged making it stop auto generating a desktop item on launch + postPatch = '' + rm ./trilium-portable.sh + ''; + installPhase = '' runHook preInstall mkdir -p $out/bin