X-Git-Url: https://git.immae.eu/?p=perso%2FImmae%2FConfig%2FNix.git;a=blobdiff_plain;f=pkgs%2Fwebapps%2Fnextcloud%2Fdefault.nix;fp=pkgs%2Fwebapps%2Fnextcloud%2Fdefault.nix;h=0287f75321bcafe99d3394b7b3af41ff9fec1917;hp=c3471fe6b35989e74bc2c2ec7df8948b93c6b739;hb=3a1461cf44102e6cd8cdee5e0f1ff1d7992894ad;hpb=0ede7366409e14482017f70f1efc53426279b8d0

diff --git a/pkgs/webapps/nextcloud/default.nix b/pkgs/webapps/nextcloud/default.nix
index c3471fe..0287f75 100644
--- a/pkgs/webapps/nextcloud/default.nix
+++ b/pkgs/webapps/nextcloud/default.nix
@@ -1,13 +1,15 @@
-{ varDir ? "/var/lib/nextcloud", lib, stdenv, fetchurl }:
+{ varDir ? "/var/lib/nextcloud", otherConfig ? {}, lib, stdenv, fetchurl }:
 let
-  buildApp = { appName, version, url, sha256, installPhase ? "mkdir -p $out && cp -R . $out/" }:
+  buildApp = { appName, version, url, sha256, otherConfig ? {}, installPhase ? "mkdir -p $out && cp -R . $out/" }:
     stdenv.mkDerivation rec {
       name = "nextcloud-app-${appName}-${version}";
       inherit version;
       phases = "unpackPhase installPhase";
       inherit installPhase;
       src = fetchurl { inherit url sha256; };
-      passthru.appName = appName;
+      passthru = {
+        inherit appName otherConfig;
+      };
     };
   withApps = apps: package.overrideAttrs(old: {
     name = "${old.name}-with-apps";
@@ -16,17 +18,25 @@ let
       builtins.concatStringsSep "\n" (
         map (value: "ln -sf ${value} $out/apps/${value.appName}") apps
       ));
+
+    passthru.otherConfig = with lib.attrsets; with lib.lists; let
+      zipped = zipAttrs ([old.otherConfig or {}] ++ map (v: v.otherConfig) apps);
+    in
+      {
+        mimetypealiases = foldr (h: prev: prev // h) {} zipped.mimetypealiases;
+        mimetypemapping = mapAttrs (_: v: unique (flatten v)) (zipAttrs zipped.mimetypemapping);
+      };
     passthru.apps = apps;
     passthru.withApps = moreApps: old.withApps (moreApps ++ apps);
   });
 
   package = stdenv.mkDerivation rec {
     name = "nextcloud-${version}";
-    version = "15.0.4";
+    version = "16.0.0";
 
     src = fetchurl {
       url = "https://download.nextcloud.com/server/releases/${name}.tar.bz2";
-      sha256 = "0xwg7p31y1pkjk1pzygh9shpqxnfkafrab52j7in7xblq53v0zgq";
+      sha256 = "0bj014vczlrql1w32pqmr7cyqn9awnyzpi2syxhg16qxic1gfcj5";
     };
 
     installPhase = ''
@@ -38,7 +48,7 @@ let
 
     passthru = {
       apps = [];
-      inherit buildApp withApps varDir;
+      inherit otherConfig buildApp withApps varDir;
     };
     meta = {
       description = "Sharing solution for files, calendars, contacts and more";