X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=nixops%2Fmodules%2Fwebsites%2Ftools%2Ftools%2Fdefault.nix;h=22588fb92012a689ca9bb4ee76c6b53785815938;hb=86663f1789aecdb62e44a4be46e0ed111b795a09;hp=e8722242c5c7494bfc410ba917f49ea6a58a1353;hpb=f5efae0f8c4c53798f8f9fc88c5f92f38a223320;p=perso%2FImmae%2FConfig%2FNix.git

diff --git a/nixops/modules/websites/tools/tools/default.nix b/nixops/modules/websites/tools/tools/default.nix
index e872224..22588fb 100644
--- a/nixops/modules/websites/tools/tools/default.nix
+++ b/nixops/modules/websites/tools/tools/default.nix
@@ -5,32 +5,31 @@ let
       env = myconfig.env.tools.ympd;
     };
     ttrss = pkgs.callPackage ./ttrss.nix {
-      inherit (mylibs) fetchedGithub fetchedGit;
+      inherit (pkgs.webapps) ttrss ttrss-plugins;
       env = myconfig.env.tools.ttrss;
     };
     roundcubemail = pkgs.callPackage ./roundcubemail.nix {
-      inherit (mylibs) fetchedGithub;
+      inherit (pkgs.webapps) roundcubemail roundcubemail-plugins roundcubemail-skins;
       env = myconfig.env.tools.roundcubemail;
     };
     rainloop = pkgs.callPackage ./rainloop.nix  {};
     kanboard = pkgs.callPackage ./kanboard.nix  {
-      inherit (mylibs) fetchedGithub;
       env = myconfig.env.tools.kanboard;
     };
     wallabag = pkgs.callPackage ./wallabag.nix { env = myconfig.env.tools.wallabag; };
     yourls = pkgs.callPackage ./yourls.nix {
-      inherit (mylibs) fetchedGithub;
+      inherit (pkgs.webapps) yourls yourls-plugins;
       env = myconfig.env.tools.yourls;
     };
     rompr = pkgs.callPackage ./rompr.nix {
-      inherit (mylibs) fetchedGithub;
+      inherit (pkgs.webapps) rompr;
       env = myconfig.env.tools.rompr;
     };
     shaarli = pkgs.callPackage ./shaarli.nix {
       env = myconfig.env.tools.shaarli;
     };
     dokuwiki = pkgs.callPackage ./dokuwiki.nix {
-      inherit (mylibs) fetchedGithub;
+      inherit (pkgs.webapps) dokuwiki dokuwiki-plugins;
     };
     ldap = pkgs.callPackage ./ldap.nix {
       inherit (pkgs.webapps) phpldapadmin;