X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=pkgs%2Fwebapps%2Fnextcloud%2Fdefault.nix;h=12134943cf746683946c3b956f2fd056ca11b586;hb=9970dfe647ff13341d32899bd5d283f119651a48;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..1213494 100644
--- a/pkgs/webapps/nextcloud/default.nix
+++ b/pkgs/webapps/nextcloud/default.nix
@@ -1,4 +1,4 @@
-{ 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"
@@ -8,13 +8,13 @@ let
   ];
   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,11 +41,11 @@ 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 = ''