From 6213b17b751fcc6ccd7df9a773dc29d9e8f22c21 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Isma=C3=ABl=20Bouya?= <ismael.bouya@normalesup.org>
Date: Tue, 7 May 2019 08:46:08 +0200
Subject: [PATCH] Reorder webapps imports

---
 pkgs/webapps/default.nix | 57 +++++++++++++++++++---------------------
 1 file changed, 27 insertions(+), 30 deletions(-)

diff --git a/pkgs/webapps/default.nix b/pkgs/webapps/default.nix
index 84e46bd..1dde9ca 100644
--- a/pkgs/webapps/default.nix
+++ b/pkgs/webapps/default.nix
@@ -1,31 +1,19 @@
 { 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; };
 
-  infcloud = callPackage ./infcloud {};
-
-  nextcloud = callPackage ./nextcloud {};
-  nextcloud-with-apps = nextcloud.withPlugins (builtins.attrValues nextcloud-apps);
-  nextcloud-apps = let
-      names = [
-        "audioplayer" "bookmarks" "calendar" "contacts" "deck"
-        "files_markdown" "gpxedit" "gpxpod" "keeweb" "music"
-        "notes" "ocsms" "passman" "spreed" "tasks"
-        "flowupload" "carnet"
-        # FIXME: fix passman for NC 16
-      ];
-    in
+  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 (./nextcloud/apps + "/${name}.nix") { buildApp = nextcloud.buildApp; });
-
-  phpldapadmin = callPackage ./phpldapadmin {};
+      (name: callPackage (./dokuwiki/plugins + "/${name}.nix") {});
 
-  rompr = callPackage ./rompr { inherit mylibs; };
+  infcloud = callPackage ./infcloud {};
 
   mantisbt_2 = callPackage ./mantisbt_2 {};
   mantisbt_2-with-plugins = mantisbt_2.withPlugins (builtins.attrValues mantisbt_2-plugins);
@@ -35,15 +23,7 @@ rec {
     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") {});
-
-  adminer = callPackage ./adminer {};
+  mastodon = callPackage ./mastodon { inherit mylibs; };
 
   mediagoblin = callPackage ./mediagoblin { inherit mylibs; };
   mediagoblin-with-plugins = mediagoblin.withPlugins (builtins.attrValues mediagoblin-plugins);
@@ -52,4 +32,21 @@ rec {
   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
+      names = [
+        "audioplayer" "bookmarks" "calendar" "contacts" "deck"
+        "files_markdown" "gpxedit" "gpxpod" "keeweb" "music"
+        "notes" "ocsms" "passman" "spreed" "tasks"
+        "flowupload" "carnet"
+        # FIXME: fix passman for NC 16
+      ];
+    in
+    lib.attrsets.genAttrs names
+      (name: callPackage (./nextcloud/apps + "/${name}.nix") { buildApp = nextcloud.buildApp; });
+
+  phpldapadmin = callPackage ./phpldapadmin {};
+  rompr = callPackage ./rompr { inherit mylibs; };
 }
-- 
2.41.0