Fix music nextcloud app

diff --git a/pkgs/webapps/nextcloud/apps/music.nix b/pkgs/webapps/nextcloud/apps/music.nix
index 1871e91c62ee39cdfaf7506a06ab79832a659e0c..e430dd9ee342f913c126efddcf5cf8d8c1401472 100644 (file)
--- a/pkgs/webapps/nextcloud/apps/music.nix
+++ b/pkgs/webapps/nextcloud/apps/music.nix
@@ -2,7 +2,8 @@
 assert nextcloudVersion >= 9 && nextcloudVersion <= 19;
 buildApp rec {
   appName = "music";
 assert nextcloudVersion >= 9 && nextcloudVersion <= 19;
 buildApp rec {
   appName = "music";

-  version = "0.14.0";
-  url = "https://github.com/owncloud/${appName}/archive/v${version}.tar.gz";
-  sha256 = "0f2nb69krnfgxx9x4nnlkmrlz33n01k6i9r2mbba7i34xgdi6vsq";
+  version = "0.14.1";
+  url = "https://github.com/owncloud/music/releases/download/v${version}/${appName}.zip";
+  zip = true;
+  sha256 = "06svn24qix0nbikwi0kxnli402vq99851bn5ljcsm10r74bnlw83";

 }
 }

diff --git a/pkgs/webapps/nextcloud/default.nix b/pkgs/webapps/nextcloud/default.nix
index 3d5e1144dce4651ac87ee51e5345cda3004cfe2f..12134943cf746683946c3b956f2fd056ca11b586 100644 (file)
--- a/pkgs/webapps/nextcloud/default.nix
+++ b/pkgs/webapps/nextcloud/default.nix
@@ -1,4 +1,4 @@
-{ varDir ? "/var/lib/nextcloud", nextcloudVersion ? 18, 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"
 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; });
   ];
   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;
     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;
       };
       passthru = {
         inherit appName otherConfig;
       };