-
-
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: init at 0.90.4 #348144
trilium-next: init at 0.90.4 #348144
Conversation
cd1de14
to
25e3c44
Compare
@@ -117,7 +119,7 @@ in | |||
wantedBy = [ "multi-user.target" ]; | |||
environment.TRILIUM_DATA_DIR = cfg.dataDir; | |||
serviceConfig = { | |||
ExecStart = "${pkgs.trilium-server}/bin/trilium-server"; | |||
ExecStart = "${cfg.package}/bin/trilium-server"; |
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.
ExecStart = "${cfg.package}/bin/trilium-server"; | |
ExecStart = lib.getExe cfg.package; |
{ lib, callPackage, ... }: | ||
|
||
let | ||
metaCommon = with lib; { | ||
description = "Hierarchical note taking application with focus on building large personal knowledge bases"; | ||
homepage = "https://github.com/TriliumNext/Notes"; | ||
license = licenses.agpl3Plus; | ||
sourceProvenance = with sourceTypes; [ binaryNativeCode ]; | ||
platforms = [ "x86_64-linux" ]; | ||
maintainers = with maintainers; [ eliandoran ]; | ||
}; | ||
version = "0.90.4"; | ||
in | ||
{ | ||
|
||
trilium-next-desktop = callPackage ./desktop.nix { | ||
metaCommon = metaCommon; | ||
version = version; | ||
}; | ||
trilium-next-server = callPackage ./server.nix { | ||
metaCommon = metaCommon; | ||
version = version; | ||
}; | ||
|
||
} |
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.
{ lib, callPackage, ... }: | |
let | |
metaCommon = with lib; { | |
description = "Hierarchical note taking application with focus on building large personal knowledge bases"; | |
homepage = "https://github.com/TriliumNext/Notes"; | |
license = licenses.agpl3Plus; | |
sourceProvenance = with sourceTypes; [ binaryNativeCode ]; | |
platforms = [ "x86_64-linux" ]; | |
maintainers = with maintainers; [ eliandoran ]; | |
}; | |
version = "0.90.4"; | |
in | |
{ | |
trilium-next-desktop = callPackage ./desktop.nix { | |
metaCommon = metaCommon; | |
version = version; | |
}; | |
trilium-next-server = callPackage ./server.nix { | |
metaCommon = metaCommon; | |
version = version; | |
}; | |
} | |
{ lib, callPackage }: | |
let | |
metaCommon = with lib; { | |
description = "Hierarchical note taking application with focus on building large personal knowledge bases"; | |
homepage = "https://github.com/TriliumNext/Notes"; | |
license = licenses.agpl3Plus; | |
sourceProvenance = with sourceTypes; [ binaryNativeCode ]; | |
platforms = [ "x86_64-linux" ]; | |
maintainers = with maintainers; [ eliandoran ]; | |
}; | |
version = "0.90.4"; | |
in | |
{ | |
trilium-next-desktop = callPackage ./desktop.nix { | |
inherit metaCommon version; | |
}; | |
trilium-next-server = callPackage ./server.nix { | |
inherit metaCommon version; | |
}; | |
} |
|
||
src = fetchurl linuxSource; | ||
|
||
# TODO: migrate off autoPatchelfHook and use nixpkgs' electron |
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.
so, what's blocking that?
''; | ||
|
||
postFixup = '' | ||
cat > $out/bin/trilium-server <<EOF |
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 use makeWrapper
}; | ||
|
||
in | ||
if stdenv.isDarwin then darwin else linux |
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.
if stdenv.isDarwin then darwin else linux | |
if stdenv.hostPlatform.isDarwin then darwin else linux |
inherit (callPackage ../applications/office/trilium-next {}) | ||
trilium-next-desktop | ||
trilium-next-server | ||
; |
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.
should be in pkgs/by-name
sadly this wont be coming out in 24.11, since branch out was 4 days ago. this is very bad, as trilium next is now more important as sync became incompatible with the old version. this means that trilium next won't be in nixpkgs until mid-2025 (since releases are very 6months). pretty sad if you ask me @eliandoran i can help if you need |
New packages can always be backported. No problem there. |
I tried to package using nixpkgs' electron instead: https://github.com/FliegendeWurst/nixpkgs/blob/trilium-next/pkgs/applications/office/trilium-next/desktop.nix ... but for some reason, locale data is missing: @eliandoran do you know how this could be fixed? Do I need to add some more flags to my electron invocation? |
I fixed the above issue and created #356930 |
Closing in favor of #356930. |
This PR adds TriliumNext Notes which is a fork of Trilium Notes, which has entered maintenance mode.
Basically I've taken the original package description for Trilium and adapted it for the fork. I've also changed the server module to take in a
package
attribute.Note: I am also the upstream maintainer of TriliumNext Notes.
Closes #339237
Things done
nix.conf
? (See Nix manual)sandbox = relaxed
sandbox = true
nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD"
. Note: all changes have to be committed, also see nixpkgs-review usage./result/bin/
)Add a 👍 reaction to pull requests you find important.