diff options
author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2023-02-18 06:01:29 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-02-18 06:01:29 +0000 |
commit | 54adb1d4b12dd44ec241fbd9b427dd129df56b74 (patch) | |
tree | 21dc7026c778e962edca67524d367820da2bbaa7 /pkgs/applications/office | |
parent | 69a8c9e227c27a906d5a617993ccd49925f692ab (diff) | |
parent | 606f8af262a127420efd2abbabaf512ae85044a1 (diff) |
Merge master into staging-next
Diffstat (limited to 'pkgs/applications/office')
-rw-r--r-- | pkgs/applications/office/trilium/desktop.nix | 6 | ||||
-rw-r--r-- | pkgs/applications/office/trilium/server.nix | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/pkgs/applications/office/trilium/desktop.nix b/pkgs/applications/office/trilium/desktop.nix index 03e88a7816d64..e48355660cb21 100644 --- a/pkgs/applications/office/trilium/desktop.nix +++ b/pkgs/applications/office/trilium/desktop.nix @@ -6,13 +6,13 @@ let pname = "trilium-desktop"; - version = "0.58.7"; + version = "0.58.8"; linuxSource.url = "https://github.com/zadam/trilium/releases/download/v${version}/trilium-linux-x64-${version}.tar.xz"; - linuxSource.sha256 = "1xr8fx5m6p9z18al1iigf45acn7b69vhbc6z6q1v933bvkwry16c"; + linuxSource.sha256 = "03v4a135brj2z1gj2y611pi7szfhr62xxj0qhki0mychypvdfx7i"; darwinSource.url = "https://github.com/zadam/trilium/releases/download/v${version}/trilium-mac-x64-${version}.zip"; - darwinSource.sha256 = "1khywd77j4f745fvxln01li8qxnhlqqsirhm75kbi24bxlcpxfpa"; + darwinSource.sha256 = "0ncf2cl62hn2ja72fw10s40rzkgcwy77ggs29zpgjjlp9hkk3v8q"; meta = metaCommon // { mainProgram = "trilium"; diff --git a/pkgs/applications/office/trilium/server.nix b/pkgs/applications/office/trilium/server.nix index 349ae7f4c331d..78bae4f4655b8 100644 --- a/pkgs/applications/office/trilium/server.nix +++ b/pkgs/applications/office/trilium/server.nix @@ -3,8 +3,8 @@ let serverSource.url = "https://github.com/zadam/trilium/releases/download/v${version}/trilium-linux-x64-server-${version}.tar.xz"; - serverSource.sha256 = "0xr474z7wz0z4rqvk5rhv6xh51mdysr8zw86fs8fk7av0fdqxyka"; - version = "0.58.7"; + serverSource.sha256 = "0mkbmb26y99rc22bpxlc3gdgv84rj7wvsva741gw2z0cb3jh4ziv"; + version = "0.58.8"; in stdenv.mkDerivation rec { pname = "trilium-server"; inherit version; |