summary refs log tree commit diff
path: root/pkgs/top-level
diff options
context:
space:
mode:
authorAaron Andersen <aaron@fosslib.net>2019-12-22 20:26:57 -0500
committerGitHub <noreply@github.com>2019-12-22 20:26:57 -0500
commit086d1ad9062473766e7c320d03d6bfde85f263a8 (patch)
tree46643819a30462b603bc18c781f6c5c10f6b53fb /pkgs/top-level
parente865acf44c70653a1c15da9bf70faf2c1c16d9d6 (diff)
parentebf3f1fe784c5475230fc1f99f4a716f2b6821ad (diff)
downloadnixpkgs-086d1ad9062473766e7c320d03d6bfde85f263a8.tar
nixpkgs-086d1ad9062473766e7c320d03d6bfde85f263a8.tar.gz
nixpkgs-086d1ad9062473766e7c320d03d6bfde85f263a8.tar.bz2
nixpkgs-086d1ad9062473766e7c320d03d6bfde85f263a8.tar.lz
nixpkgs-086d1ad9062473766e7c320d03d6bfde85f263a8.tar.xz
nixpkgs-086d1ad9062473766e7c320d03d6bfde85f263a8.tar.zst
nixpkgs-086d1ad9062473766e7c320d03d6bfde85f263a8.zip
Merge pull request #75047 from kampka/trilium-server
Add trilium server and module
Diffstat (limited to 'pkgs/top-level')
-rw-r--r--pkgs/top-level/all-packages.nix6
1 files changed, 5 insertions, 1 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index a7e405e20cb..cba2d61184d 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6816,7 +6816,11 @@ in
 
   triggerhappy = callPackage ../tools/inputmethods/triggerhappy {};
 
-  trilium = callPackage ../applications/office/trilium { };
+  inherit (callPackage ../applications/office/trilium {})
+    trilium-desktop
+    trilium-server
+    ;
+  trilium = trilium-desktop;
 
   trousers = callPackage ../tools/security/trousers { };