X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=pkgs%2Fwebapps%2Fnextcloud%2Fdefault.nix;h=5017fd23b392b8dfdfb5ddd3cde60b7292c80211;hb=abd7458cbc97f9074f851f07f1f9145344b981ff;hp=fecb3a7b9cb2cfe5413c32ef23c8a69b57b0b33f;hpb=65b715d7e4a47f00fe0fca6c4b0eaff19e874d38;p=perso%2FImmae%2FConfig%2FNix.git

diff --git a/pkgs/webapps/nextcloud/default.nix b/pkgs/webapps/nextcloud/default.nix
index fecb3a7..5017fd2 100644
--- a/pkgs/webapps/nextcloud/default.nix
+++ b/pkgs/webapps/nextcloud/default.nix
@@ -1,20 +1,21 @@
-{ varDir ? "/var/lib/nextcloud", nextcloudVersion ? 17, otherConfig ? {}, lib, stdenv, callPackage, fetchurl }:
+{ varDir ? "/var/lib/nextcloud", nextcloudVersion ? 18, otherConfig ? {}, lib, stdenv, callPackage, fetchzip, fetchurl }:
 let
   appNames = [
-    "apporder" "audioplayer" "bookmarks" "calendar" "carnet" "contacts"
-    "cookbook" "deck" "extract" "files_markdown" "files_readmemd"
-    "flowupload" "gpxedit" "gpxpod" "keeweb" "maps" "metadata" "music"
-    "notes" "ocsms" "passman" "polls" "spreed" "tasks"
+    "apporder" "audioplayer" "bookmarks" "calendar" "carnet" "circles"
+    "contacts" "cookbook" "deck" "extract" "files_markdown"
+    "files_readmemd" "flowupload" "gpxedit" "gpxpod" "impersonate"
+    "keeweb" "maps" "metadata" "music" "notes" "ocsms" "passman" "polls"
+    "spreed" "social" "tasks"
   ];
   allApps = lib.attrsets.genAttrs appNames
     (name: callPackage (./apps + "/${name}.nix") { inherit buildApp nextcloudVersion; });
-  buildApp = { appName, version, url, sha256, otherConfig ? {}, installPhase ? "mkdir -p $out && cp -R . $out/" }:
+  buildApp = { appName, version, url, sha256, zip ? false, 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; };
+      src = (if zip then fetchzip else fetchurl) { inherit url sha256; };
       passthru = {
         inherit appName otherConfig;
       };
@@ -41,18 +42,19 @@ let
     in newNextcloud;
   package = stdenv.mkDerivation rec {
     name = "nextcloud-${version}";
-    version = "${builtins.toString nextcloudVersion}.0.6";
+    version = "${builtins.toString nextcloudVersion}.0.4";
 
     src = fetchurl {
       url = "https://download.nextcloud.com/server/releases/${name}.tar.bz2";
-      sha256 = "0qq7lkgzsn1zakfym5bjqzpcisxmgfcdd927ddqlhddy3zvgxrxx";
+      sha256 = "0aa3f4xbkzacfw0h9aic0ywk5mqlwka83qaszizj8lmk68kf3n7s";
     };
 
     installPhase = ''
       mkdir -p $out/
       cp -R . $out/
       rm -r $out/config
-      ln -sf ${varDir}/config $out/config
+      '' + lib.optionalString (varDir != null) ''
+        ln -sf ${varDir}/config $out/config
       '';
 
     passthru = toPassthru package [] otherConfig;