From 50def5927f7640dbcb4f97be916a1930765edf09 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Isma=C3=ABl=20Bouya?= <ismael.bouya@normalesup.org>
Date: Thu, 2 Jul 2020 13:07:42 +0200
Subject: Fix music nextcloud app

---
 pkgs/webapps/nextcloud/apps/music.nix | 7 ++++---
 pkgs/webapps/nextcloud/default.nix    | 6 +++---
 2 files changed, 7 insertions(+), 6 deletions(-)

(limited to 'pkgs/webapps')

diff --git a/pkgs/webapps/nextcloud/apps/music.nix b/pkgs/webapps/nextcloud/apps/music.nix
index 1871e91..e430dd9 100644
--- 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";
-  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 3d5e114..1213494 100644
--- 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"
@@ -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;
       };
-- 
cgit v1.2.3