mirror of
https://github.com/NixOS/nixpkgs.git
synced 2026-08-25 17:55:21 +00:00
trilium-desktop: 0.104.1 -> 0.105.0 (#554847)
This commit is contained in:
@@ -5,7 +5,7 @@
|
||||
fetchurl,
|
||||
makeBinaryWrapper,
|
||||
# use specific electron since it has to load a compiled module
|
||||
electron_42,
|
||||
electron_43,
|
||||
autoPatchelfHook,
|
||||
makeDesktopItem,
|
||||
copyDesktopItems,
|
||||
@@ -15,7 +15,7 @@
|
||||
|
||||
let
|
||||
pname = "trilium-desktop";
|
||||
version = "0.104.1";
|
||||
version = "0.105.0";
|
||||
|
||||
triliumSource = os: arch: hash: {
|
||||
url = "https://github.com/TriliumNext/Trilium/releases/download/v${version}/TriliumNotes-v${version}-${os}-${arch}.zip";
|
||||
@@ -26,9 +26,9 @@ let
|
||||
darwinSource = triliumSource "macos";
|
||||
|
||||
# exposed like this for update.sh
|
||||
x86_64-linux.hash = "sha256-eMdpceoPqOrvCJ9BmEQG8+x9k+ZdKZcMJvwFK3hY3T0=";
|
||||
aarch64-linux.hash = "sha256-n7lPyQvLsxJYGZ1g6d+XywwFCKYrfuxJ9CmBnbi17HY=";
|
||||
aarch64-darwin.hash = "sha256-yajz0431QR+59KlI8d8m56nJAyx/l5yfW8cRuDASoYA=";
|
||||
x86_64-linux.hash = "sha256-ojET/RnZYzAAHVMHSfxGtv7Ot4cujjYUSzKU7FkT+5U=";
|
||||
aarch64-linux.hash = "sha256-iMExDPhzBnLvdTMofuhvhTNT+z3np/p+i70VK6D5sDE=";
|
||||
aarch64-darwin.hash = "sha256-RBkByCAhRYDBCbHm7I5OllGGPn4OVAH4gqe/Eg20PCs=";
|
||||
|
||||
sources = {
|
||||
x86_64-linux = linuxSource "x64" x86_64-linux.hash;
|
||||
@@ -109,7 +109,7 @@ let
|
||||
asar pack $tmp/ $out/share/trilium/resources/app.asar
|
||||
rm -rf $tmp
|
||||
|
||||
makeWrapper ${lib.getExe electron_42} $out/bin/trilium \
|
||||
makeWrapper ${lib.getExe electron_43} $out/bin/trilium \
|
||||
"''${gappsWrapperArgs[@]}" \
|
||||
--set-default ELECTRON_IS_DEV 0 \
|
||||
--add-flags $out/share/trilium/resources/app.asar
|
||||
|
||||
@@ -7,12 +7,12 @@
|
||||
}:
|
||||
|
||||
let
|
||||
version = "0.104.1";
|
||||
version = "0.105.0";
|
||||
|
||||
serverSource_x64.url = "https://github.com/TriliumNext/Trilium/releases/download/v${version}/TriliumNotes-Server-v${version}-linux-x64.tar.xz";
|
||||
serverSource_x64.hash = "sha256-Ym8gcD0Rsp7rw5S5CHHW/Sh69JiyEOo3+U22nEs6yHg=";
|
||||
serverSource_x64.hash = "sha256-lTJIEGCXcrbzPLCtSbDyGmUuI6WHUmj9DrQP+RbB9e8=";
|
||||
serverSource_arm64.url = "https://github.com/TriliumNext/Trilium/releases/download/v${version}/TriliumNotes-Server-v${version}-linux-arm64.tar.xz";
|
||||
serverSource_arm64.hash = "sha256-yIcM9BzrNT5gLbb+DaiJINQyIuygdmDJloHQ424OTxI=";
|
||||
serverSource_arm64.hash = "sha256-2241mNg4WCgJEbWbfSERZfKg2gmHuA/0RhJReXvOXok=";
|
||||
|
||||
serverSource =
|
||||
if stdenv.hostPlatform.isx86_64 then
|
||||
@@ -46,6 +46,8 @@ stdenv.mkDerivation {
|
||||
|
||||
cp -r ./* "$out/share/trilium-server/"
|
||||
|
||||
rm $out/share/trilium-server/node_modules/better-sqlite3/prebuilds/linuxmusl-x64.node
|
||||
|
||||
makeWrapper "$out/share/trilium-server/node/bin/node" "$out/bin/trilium-server" \
|
||||
--chdir "$out/share/trilium-server" \
|
||||
--add-flags "main.cjs"
|
||||
|
||||
Reference in New Issue
Block a user