about summary refs log tree commit diff
path: root/pkgs/top-level
diff options
context:
space:
mode:
authorWill Dietz <github@wdtz.org>2019-01-02 00:56:23 -0600
committerGitHub <noreply@github.com>2019-01-02 00:56:23 -0600
commit0d75d67c3d16a7a2e31ddb6d25df942ba3f3b23e (patch)
treea2479ea46192432688df83416bf0892fa6f81c42 /pkgs/top-level
parentb2b921bdcaa82044df338e508fbb6348b8e7a344 (diff)
parent104d37c7a2aec3247a684562860621874c4d60eb (diff)
downloadnixlib-0d75d67c3d16a7a2e31ddb6d25df942ba3f3b23e.tar
nixlib-0d75d67c3d16a7a2e31ddb6d25df942ba3f3b23e.tar.gz
nixlib-0d75d67c3d16a7a2e31ddb6d25df942ba3f3b23e.tar.bz2
nixlib-0d75d67c3d16a7a2e31ddb6d25df942ba3f3b23e.tar.lz
nixlib-0d75d67c3d16a7a2e31ddb6d25df942ba3f3b23e.tar.xz
nixlib-0d75d67c3d16a7a2e31ddb6d25df942ba3f3b23e.tar.zst
nixlib-0d75d67c3d16a7a2e31ddb6d25df942ba3f3b23e.zip
Merge pull request #53088 from dtzWill/feature/trilium
trilium: init at 0.26.1
Diffstat (limited to 'pkgs/top-level')
-rw-r--r--pkgs/top-level/all-packages.nix2
1 files changed, 2 insertions, 0 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index a2ca284f18dd..3960c659bb35 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5875,6 +5875,8 @@ in
 
   triggerhappy = callPackage ../tools/inputmethods/triggerhappy {};
 
+  trilium = callPackage ../applications/office/trilium { };
+
   trousers = callPackage ../tools/security/trousers { };
 
   tryton = callPackage ../applications/office/tryton { };