X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=pkgs%2Fwebapps%2Fdefault.nix;h=25425757e58bf0033bfb98144b0367b383c8611d;hb=8a04ee0919035f89c3e12044f077bc438f0d0a46;hp=84e39ffad506a2c23b41e06d1e915520e0bd88e8;hpb=f3a8fab524e384e0b5cad3df6506a27b2f405ebc;p=perso%2FImmae%2FConfig%2FNix.git

diff --git a/pkgs/webapps/default.nix b/pkgs/webapps/default.nix
index 84e39ff..2542575 100644
--- a/pkgs/webapps/default.nix
+++ b/pkgs/webapps/default.nix
@@ -1,6 +1,7 @@
-{ callPackage, mylibs, composerEnv, lib }:
+{ callPackage, mylibs, composerEnv, lib, private }:
 rec {
   adminer = callPackage ./adminer {};
+  apache-theme = callPackage ./apache-theme {};
   awl = callPackage ./awl {};
   davical = callPackage ./davical {};
   diaspora = callPackage ./diaspora { inherit mylibs; };
@@ -58,14 +59,14 @@ rec {
         "audioplayer" "bookmarks" "calendar" "contacts" "deck"
         "files_markdown" "gpxedit" "gpxpod" "keeweb" "music"
         "notes" "ocsms" "passman" "spreed" "tasks"
-        "flowupload" "carnet"
-        # FIXME: fix passman for NC 16
+        "flowupload" "carnet" "maps" "cookbook" "polls"
+        "apporder" "extract" "files_readmemd" "metadata"
       ];
     in
     lib.attrsets.genAttrs names
       (name: callPackage (./nextcloud/apps + "/${name}.nix") { buildApp = nextcloud.buildApp; });
 
-  peertube = callPackage ../impure/peertube { inherit mylibs; };
+  peertube = callPackage ./peertube { inherit mylibs; };
   phpldapadmin = callPackage ./phpldapadmin {};
   rompr = callPackage ./rompr { inherit mylibs; };
 
@@ -86,6 +87,9 @@ rec {
     lib.attrsets.genAttrs names
       (name: callPackage (./roundcubemail/plugins + "/${name}") { buildPlugin = roundcubemail.buildPlugin; });
 
+  spip = callPackage ./spip {};
+  taskwarrior-web = callPackage ./taskwarrior-web { inherit mylibs; };
+
   ttrss = callPackage ./ttrss { inherit mylibs; };
   ttrss-with-plugins = ttrss.withPlugins (builtins.attrValues ttrss-plugins);
   ttrss-plugins = let
@@ -107,4 +111,4 @@ rec {
   in
     lib.attrsets.genAttrs names
       (name: callPackage (./yourls/plugins + "/${name}") { inherit mylibs; });
-}
+} // private.webapps