diff options
| author | Elian Doran <contact@eliandoran.me> | 2023-01-12 22:17:04 +0200 |
|---|---|---|
| committer | Elian Doran <contact@eliandoran.me> | 2023-01-15 01:57:01 +0200 |
| commit | 789381a50df85580a34d4c5c641a0eaa34ba95ed (patch) | |
| tree | 69eeea3249d339567110b1c8a69a0a5de7275b95 /pkgs/applications/office/trilium | |
| parent | 21fa97f48b755ad898ad5bc4e72c0ea2c69a20ef (diff) | |
| download | nixlib-789381a50df85580a34d4c5c641a0eaa34ba95ed.tar nixlib-789381a50df85580a34d4c5c641a0eaa34ba95ed.tar.gz nixlib-789381a50df85580a34d4c5c641a0eaa34ba95ed.tar.bz2 nixlib-789381a50df85580a34d4c5c641a0eaa34ba95ed.tar.lz nixlib-789381a50df85580a34d4c5c641a0eaa34ba95ed.tar.xz nixlib-789381a50df85580a34d4c5c641a0eaa34ba95ed.tar.zst nixlib-789381a50df85580a34d4c5c641a0eaa34ba95ed.zip | |
trilium-{desktop,server}: 0.57.5 -> 0.58.5
Diffstat (limited to 'pkgs/applications/office/trilium')
| -rw-r--r-- | pkgs/applications/office/trilium/0001-Use-console-logger-instead-of-rolling-files.patch | 8 | ||||
| -rw-r--r-- | pkgs/applications/office/trilium/default.nix | 6 |
2 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 7b2635cfe121..7acf353bea1b 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 @@ -1,5 +1,5 @@ diff --git a/src/services/log.js b/src/services/log.js -index 0fcd9812..dcbff070 100644 +index a141eae14..094b9381b 100644 --- a/src/services/log.js +++ b/src/services/log.js @@ -1,15 +1,7 @@ @@ -35,7 +35,7 @@ index 0fcd9812..dcbff070 100644 -function initLogFile() { - todaysMidnight = getTodaysMidnight(); - -- const path = dataDir.LOG_DIR + '/trilium-' + formatDate() + '.log'; +- const path = `${dataDir.LOG_DIR}/trilium-${formatDate()}.log`; - - if (logFile) { - logFile.end(); @@ -65,8 +65,8 @@ index 0fcd9812..dcbff070 100644 - - millisSinceMidnight = checkDate(millisSinceMidnight); - -- logFile.write(formatTime(millisSinceMidnight) + ' ' + str + NEW_LINE); +- logFile.write(`${formatTime(millisSinceMidnight)} ${str}${NEW_LINE}`); - console.log(str); } - + \ No newline at end of file diff --git a/pkgs/applications/office/trilium/default.nix b/pkgs/applications/office/trilium/default.nix index 9396246652cc..e60e53701e8b 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.57.5"; + version = "0.58.5"; desktopSource.url = "https://github.com/zadam/trilium/releases/download/v${version}/trilium-linux-x64-${version}.tar.xz"; - desktopSource.sha256 = "0zm16g30bz9xm2z1x7w7knm352hpb8n301gcr8kwab79qrhszwl2"; + desktopSource.sha256 = "1mkn9wflmgazgyg26wkmfskmawgcf9sfk7y46msivwrj2gjwaban"; serverSource.url = "https://github.com/zadam/trilium/releases/download/v${version}/trilium-linux-x64-server-${version}.tar.xz"; - serverSource.sha256 = "0l53kps7rhf8rx9zx29psvjl3611y7pymfkh2yb13h6iv1c77gdf"; + serverSource.sha256 = "1h3qkpcl0vdz8vvn4h01b1w84v1ckinkdmyvm8312313fcvmyjzs"; in { |