Reorder webapps imports

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

diff --git a/pkgs/webapps/default.nix b/pkgs/webapps/default.nix
index 4403f5da3eb969ff711c55c8edd22f46493a42cc..1dde9ca7bd3696c1a42fcd7755c22174079771e1 100644 (file)
--- a/pkgs/webapps/default.nix
+++ b/pkgs/webapps/default.nix
@@ -1,14 +1,38 @@
 { callPackage, mylibs, lib }:
 rec {
-  diaspora = callPackage ./diaspora { inherit mylibs; };
-
-  mastodon = callPackage ./mastodon { inherit mylibs; };
-
+  adminer = callPackage ./adminer {};
   awl = callPackage ./awl {};
   davical = callPackage ./davical {};
+  diaspora = callPackage ./diaspora { inherit mylibs; };
+
+  dokuwiki = callPackage ./dokuwiki { inherit mylibs; };
+  dokuwiki-with-plugins = dokuwiki.withPlugins (builtins.attrValues dokuwiki-plugins);
+  dokuwiki-plugins = let
+    names = [ "farmer" "todo" ];
+  in
+    lib.attrsets.genAttrs names
+      (name: callPackage (./dokuwiki/plugins + "/${name}.nix") {});
 
   infcloud = callPackage ./infcloud {};
 
+  mantisbt_2 = callPackage ./mantisbt_2 {};
+  mantisbt_2-with-plugins = mantisbt_2.withPlugins (builtins.attrValues mantisbt_2-plugins);
+  mantisbt_2-plugins = let
+    names = [ "slack" "source-integration" ];
+  in
+    lib.attrsets.genAttrs names
+      (name: callPackage (./mantisbt_2/plugins + "/${name}") {});
+
+  mastodon = callPackage ./mastodon { inherit mylibs; };
+
+  mediagoblin = callPackage ./mediagoblin { inherit mylibs; };
+  mediagoblin-with-plugins = mediagoblin.withPlugins (builtins.attrValues mediagoblin-plugins);
+  mediagoblin-plugins = let
+    names = [ "basicsearch" ];
+  in
+    lib.attrsets.genAttrs names
+      (name: callPackage (./mediagoblin/plugins + "/${name}") {});
+
   nextcloud = callPackage ./nextcloud {};
   nextcloud-with-apps = nextcloud.withPlugins (builtins.attrValues nextcloud-apps);
   nextcloud-apps = let
@@ -24,22 +48,5 @@ rec {
       (name: callPackage (./nextcloud/apps + "/${name}.nix") { buildApp = nextcloud.buildApp; });
 
   phpldapadmin = callPackage ./phpldapadmin {};
-
   rompr = callPackage ./rompr { inherit mylibs; };
-
-  mantisbt_2 = callPackage ./mantisbt_2 {};
-  mantisbt_2-with-plugins = mantisbt_2.withPlugins (builtins.attrValues mantisbt_2-plugins);
-  mantisbt_2-plugins = let
-    names = [ "slack" "source-integration" ];
-  in
-    lib.attrsets.genAttrs names
-      (name: callPackage (./mantisbt_2/plugins + "/${name}") {});
-
-  dokuwiki = callPackage ./dokuwiki { inherit mylibs; };
-  dokuwiki-with-plugins = dokuwiki.withPlugins (builtins.attrValues dokuwiki-plugins);
-  dokuwiki-plugins = let
-    names = [ "farmer" "todo" ];
-  in
-    lib.attrsets.genAttrs names
-      (name: callPackage (./dokuwiki/plugins + "/${name}.nix") {});
 }