Merge pull request #125790 from FliegendeWurst/trilium-update-0.47.4

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 b4c39e99..4c249154 100644
+index 1345ce39..a9770516 100644
 --- a/src/services/log.js
 +++ b/src/services/log.js
 @@ -1,14 +1,5 @@
@@ -17,7 +17,7 @@ index b4c39e99..4c249154 100644
  const SECOND = 1000;
  const MINUTE = 60 * SECOND;
  const HOUR = 60 * MINUTE;
-@@ -16,41 +7,7 @@ const DAY = 24 * HOUR;
+@@ -16,45 +7,7 @@ const DAY = 24 * HOUR;
  
  const NEW_LINE = process.platform === "win32" ? '\r\n' : '\n';
  
@@ -46,16 +46,19 @@ index b4c39e99..4c249154 100644
 -function checkDate(millisSinceMidnight) {
 -    if (millisSinceMidnight >= DAY) {
 -        initLogFile();
+-
+-        millisSinceMidnight =- DAY;
 -    }
+-
+-    return millisSinceMidnight;
 -}
 -
  function log(str) {
--    const millisSinceMidnight = Date.now() - todaysMidnight.getTime();
+-    let millisSinceMidnight = Date.now() - todaysMidnight.getTime();
 -
--    checkDate(millisSinceMidnight);
+-    millisSinceMidnight = checkDate(millisSinceMidnight);
 -
 -    logFile.write(formatTime(millisSinceMidnight) + ' ' + str + NEW_LINE);
 -
      console.log(str);
  }
- 

pkgs/applications/office/trilium/default.nix

@@ -19,16 +19,16 @@ let
     maintainers = with maintainers; [ fliegendewurst ];
   };
 
-  version = "0.47.3";
+  version = "0.47.4";
 
   desktopSource = {
     url = "https://github.com/zadam/trilium/releases/download/v${version}/trilium-linux-x64-${version}.tar.xz";
-    sha256 = "05l8yiqbqh2yr4cfbivpmj5q3jyzqz86wni36wcjlcg3rccms0hc";
+    sha256 = "0hvp6rpvgda12ficzqkj7kllgmpzc8n4rvpgv0zi6fa5alkr944x";
   };
 
   serverSource = {
     url = "https://github.com/zadam/trilium/releases/download/v${version}/trilium-linux-x64-server-${version}.tar.xz";
-    sha256 = "03nsvalaa0rch9i1kh6p5ynnsdmidm5zrw42klj70bamviklzsnh";
+    sha256 = "01bbg7ssszrq27zk7xzil2mawk1659h1hw68yvk8lbgc4n9phkqk";
   };
 
 in {