10 files changed, 64 insertions, 11 deletions

diff --git a/pkgs/webapps/default.nix b/pkgs/webapps/default.nix
index 8c3eb0ef..25425757 100644
--- a/pkgs/webapps/default.nix
+++ b/pkgs/webapps/default.nix
@@ -59,8 +59,8 @@ rec {
         "audioplayer" "bookmarks" "calendar" "contacts" "deck"
         "files_markdown" "gpxedit" "gpxpod" "keeweb" "music"
         "notes" "ocsms" "passman" "spreed" "tasks"
-        "flowupload" "carnet"
-        # FIXME: fix passman for NC 16
+        "flowupload" "carnet" "maps" "cookbook" "polls"
+        "apporder" "extract" "files_readmemd" "metadata"
       ];
     in
     lib.attrsets.genAttrs names
diff --git a/pkgs/webapps/nextcloud/apps/apporder.nix b/pkgs/webapps/nextcloud/apps/apporder.nix
new file mode 100644
index 00000000..1a4d1f04
--- /dev/null
+++ b/pkgs/webapps/nextcloud/apps/apporder.nix
@@ -0,0 +1,7 @@
+{ buildApp }:
+buildApp rec {
+  appName = "apporder";
+  version = "0.8.0";
+  url = "https://github.com/juliushaertl/apporder/releases/download/v${version}/${appName}.tar.gz";
+  sha256 = "04wlvhdngn3fkvphaply9lycvmfy6294pzpvccvkj2m8ihbdnigw";
+}
diff --git a/pkgs/webapps/nextcloud/apps/cookbook.nix b/pkgs/webapps/nextcloud/apps/cookbook.nix
new file mode 100644
index 00000000..adc47c2a
--- /dev/null
+++ b/pkgs/webapps/nextcloud/apps/cookbook.nix
@@ -0,0 +1,13 @@
+{ buildApp }:
+buildApp rec {
+  appName = "cookbook";
+  version = "0.5.4";
+  url = "https://github.com/mrzapp/nextcloud-cookbook/releases/download/v${version}/${appName}.tar.gz";
+  sha256 = "1dav07jylmw9n05l7p3m20ywky27nrg3gna271mly5bvs9q6kanm";
+  installPhase = ''
+    sed -i -e "s/application..ld..json/application[^\"|\\\\']*ld[^\"|\\\\']*json/" lib/Service/RecipeService.php
+    mkdir -p $out
+    cp -R . $out/
+    '';
+}
+
diff --git a/pkgs/webapps/nextcloud/apps/extract.nix b/pkgs/webapps/nextcloud/apps/extract.nix
new file mode 100644
index 00000000..99e4e8f4
--- /dev/null
+++ b/pkgs/webapps/nextcloud/apps/extract.nix
@@ -0,0 +1,7 @@
+{ buildApp }:
+buildApp rec {
+  appName = "extract";
+  version = "1.2.2";
+  url = "https://github.com/PaulLereverend/NextcloudExtract/releases/download/${version}/${appName}.tar.gz";
+  sha256 = "1aq8f5ps8259ihlh1qwhcj1gwy6w341gmagzz1r763pipkj960g6";
+}
diff --git a/pkgs/webapps/nextcloud/apps/files_readmemd.nix b/pkgs/webapps/nextcloud/apps/files_readmemd.nix
new file mode 100644
index 00000000..1d0dd424
--- /dev/null
+++ b/pkgs/webapps/nextcloud/apps/files_readmemd.nix
@@ -0,0 +1,7 @@
+{ buildApp }:
+buildApp rec {
+  appName = "files_readmemd";
+  version = "1.1.2";
+  url = "https://gitlab.univ-nantes.fr/uncloud/files_readmemd/wikis/uploads/3c17fcee5fe4a7a7d77ac59de6feca96/${appName}.tar.gz";
+  sha256 = "1lx5rlh9n49cdbnxm6a85facjp4g88myaid764yr6jayc62g0qrq";
+}
diff --git a/pkgs/webapps/nextcloud/apps/keeweb.nix b/pkgs/webapps/nextcloud/apps/keeweb.nix
index 99713eee..866f3371 100644
--- a/pkgs/webapps/nextcloud/apps/keeweb.nix
+++ b/pkgs/webapps/nextcloud/apps/keeweb.nix
@@ -1,20 +1,16 @@
 { buildApp }:
 buildApp rec {
   appName = "keeweb";
-  version = "0.5.0";
+  version = "0.5.1";
   url = "https://github.com/jhass/nextcloud-keeweb/releases/download/v${version}/${appName}-${version}.tar.gz";
-  sha256 = "0wdr6ywlirmac7w1ld5ma7fwb4bykclbxfq2sxwg6pvzfid5vc8x";
+  sha256 = "1iaz4d6fz4zlgdn2hj7xx0nayyd0l865zxd6h795fpx5qpdj911h";
   installPhase = ''
     mkdir -p $out
     cp -R . $out/
-    sed -i -e 's/max-version="15"/max-version="16"/' $out/appinfo/info.xml
     '';
   otherConfig = {
-    mimetypealiases = {
-      "x-application/kdbx" = "kdbx";
-    };
     mimetypemapping = {
-      "kdbx" = ["x-application/kdbx"];
+      "kdbx" = ["application/x-kdbx"];
     };
   };
 }
