Unverified Commit 6185b6bf authored by Arne Keller's avatar Arne Keller Committed by GitHub
Browse files

trilium-next-{desktop,server}: 0.93.0 -> 0.95.0 (#415039)

parents 80bb9431 1851e249

pkgs/by-name/tr/trilium-next-desktop/package.nix

+9 −13
Original line number Diff line number Diff line
@@ -5,7 +5,7 @@ 
  fetchurl,

  makeBinaryWrapper,

  # use specific electron since it has to load a compiled module

  electron_35,

  electron_36,

  autoPatchelfHook,

  makeDesktopItem,

  copyDesktopItems,
@@ -15,7 +15,7 @@ 


let

  pname = "trilium-next-desktop";

  version = "0.93.0";

  version = "0.95.0";



  triliumSource = os: arch: sha256: {

    url = "https://github.com/TriliumNext/Notes/releases/download/v${version}/TriliumNextNotes-v${version}-${os}-${arch}.zip";
@@ -26,10 +26,10 @@ let 
  darwinSource = triliumSource "macos";



  # exposed like this for update.sh

  x86_64-linux.sha256 = "02cz98bgv8l5c96irmxla93h9vpxpfh2l25q5h4r1wcyg00k0gqc";

  aarch64-linux.sha256 = "0ahkskdaggff34zn6ml8s3v3ig8fq3isrcrckpvy9acyhk2nm924";

  x86_64-darwin.sha256 = "0p1db3bij5pipwjjh0vyscvd6anq1qriny7y7yxx2sviksgyl0i8";

  aarch64-darwin.sha256 = "0fkqlxssrdz2g63yhs1l74h037xac04y3dng7kqnrzhn740p2wjc";

  x86_64-linux.sha256 = "1lykzd1spvl6x6xm2qhw5bzcs9pbcars686gwbirscr53fb7q841";

  aarch64-linux.sha256 = "0bxrsj1g8dgg9rd6s0aj9jm2w6nk9yn6b1xgiab8kn298p3iqz64";

  x86_64-darwin.sha256 = "16cv52c6jn5ah5ccdfxffwrmf6vz8d4q4rj0v5ny4m0g0al78isg";

  aarch64-darwin.sha256 = "0v388frd4skpilxn8i5isd9xgn0qs9zszfs3h75q3qpx4xz355ps";



  sources = {

    x86_64-linux = linuxSource "x64" x86_64-linux.sha256;
@@ -100,22 +100,18 @@ let 
      cp -r ./* "$out/share/trilium/"

      rm $out/share/trilium/{*.so*,trilium,chrome_crashpad_handler,chrome-sandbox}



      # Rebuild the ASAR archive, hardcoding the resourcesPath

      # Rebuild the ASAR archive to patchelf native module.

      tmp=$(mktemp -d)

      asar extract $out/share/trilium/resources/app.asar $tmp

      rm $out/share/trilium/resources/app.asar



      for f in "src/services/utils.js"; do

        substituteInPlace $tmp/$f \

          --replace-fail "process.resourcesPath" "'$out/share/trilium/resources'"

      done

      autoPatchelf $tmp

      cp $tmp/src/public/icon.png $out/share/icons/hicolor/512x512/apps/trilium.png

      cp $tmp/public/assets/icon.png $out/share/icons/hicolor/512x512/apps/trilium.png



      asar pack $tmp/ $out/share/trilium/resources/app.asar

      rm -rf $tmp



      makeWrapper ${lib.getExe electron_35} $out/bin/trilium \

      makeWrapper ${lib.getExe electron_36} $out/bin/trilium \

        "''${gappsWrapperArgs[@]}" \

        --set-default ELECTRON_IS_DEV 0 \

        --add-flags $out/share/trilium/resources/app.asar

pkgs/by-name/tr/trilium-next-server/0001-Use-console-logger-instead-of-rolling-files.patch

deleted100644 → 0
+0 −30
Original line number Diff line number Diff line 
diff --git a/src/services/log.js b/src/services/log.js

index 2840c185a..7fb16dd08 100644

--- a/src/services/log.js

+++ b/src/services/log.js

@@ -3,9 +3,6 @@ import fs from "fs";

 import dataDir from "./data_dir.js";

 import cls from "./cls.js";

 import { isWindows } from "./utils.js";

-if (!fs.existsSync(dataDir.LOG_DIR)) {

-    fs.mkdirSync(dataDir.LOG_DIR, 0o700);

-}

 let logFile;

 const SECOND = 1000;

 const MINUTE = 60 * SECOND;

@@ -24,7 +21,6 @@ function initLogFile() {

     if (logFile) {

         logFile.end();

     }

-    logFile = fs.createWriteStream(path, { flags: "a" });

 }

 function checkDate(millisSinceMidnight) {

     if (millisSinceMidnight >= DAY) {

@@ -40,7 +36,6 @@ function log(str) {

     }

     let millisSinceMidnight = Date.now() - todaysMidnight.getTime();

     millisSinceMidnight = checkDate(millisSinceMidnight);

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

     console.log(str);

 }

 function info(message) {

pkgs/by-name/tr/trilium-next-server/package.nix

+4 −12
Original line number Diff line number Diff line
@@ -7,12 +7,12 @@ 
}:



let

  version = "0.93.0";

  version = "0.95.0";



  serverSource_x64.url = "https://github.com/TriliumNext/Notes/releases/download/v${version}/TriliumNextNotes-Server-v${version}-linux-x64.tar.xz";

  serverSource_x64.sha256 = "0gm0j8w16ynwb1rsgxd7g4pa4vm47728d8393bazppxgf91gnh3d";

  serverSource_x64.sha256 = "1rjl38i6l894kwpmc925amf9zbwyjlc4sqh3skm1f13vhv9pj9dx";

  serverSource_arm64.url = "https://github.com/TriliumNext/Notes/releases/download/v${version}/TriliumNextNotes-Server-v${version}-linux-arm64.tar.xz";

  serverSource_arm64.sha256 = "0in1y3zsx4mni02lq17q0camn07p7fngl1qjmjnhkps7pr799d2q";

  serverSource_arm64.sha256 = "1rpzc13vdp5b3iwwc1l6h78nb5iairlxbflwvjwhy1149lpqnn8m";



  serverSource =

    if stdenv.hostPlatform.isx86_64 then
@@ -28,11 +28,6 @@ stdenv.mkDerivation { 


  src = fetchurl serverSource;



  patches = [

    # patch logger to use console instead of rolling files

    ./0001-Use-console-logger-instead-of-rolling-files.patch

  ];



  nativeBuildInputs = [

    autoPatchelfHook

    makeBinaryWrapper
@@ -53,10 +48,7 @@ stdenv.mkDerivation { 


    makeWrapper "$out/share/trilium-server/node/bin/node" "$out/bin/trilium-server" \

      --chdir "$out/share/trilium-server" \

      --add-flags "src/main"



    # Clean up broken symlinks and build tools.

    rm -r "$out"/share/trilium-server/node_modules/{@npmcli,@rollup,@babel}

      --add-flags "main.cjs"



    runHook postInstall

  '';