diff options
author | Jon Seager <jon@sgrs.uk> | 2024-03-06 12:29:34 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2024-03-06 12:29:34 +0000 |
commit | f7f0117701551541c90db9be172e748bdf241b5a (patch) | |
tree | d9820f2bae06254210df077c785664c91169309d /pkgs/applications/office | |
parent | 8fd35035ba9d8deb49a4ee92a8844db552ea2b59 (diff) | |
parent | 3a5eca741ac5ecabeaf1486ad975568c56eac211 (diff) | |
download | nixlib-f7f0117701551541c90db9be172e748bdf241b5a.tar nixlib-f7f0117701551541c90db9be172e748bdf241b5a.tar.gz nixlib-f7f0117701551541c90db9be172e748bdf241b5a.tar.bz2 nixlib-f7f0117701551541c90db9be172e748bdf241b5a.tar.lz nixlib-f7f0117701551541c90db9be172e748bdf241b5a.tar.xz nixlib-f7f0117701551541c90db9be172e748bdf241b5a.tar.zst nixlib-f7f0117701551541c90db9be172e748bdf241b5a.zip |
Merge pull request #293748 from FliegendeWurst/trilium-0.63.3
trilium-{desktop,server}: 0.62.5 -> 0.63.3
Diffstat (limited to 'pkgs/applications/office')
3 files changed, 7 insertions, 7 deletions
diff --git a/pkgs/applications/office/trilium/0001-Use-console-logger-instead-of-rolling-files.patch b/pkgs/applications/office/trilium/0001-Use-console-logger-instead-of-rolling-files.patch index 7acf353bea1b..68f203b464b2 100644 --- a/pkgs/applications/office/trilium/0001-Use-console-logger-instead-of-rolling-files.patch +++ b/pkgs/applications/office/trilium/0001-Use-console-logger-instead-of-rolling-files.patch @@ -6,8 +6,8 @@ index a141eae14..094b9381b 100644 "use strict"; -const fs = require('fs'); --const dataDir = require('./data_dir'); - const cls = require('./cls'); +-const dataDir = require('./data_dir.js'); + const cls = require('./cls.js'); -if (!fs.existsSync(dataDir.LOG_DIR)) { - fs.mkdirSync(dataDir.LOG_DIR, 0o700); diff --git a/pkgs/applications/office/trilium/desktop.nix b/pkgs/applications/office/trilium/desktop.nix index 32c7c2a7024c..a99fb6070c5e 100644 --- a/pkgs/applications/office/trilium/desktop.nix +++ b/pkgs/applications/office/trilium/desktop.nix @@ -7,13 +7,13 @@ let pname = "trilium-desktop"; - version = "0.62.5"; + version = "0.63.3"; linuxSource.url = "https://github.com/zadam/trilium/releases/download/v${version}/trilium-linux-x64-${version}.tar.xz"; - linuxSource.sha256 = "1f2f8nvj1gx9i797mck5aazgz821sjcs06538py9za4m532i66pj"; + linuxSource.sha256 = "1dcq7s4lcp9bc0p4ylzxyfc020xvj7scrlsddzwcnp8mqz5ckik9"; darwinSource.url = "https://github.com/zadam/trilium/releases/download/v${version}/trilium-mac-x64-${version}.zip"; - darwinSource.sha256 = "19zny4akf3hxqjqayiz4s47vdblbrn4kgwg3nykljv4lpqnqkyn3"; + darwinSource.sha256 = "0m9m68f9jg10nfn719q6wahwvi13lpc2hmandw7ddxfslylwq29s"; meta = metaCommon // { mainProgram = "trilium"; diff --git a/pkgs/applications/office/trilium/server.nix b/pkgs/applications/office/trilium/server.nix index 4beaba6688c9..8416a6f30bac 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 = "1s0pfb3virhxsh5kkgq4yfhdnv1lq2z0zdcikilnayzp0lpjskhb"; - version = "0.62.5"; + serverSource.sha256 = "1pnxss85lz313r5l1qpgm9msyfr87h54nbfc7d89dbj0wgsjwk0n"; + version = "0.63.3"; in stdenv.mkDerivation { pname = "trilium-server"; inherit version; |