colin/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #210420 from eliandoran/dev/trilium_update

Browse Source 
trilium-{desktop,server}: 0.57.5  -> 0.58.5
This commit is contained in:
Bobby Rong 2023-01-16 19:30:59 +08:00 committed by GitHub
commit 02ff815e23
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pkgs/applications/office/trilium/0001-Use-console-logger-instead-of-rolling-files.patch
View File

@ -1,5 +1,5 @@
diff --git a/src/services/log.js b/src/services/log.js 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 --- a/src/services/log.js
+++ b/src/services/log.js +++ b/src/services/log.js
@@ -1,15 +1,7 @@ @@ -1,15 +1,7 @@
@ -35,7 +35,7 @@ index 0fcd9812..dcbff070 100644
-function initLogFile() { -function initLogFile() {
- todaysMidnight = getTodaysMidnight(); - todaysMidnight = getTodaysMidnight();
- -
- const path = dataDir.LOG_DIR + '/trilium-' + formatDate() + '.log'; - const path = `${dataDir.LOG_DIR}/trilium-${formatDate()}.log`;
- -
- if (logFile) { - if (logFile) {
- logFile.end(); - logFile.end();
@ -65,8 +65,8 @@ index 0fcd9812..dcbff070 100644
- -
- millisSinceMidnight = checkDate(millisSinceMidnight); - millisSinceMidnight = checkDate(millisSinceMidnight);
- -
- logFile.write(formatTime(millisSinceMidnight) + ' ' + str + NEW_LINE); - logFile.write(`${formatTime(millisSinceMidnight)} ${str}${NEW_LINE}`);
- -
console.log(str); console.log(str);
} }

6
pkgs/applications/office/trilium/default.nix
View File

@ -10,13 +10,13 @@ let
maintainers = with maintainers; [ fliegendewurst ]; 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.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.url = "https://github.com/zadam/trilium/releases/download/v${version}/trilium-linux-x64-server-${version}.tar.xz";
serverSource.sha256 = "0l53kps7rhf8rx9zx29psvjl3611y7pymfkh2yb13h6iv1c77gdf"; serverSource.sha256 = "1h3qkpcl0vdz8vvn4h01b1w84v1ckinkdmyvm8312313fcvmyjzs";
in { in {