diff --git a/pkgs/webapps/nextcloud/apps/maps.nix b/pkgs/webapps/nextcloud/apps/maps.nix
new file mode 100644
index 00000000..4232a246
--- /dev/null
+++ b/pkgs/webapps/nextcloud/apps/maps.nix
@@ -0,0 +1,7 @@
+{ buildApp }:
+buildApp rec {
+  appName = "maps";
+  version = "0.1.2";
+  url = "https://github.com/nextcloud/maps/releases/download/v${version}/${appName}-${version}.tar.gz";
+  sha256 = "0jk4fikk72g2yj3p0f8i80d26lsi88kfpflrmh5c4acgf3jzxp02";
+}
diff --git a/pkgs/webapps/nextcloud/apps/metadata.nix b/pkgs/webapps/nextcloud/apps/metadata.nix
new file mode 100644
index 00000000..9adda9d2
--- /dev/null
+++ b/pkgs/webapps/nextcloud/apps/metadata.nix
@@ -0,0 +1,7 @@
+{ buildApp }:
+buildApp rec {
+  appName = "metadata";
+  version = "0.10.0";
+  url = "https://github.com/gino0631/nextcloud-metadata/releases/download/v${version}/${appName}.tar.gz";
+  sha256 = "1qqgzk0b13k5gfy9sdjqm9v325lm8qn7ikv3a8d21pzzqii6402x";
+}
diff --git a/pkgs/webapps/nextcloud/apps/passman.nix b/pkgs/webapps/nextcloud/apps/passman.nix
index 869acb3d..0d9d9948 100644
--- a/pkgs/webapps/nextcloud/apps/passman.nix
+++ b/pkgs/webapps/nextcloud/apps/passman.nix
@@ -1,7 +1,9 @@
 { buildApp }:
 buildApp rec {
+  # FIXME: it creates a /settings/user/additional setting url which
+  # doesn’t work
   appName = "passman";
-  version = "2.2.1";
+  version = "2.3.4";
   url = "https://releases.passman.cc/${appName}_${version}.tar.gz";
-  sha256 = "064pq9d0pl3y1vcywpi19fg47zy7j4h0jaxy6jklwzwcrmzagbka";
+  sha256 = "004bgdbz6ks0zizgx6gw6m60g30m1xclw4fakbh6qq1n8sxpdqsq";
 }
diff --git a/pkgs/webapps/nextcloud/apps/polls.nix b/pkgs/webapps/nextcloud/apps/polls.nix
new file mode 100644
index 00000000..ff0258a2
--- /dev/null
+++ b/pkgs/webapps/nextcloud/apps/polls.nix
@@ -0,0 +1,7 @@
+{ buildApp }:
+buildApp rec {
+  appName = "polls";
+  version = "0.10.4";
+  url = "https://github.com/nextcloud/polls/releases/download/v${version}/${appName}.tar.gz";
+  sha256 = "10h2i1ya1n4vkbd84ak5xcbprzai4nxjsq6b8z097p9fb90rbw4r";
+}