Unverified Commit 02ff815e authored by Bobby Rong's avatar Bobby Rong Committed by GitHub
Browse files

Merge pull request #210420 from eliandoran/dev/trilium_update 

trilium-{desktop,server}: 0.57.5  -> 0.58.5
parents ba00b146 789381a5

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

+4 −4
Original line number Diff line number Diff line 
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,7 +65,7 @@ index 0fcd9812..dcbff070 100644 
-

-    millisSinceMidnight = checkDate(millisSinceMidnight);

-

-    logFile.write(formatTime(millisSinceMidnight) + ' ' + str + NEW_LINE);

-    logFile.write(`${formatTime(millisSinceMidnight)} ${str}${NEW_LINE}`);

-

     console.log(str);

 }

pkgs/applications/office/trilium/default.nix

+3 −3
Original line number Diff line number Diff line
@@ -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 {