-
-
Notifications
You must be signed in to change notification settings - Fork 14.4k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
trilium-next-{desktop,server}: init at 0.90.12 #356930
base: master
Are you sure you want to change the base?
Conversation
741c113
to
ccda165
Compare
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
LGTM.
ccda165
to
258766a
Compare
258766a
to
81d4bd4
Compare
@ofborg build trilium-next-desktop trilium-next-server (internal ofborg error) |
81d4bd4
to
269e28e
Compare
Would it make sense to build the packages instead of fetching them from GitHub releases? For the server, the build script is a little messy but I think most of this can be skipped. The desktop app is a little more involved, but this would let us use the nix-patched electron. |
Unfortunately the desktop app uses electron-forge, which is used by no other packages in nixpkgs. I tried to build from source a while ago, and it wasn't really possible.. |
Note that we already use nixpkgs' electron to create the wrapper. |
My previous attempt at a source build: https://github.com/FliegendeWurst/nixpkgs/blob/b37e2e7c3479d893d5acf9acf4566ae2e72b22f8/pkgs/applications/office/trilium-next/desktop.nix |
Hi, @FliegendeWurst . We should probably update to v0.90.12 which is the latest stable version. diff --git a/pkgs/by-name/tr/trilium-next-desktop/package.nix b/pkgs/by-name/tr/trilium-next-desktop/package.nix
index 33e09385b26d..0e72c1e9833d 100644
--- a/pkgs/by-name/tr/trilium-next-desktop/package.nix
+++ b/pkgs/by-name/tr/trilium-next-desktop/package.nix
@@ -16,13 +16,13 @@
let
pname = "trilium-next-desktop";
- version = "0.90.8";
+ version = "0.90.12";
linuxSource.url = "https://github.com/TriliumNext/Notes/releases/download/v${version}/TriliumNextNotes-v${version}-linux-x64.zip";
- linuxSource.sha256 = "0l9a2l79jcbr4522k03bbzli9gv96pr15cyig6fg9qpf71cjvda1";
+ linuxSource.sha256 = "0ji28l60wyzhjbi6g5845dnm763bvg7535zfgzcmfgwjs6zr6nfq";
darwinSource.url = "https://github.com/TriliumNext/Notes/releases/download/v${version}/TriliumNextNotes-v${version}-macos-x64.zip";
- darwinSource.sha256 = "0wki6a6bpp698r51wvyl7xh8y8csj5yaihaxfplp8q33zp9nw2q8";
+ darwinSource.sha256 = "0jv80k7dk6gpyfj36iin6y7fk7qan4bya72f14jcgfla95wvk6ls";
meta = {
description = "Hierarchical note taking application with focus on building large personal knowledge bases";
@@ -89,7 +89,7 @@ let
asar extract $out/share/trilium/resources/app.asar $tmp
rm $out/share/trilium/resources/app.asar
- for f in "src/services/i18n.ts" "dist/src/services/i18n.js" "dist/src/build/src/services/i18n.js" "build/src/services/i18n.js"; do
+ for f in "src/services/utils.ts" "dist/src/services/utils.js"; do
substituteInPlace $tmp/$f \
--replace-fail "process.resourcesPath" "'$out/share/trilium/resources'"
done
diff --git a/pkgs/by-name/tr/trilium-next-server/package.nix b/pkgs/by-name/tr/trilium-next-server/package.nix
index 3544ef30885a..5d48f2b71184 100644
--- a/pkgs/by-name/tr/trilium-next-server/package.nix
+++ b/pkgs/by-name/tr/trilium-next-server/package.nix
@@ -8,10 +8,10 @@
}:
let
- version = "0.90.8";
+ version = "0.90.12";
serverSource.url = "https://github.com/TriliumNext/Notes/releases/download/v${version}/TriliumNextNotes-v${version}-server-linux-x64.tar.xz";
- serverSource.sha256 = "0ax2z3siaxvmdiasn3ddll0yvllkyi3g2xbks5h6vmgh59ivjh2x";
+ serverSource.sha256 = "0gvb01cj334n805rs230xwwcv4rf2z2giikpagw8wqrs54gy3b35";
in
stdenv.mkDerivation {
pname = "trilium-next-server";
|
269e28e
to
ef2e230
Compare
I updated the package. (by the way, are the docs at https://github.com/TriliumNext/Notes/tree/develop/docs hosted somewhere on the Github pages?) |
They are hosted at https://triliumnext.github.io/Notes but they are slightly out of date as we are struggling a bit to get the documentation to be hosted on a TriliumNext instance. A more up to date version of these documents can be found at https://elian-trilium.pikapod.net/share/4yYHqKbLovVX . It will be relocated to the TriliumNext documentation instance. The latest version of the user-facing documentation is available here: https://triliumnext.pikapod.net/share/ |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Please also don't forget to rename the PR to reflect the change in version to v0.90.12.
Co-Authored-By: FliegendeWurst <[email protected]>
ef2e230
to
6000de6
Compare
New package, based on the old Trilium.
cc @eliandoran
Closes #348144
Closes #339237
Things done
Add a 👍 reaction to pull requests you find important.