aboutsummaryrefslogtreecommitdiff
path: root/pkgs/webapps
diff options
context:
space:
mode:
authorIsmaël Bouya <ismael.bouya@normalesup.org>2020-07-02 13:07:42 +0200
committerIsmaël Bouya <ismael.bouya@normalesup.org>2020-07-02 13:07:42 +0200
commit50def5927f7640dbcb4f97be916a1930765edf09 (patch)
treefff393d78c2316bd8ada00313338e824b7902cac /pkgs/webapps
parent839b49f18dcf4ed74d590ac212259fa3e3779692 (diff)
downloadNix-50def5927f7640dbcb4f97be916a1930765edf09.tar.gz
Nix-50def5927f7640dbcb4f97be916a1930765edf09.tar.zst
Nix-50def5927f7640dbcb4f97be916a1930765edf09.zip
Fix music nextcloud app
Diffstat (limited to 'pkgs/webapps')
-rw-r--r--pkgs/webapps/nextcloud/apps/music.nix7
-rw-r--r--pkgs/webapps/nextcloud/default.nix6
2 files changed, 7 insertions, 6 deletions
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 @@
2assert nextcloudVersion >= 9 && nextcloudVersion <= 19; 2assert nextcloudVersion >= 9 && nextcloudVersion <= 19;
3buildApp rec { 3buildApp rec {
4 appName = "music"; 4 appName = "music";
5 version = "0.14.0"; 5 version = "0.14.1";
6 url = "https://github.com/owncloud/${appName}/archive/v${version}.tar.gz"; 6 url = "https://github.com/owncloud/music/releases/download/v${version}/${appName}.zip";
7 sha256 = "0f2nb69krnfgxx9x4nnlkmrlz33n01k6i9r2mbba7i34xgdi6vsq"; 7 zip = true;
8 sha256 = "06svn24qix0nbikwi0kxnli402vq99851bn5ljcsm10r74bnlw83";
8} 9}
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 @@
1{ varDir ? "/var/lib/nextcloud", nextcloudVersion ? 18, otherConfig ? {}, lib, stdenv, callPackage, fetchurl }: 1{ varDir ? "/var/lib/nextcloud", nextcloudVersion ? 18, otherConfig ? {}, lib, stdenv, callPackage, fetchzip, fetchurl }:
2let 2let
3 appNames = [ 3 appNames = [
4 "apporder" "audioplayer" "bookmarks" "calendar" "carnet" "contacts" 4 "apporder" "audioplayer" "bookmarks" "calendar" "carnet" "contacts"
@@ -8,13 +8,13 @@ let
8 ]; 8 ];
9 allApps = lib.attrsets.genAttrs appNames 9 allApps = lib.attrsets.genAttrs appNames
10 (name: callPackage (./apps + "/${name}.nix") { inherit buildApp nextcloudVersion; }); 10 (name: callPackage (./apps + "/${name}.nix") { inherit buildApp nextcloudVersion; });
11 buildApp = { appName, version, url, sha256, otherConfig ? {}, installPhase ? "mkdir -p $out && cp -R . $out/" }: 11 buildApp = { appName, version, url, sha256, zip ? false, otherConfig ? {}, installPhase ? "mkdir -p $out && cp -R . $out/" }:
12 stdenv.mkDerivation rec { 12 stdenv.mkDerivation rec {
13 name = "nextcloud-app-${appName}-${version}"; 13 name = "nextcloud-app-${appName}-${version}";
14 inherit version; 14 inherit version;
15 phases = "unpackPhase installPhase"; 15 phases = "unpackPhase installPhase";
16 inherit installPhase; 16 inherit installPhase;
17 src = fetchurl { inherit url sha256; }; 17 src = (if zip then fetchzip else fetchurl) { inherit url sha256; };
18 passthru = { 18 passthru = {
19 inherit appName otherConfig; 19 inherit appName otherConfig;
20 }; 20 };