mirror of
https://github.com/NixOS/nixpkgs.git
synced 2025-06-14 21:49:34 +03:00
trilium-next-{desktop,server}: 0.91.6 -> 0.92.4 (#391217)
This commit is contained in:
commit
cfd3dda7eb
3 changed files with 15 additions and 15 deletions
|
@ -15,7 +15,7 @@
|
||||||
|
|
||||||
let
|
let
|
||||||
pname = "trilium-next-desktop";
|
pname = "trilium-next-desktop";
|
||||||
version = "0.91.6";
|
version = "0.92.4";
|
||||||
|
|
||||||
triliumSource = os: arch: sha256: {
|
triliumSource = os: arch: sha256: {
|
||||||
url = "https://github.com/TriliumNext/Notes/releases/download/v${version}/TriliumNextNotes-v${version}-${os}-${arch}.zip";
|
url = "https://github.com/TriliumNext/Notes/releases/download/v${version}/TriliumNextNotes-v${version}-${os}-${arch}.zip";
|
||||||
|
@ -26,10 +26,10 @@ let
|
||||||
darwinSource = triliumSource "macos";
|
darwinSource = triliumSource "macos";
|
||||||
|
|
||||||
# exposed like this for update.sh
|
# exposed like this for update.sh
|
||||||
x86_64-linux.sha256 = "13r9akfakmrpvnyab182irhraf9hpqb24205r8rxjfgj8dpmfa4p";
|
x86_64-linux.sha256 = "12z6r38ab8jrjgic370q5v1y17m9brj38gfqdg05drf7a25xam8r";
|
||||||
aarch64-linux.sha256 = "07bh5fcdcw3al5w8nqx5kxzqa5vgni27gb6591y6j6jynz6cmyqp";
|
aarch64-linux.sha256 = "0zsc7c7q07zml91sqvwgz8x3vql1mlhvb7msf7vx22w94dypzivf";
|
||||||
x86_64-darwin.sha256 = "0iaz4wim11x110phg4xgzdw3sjcbmxwbksk5gpygjbhlzhjprnnp";
|
x86_64-darwin.sha256 = "09ipqfr77xqlgbzh2dvlidm532isg8jj8iwawjldq74ncbv8m5h0";
|
||||||
aarch64-darwin.sha256 = "1x2s8sdz89sy69lvdg552qmr3chj20d32sskks1r8g5rs16fwqd1";
|
aarch64-darwin.sha256 = "031nz4f3rdjg3cyvadax4shchr7liyrzsn3ab6whsp3mhnb9wr9l";
|
||||||
|
|
||||||
sources = {
|
sources = {
|
||||||
x86_64-linux = linuxSource "x64" x86_64-linux.sha256;
|
x86_64-linux = linuxSource "x64" x86_64-linux.sha256;
|
||||||
|
@ -53,7 +53,7 @@ let
|
||||||
platforms = lib.attrNames sources;
|
platforms = lib.attrNames sources;
|
||||||
};
|
};
|
||||||
|
|
||||||
linux = stdenv.mkDerivation rec {
|
linux = stdenv.mkDerivation {
|
||||||
inherit
|
inherit
|
||||||
pname
|
pname
|
||||||
version
|
version
|
||||||
|
@ -105,7 +105,7 @@ let
|
||||||
asar extract $out/share/trilium/resources/app.asar $tmp
|
asar extract $out/share/trilium/resources/app.asar $tmp
|
||||||
rm $out/share/trilium/resources/app.asar
|
rm $out/share/trilium/resources/app.asar
|
||||||
|
|
||||||
for f in "src/services/utils.ts" "dist/src/services/utils.js"; do
|
for f in "src/services/utils.js"; do
|
||||||
substituteInPlace $tmp/$f \
|
substituteInPlace $tmp/$f \
|
||||||
--replace-fail "process.resourcesPath" "'$out/share/trilium/resources'"
|
--replace-fail "process.resourcesPath" "'$out/share/trilium/resources'"
|
||||||
done
|
done
|
||||||
|
|
|
@ -22,8 +22,8 @@ setKV ./package.nix x86_64-darwin.sha256 $sha256_darwin64
|
||||||
setKV ./package.nix aarch64-darwin.sha256 $sha256_darwin64_arm
|
setKV ./package.nix aarch64-darwin.sha256 $sha256_darwin64_arm
|
||||||
|
|
||||||
# Update server
|
# Update server
|
||||||
sha256_linux64_server=$(nix-prefetch-url --quiet https://github.com/TriliumNext/Notes/releases/download/v${version}/TriliumNextNotes-linux-x64-v${version}.tar.xz)
|
sha256_linux64_server=$(nix-prefetch-url --quiet https://github.com/TriliumNext/Notes/releases/download/v${version}/TriliumNextNotes-Server-v${version}-linux-x64.tar.xz)
|
||||||
sha256_linux64_server_arm=$(nix-prefetch-url --quiet https://github.com/TriliumNext/Notes/releases/download/v${version}/TriliumNextNotes-linux-arm64-v${version}.tar.xz)
|
sha256_linux64_server_arm=$(nix-prefetch-url --quiet https://github.com/TriliumNext/Notes/releases/download/v${version}/TriliumNextNotes-Server-v${version}-linux-arm64.tar.xz)
|
||||||
setKV ../trilium-next-server/package.nix version $version
|
setKV ../trilium-next-server/package.nix version $version
|
||||||
setKV ../trilium-next-server/package.nix serverSource_x64.sha256 $sha256_linux64_server
|
setKV ../trilium-next-server/package.nix serverSource_x64.sha256 $sha256_linux64_server
|
||||||
setKV ../trilium-next-server/package.nix serverSource_arm64.sha256 $sha256_linux64_server_arm
|
setKV ../trilium-next-server/package.nix serverSource_arm64.sha256 $sha256_linux64_server_arm
|
||||||
|
|
|
@ -7,12 +7,12 @@
|
||||||
}:
|
}:
|
||||||
|
|
||||||
let
|
let
|
||||||
version = "0.91.6";
|
version = "0.92.4";
|
||||||
|
|
||||||
serverSource_x64.url = "https://github.com/TriliumNext/Notes/releases/download/v${version}/TriliumNextNotes-linux-x64-v${version}.tar.xz";
|
serverSource_x64.url = "https://github.com/TriliumNext/Notes/releases/download/v${version}/TriliumNextNotes-Server-v${version}-linux-x64.tar.xz";
|
||||||
serverSource_x64.sha256 = "0ji1i792afzklg2vn99krm74nvb617pdr1gz061r573vi7nn5rnx";
|
serverSource_x64.sha256 = "1bcacr5sxmrq9zvh8xjyr30y5mz0y6qyx2m18dblswdi0mbi7cv4";
|
||||||
serverSource_arm64.url = "https://github.com/TriliumNext/Notes/releases/download/v${version}/TriliumNextNotes-linux-arm64-v${version}.tar.xz";
|
serverSource_arm64.url = "https://github.com/TriliumNext/Notes/releases/download/v${version}/TriliumNextNotes-Server-v${version}-linux-arm64.tar.xz";
|
||||||
serverSource_arm64.sha256 = "1lyzm7rwj7cbb36nlswnwiy8hn0yba4f7mbrgirvzyx03q4wv29z";
|
serverSource_arm64.sha256 = "04mjkqywwdax46r8q8wygi9dxglz2qipmlrv3cqqpdvjm0yxh2g2";
|
||||||
|
|
||||||
serverSource =
|
serverSource =
|
||||||
if stdenv.hostPlatform.isx86_64 then
|
if stdenv.hostPlatform.isx86_64 then
|
||||||
|
@ -57,7 +57,7 @@ stdenv.mkDerivation {
|
||||||
|
|
||||||
# Clean up broken symlinks and build tools.
|
# Clean up broken symlinks and build tools.
|
||||||
rm "$out"/share/trilium-server/node/bin/{npm,npx}
|
rm "$out"/share/trilium-server/node/bin/{npm,npx}
|
||||||
rm -r "$out"/share/trilium-server/node_modules/{@npmcli,@rollup,@babel}
|
rm -r "$out"/share/trilium-server/node_modules/{@npmcli,@rollup,@babel,.bin}
|
||||||
|
|
||||||
runHook postInstall
|
runHook postInstall
|
||||||
'';
|
'';
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue