WIP upgrade

[perso/Immae/Config/Nix.git] / pkgs / webapps / default.nix

diff --git a/pkgs/webapps/default.nix b/pkgs/webapps/default.nix
index 33fd7300997a225e97f3b578bd5a33b1bbcc75d6..fc984aa39f9c14d2970051feea7aa80056baea10 100644 (file)
--- a/pkgs/webapps/default.nix
+++ b/pkgs/webapps/default.nix
@@ -3,25 +3,29 @@ rec {
   adminer = callPackage ./adminer {};
   apache-theme = callPackage ./apache-theme {};
   awl = callPackage ./awl {};
+  copanier = (mylibs.flakeCompat ../../flakes/copanier).default;
   davical = callPackage ./davical {};
-  diaspora = callPackage ./diaspora { inherit mylibs; };
+  diaspora = (mylibs.flakeCompat ../../flakes/diaspora).default;
   dokuwiki = callPackage ./dokuwiki { inherit mylibs; };
-  etherpad-lite = callPackage ./etherpad-lite {};
-  grocy = callPackage ./grocy { inherit mylibs composerEnv; };
+  etherpad-lite = (mylibs.flakeCompat ../../flakes/etherpad-lite).default;
+  grocy = (mylibs.flakeCompat ../../flakes/grocy).default;
   infcloud = callPackage ./infcloud {};
   mantisbt_2 = callPackage ./mantisbt_2 {};
-  mastodon = callPackage ./mastodon { inherit mylibs; };
-  mediagoblin = callPackage ./mediagoblin { inherit mylibs; };
-  nextcloud = callPackage ./nextcloud {};
-  peertube = callPackage ./peertube { inherit mylibs; };
+  mastodon = (mylibs.flakeCompat ../../flakes/mastodon).default;
+  mediagoblin = (mylibs.flakeCompat ../../flakes/mediagoblin).default;
+  nextcloud_20 = callPackage ./nextcloud { nextcloudVersion = 20; };
+  nextcloud_21 = callPackage ./nextcloud { nextcloudVersion = 21; };
+  nextcloud_22 = callPackage ./nextcloud { nextcloudVersion = 22; };
+  nextcloud_23 = callPackage ./nextcloud { nextcloudVersion = 23; };
+  peertube = (mylibs.flakeCompat ../../flakes/peertube).default;
   phpbb = callPackage ./phpbb {};
   phpldapadmin = callPackage ./phpldapadmin {};
   rompr = callPackage ./rompr { inherit mylibs; };
   roundcubemail = callPackage ./roundcubemail {};
   spip = callPackage ./spip {};
-  surfer = callPackage ./surfer { inherit mylibs; };
-  taskwarrior-web = callPackage ./taskwarrior-web { inherit mylibs; };
-  ttrss = callPackage ./ttrss { inherit mylibs; };
+  surfer = (mylibs.flakeCompat ../../flakes/surfer).default;
+  taskwarrior-web = (mylibs.flakeCompat ../../flakes/taskwarrior-web).default;
+  ttrss = callPackage ./ttrss {};
   wallabag = callPackage ./wallabag { inherit composerEnv; };
   yourls = callPackage ./yourls { inherit mylibs; };
 }