Move yourls to pkgs

[perso/Immae/Config/Nix.git] / nixops / modules / websites / tools / tools / default.nix

diff --git a/nixops/modules/websites/tools/tools/default.nix b/nixops/modules/websites/tools/tools/default.nix
index 9be9d5dc59e6e676dd800939eb47a52530221712..746119bae8738c29e5640803b1acd89ed843a6e6 100644 (file)
--- a/nixops/modules/websites/tools/tools/default.nix
+++ b/nixops/modules/websites/tools/tools/default.nix
@@ -14,25 +14,25 @@ let
     };
     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;
       env = myconfig.env.tools.phpldapadmin;
     };
 
@@ -248,12 +248,6 @@ in {
       ln -s ${kanboard.webRoot} $out/webapps/${kanboard.apache.webappName}
       '';
 
-    nixpkgs.overlays = [ (self: super: rec {
-      ympd = super.ympd.overrideAttrs(old: mylibs.fetchedGithub ./ympd.json // {
-        patches = (old.patches or []) ++ [ ./ympd-password-env.patch ];
-      });
-    }) ];
-
     systemd.services.tt-rss = {
       description = "Tiny Tiny RSS feeds update daemon";
       serviceConfig = {