trilium-next-{desktop, server}: 0.95.0 -> 0.97.1 (#427121)

authored by Gaétan Lepage and committed by GitHub c5fe4091 16b2c5ce

+20 -20
+8 -8
pkgs/by-name/tr/trilium-next-desktop/package.nix
··· 5 5 fetchurl, 6 6 makeBinaryWrapper, 7 7 # use specific electron since it has to load a compiled module 8 - electron_36, 8 + electron_37, 9 9 autoPatchelfHook, 10 10 makeDesktopItem, 11 11 copyDesktopItems, ··· 15 15 16 16 let 17 17 pname = "trilium-next-desktop"; 18 - version = "0.95.0"; 18 + version = "0.97.1"; 19 19 20 20 triliumSource = os: arch: sha256: { 21 - url = "https://github.com/TriliumNext/Notes/releases/download/v${version}/TriliumNextNotes-v${version}-${os}-${arch}.zip"; 21 + url = "https://github.com/TriliumNext/Trilium/releases/download/v${version}/TriliumNotes-v${version}-${os}-${arch}.zip"; 22 22 inherit sha256; 23 23 }; 24 24 ··· 26 26 darwinSource = triliumSource "macos"; 27 27 28 28 # exposed like this for update.sh 29 - x86_64-linux.sha256 = "1lykzd1spvl6x6xm2qhw5bzcs9pbcars686gwbirscr53fb7q841"; 30 - aarch64-linux.sha256 = "0bxrsj1g8dgg9rd6s0aj9jm2w6nk9yn6b1xgiab8kn298p3iqz64"; 31 - x86_64-darwin.sha256 = "16cv52c6jn5ah5ccdfxffwrmf6vz8d4q4rj0v5ny4m0g0al78isg"; 32 - aarch64-darwin.sha256 = "0v388frd4skpilxn8i5isd9xgn0qs9zszfs3h75q3qpx4xz355ps"; 29 + x86_64-linux.sha256 = "1lb1mp031pa4wg6wrp8l84vw1glmqc27l4gf85a47bi4b63das2l"; 30 + aarch64-linux.sha256 = "1yrxk8q2aafgcvipwhkwmjidymwia0dgqnhchhngmris6zrbb3wj"; 31 + x86_64-darwin.sha256 = "0d8li5h2rn3iyzxsbs4g7a98zzdn58x4iwhzvxcjxy7b6h4hldvg"; 32 + aarch64-darwin.sha256 = "07r1rw84mlszr2bzjwz62lsy14j9xm22li2ksdc4ra93q58kmip1"; 33 33 34 34 sources = { 35 35 x86_64-linux = linuxSource "x64" x86_64-linux.sha256; ··· 111 111 asar pack $tmp/ $out/share/trilium/resources/app.asar 112 112 rm -rf $tmp 113 113 114 - makeWrapper ${lib.getExe electron_36} $out/bin/trilium \ 114 + makeWrapper ${lib.getExe electron_37} $out/bin/trilium \ 115 115 "''${gappsWrapperArgs[@]}" \ 116 116 --set-default ELECTRON_IS_DEV 0 \ 117 117 --add-flags $out/share/trilium/resources/app.asar
+7 -7
pkgs/by-name/tr/trilium-next-desktop/update.sh
··· 8 8 sed -i "s|$2 = \".*\"|$2 = \"${3:-}\"|" $1 9 9 } 10 10 11 - version=$(curl -s --show-error "https://api.github.com/repos/TriliumNext/Notes/releases/latest" | jq -r '.tag_name' | tail -c +2) 11 + version=$(curl -s --show-error "https://api.github.com/repos/TriliumNext/Trilium/releases/latest" | jq -r '.tag_name' | tail -c +2) 12 12 setKV ./package.nix version $version 13 13 14 14 # Update desktop application 15 - sha256_linux64=$(nix-prefetch-url --quiet https://github.com/TriliumNext/Notes/releases/download/v${version}/TriliumNextNotes-v${version}-linux-x64.zip) 16 - sha256_linux64_arm=$(nix-prefetch-url --quiet https://github.com/TriliumNext/Notes/releases/download/v${version}/TriliumNextNotes-v${version}-linux-arm64.zip) 17 - sha256_darwin64=$(nix-prefetch-url --quiet https://github.com/TriliumNext/Notes/releases/download/v${version}/TriliumNextNotes-v${version}-macos-x64.zip) 18 - sha256_darwin64_arm=$(nix-prefetch-url --quiet https://github.com/TriliumNext/Notes/releases/download/v${version}/TriliumNextNotes-v${version}-macos-arm64.zip) 15 + sha256_linux64=$(nix-prefetch-url --quiet https://github.com/TriliumNext/Trilium/releases/download/v${version}/TriliumNotes-v${version}-linux-x64.zip) 16 + sha256_linux64_arm=$(nix-prefetch-url --quiet https://github.com/TriliumNext/Trilium/releases/download/v${version}/TriliumNotes-v${version}-linux-arm64.zip) 17 + sha256_darwin64=$(nix-prefetch-url --quiet https://github.com/TriliumNext/Trilium/releases/download/v${version}/TriliumNotes-v${version}-macos-x64.zip) 18 + sha256_darwin64_arm=$(nix-prefetch-url --quiet https://github.com/TriliumNext/Trilium/releases/download/v${version}/TriliumNotes-v${version}-macos-arm64.zip) 19 19 setKV ./package.nix x86_64-linux.sha256 $sha256_linux64 20 20 setKV ./package.nix aarch64-linux.sha256 $sha256_linux64_arm 21 21 setKV ./package.nix x86_64-darwin.sha256 $sha256_darwin64 22 22 setKV ./package.nix aarch64-darwin.sha256 $sha256_darwin64_arm 23 23 24 24 # Update server 25 - sha256_linux64_server=$(nix-prefetch-url --quiet https://github.com/TriliumNext/Notes/releases/download/v${version}/TriliumNextNotes-Server-v${version}-linux-x64.tar.xz) 26 - 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) 25 + sha256_linux64_server=$(nix-prefetch-url --quiet https://github.com/TriliumNext/Trilium/releases/download/v${version}/TriliumNotes-Server-v${version}-linux-x64.tar.xz) 26 + sha256_linux64_server_arm=$(nix-prefetch-url --quiet https://github.com/TriliumNext/Trilium/releases/download/v${version}/TriliumNotes-Server-v${version}-linux-arm64.tar.xz) 27 27 setKV ../trilium-next-server/package.nix version $version 28 28 setKV ../trilium-next-server/package.nix serverSource_x64.sha256 $sha256_linux64_server 29 29 setKV ../trilium-next-server/package.nix serverSource_arm64.sha256 $sha256_linux64_server_arm
+5 -5
pkgs/by-name/tr/trilium-next-server/package.nix
··· 7 7 }: 8 8 9 9 let 10 - version = "0.95.0"; 10 + version = "0.97.1"; 11 11 12 - serverSource_x64.url = "https://github.com/TriliumNext/Notes/releases/download/v${version}/TriliumNextNotes-Server-v${version}-linux-x64.tar.xz"; 13 - serverSource_x64.sha256 = "1rjl38i6l894kwpmc925amf9zbwyjlc4sqh3skm1f13vhv9pj9dx"; 14 - serverSource_arm64.url = "https://github.com/TriliumNext/Notes/releases/download/v${version}/TriliumNextNotes-Server-v${version}-linux-arm64.tar.xz"; 15 - serverSource_arm64.sha256 = "1rpzc13vdp5b3iwwc1l6h78nb5iairlxbflwvjwhy1149lpqnn8m"; 12 + serverSource_x64.url = "https://github.com/TriliumNext/Trilium/releases/download/v${version}/TriliumNotes-Server-v${version}-linux-x64.tar.xz"; 13 + serverSource_x64.sha256 = "1y0ass5b3c8qx28b31x2h7i1rlvdyjimsklgjpv8d47micsg6m7z"; 14 + serverSource_arm64.url = "https://github.com/TriliumNext/Trilium/releases/download/v${version}/TriliumNotes-Server-v${version}-linux-arm64.tar.xz"; 15 + serverSource_arm64.sha256 = "12bnmbm1p98633xsyxq6rr05jl79bn820915a0gmq14np7vskhmp"; 16 16 17 17 serverSource = 18 18 if stdenv.hostPlatform.isx86_64 then