aboutsummaryrefslogtreecommitdiff
path: root/pkgs
diff options
context:
space:
mode:
authorIsmaël Bouya <ismael.bouya@normalesup.org>2020-05-07 10:39:56 +0200
committerIsmaël Bouya <ismael.bouya@normalesup.org>2020-05-08 01:35:21 +0200
commit65b715d7e4a47f00fe0fca6c4b0eaff19e874d38 (patch)
treea82893e4520225fb33e96d15e9e67ccecb35b32e /pkgs
parent4e3e4761c8566cbc47c64d66bfc21bb6dee32860 (diff)
downloadNix-65b715d7e4a47f00fe0fca6c4b0eaff19e874d38.tar.gz
Nix-65b715d7e4a47f00fe0fca6c4b0eaff19e874d38.tar.zst
Nix-65b715d7e4a47f00fe0fca6c4b0eaff19e874d38.zip
Upgrade nextcloud
Diffstat (limited to 'pkgs')
-rw-r--r--pkgs/webapps/default.nix12
-rw-r--r--pkgs/webapps/nextcloud/apps/apporder.nix7
-rw-r--r--pkgs/webapps/nextcloud/apps/audioplayer.nix7
-rw-r--r--pkgs/webapps/nextcloud/apps/bookmarks.nix7
-rw-r--r--pkgs/webapps/nextcloud/apps/calendar.nix7
-rw-r--r--pkgs/webapps/nextcloud/apps/carnet.nix7
-rw-r--r--pkgs/webapps/nextcloud/apps/contacts.nix7
-rw-r--r--pkgs/webapps/nextcloud/apps/cookbook.nix7
-rw-r--r--pkgs/webapps/nextcloud/apps/deck.nix7
-rw-r--r--pkgs/webapps/nextcloud/apps/extract.nix7
-rw-r--r--pkgs/webapps/nextcloud/apps/files_markdown.nix7
-rw-r--r--pkgs/webapps/nextcloud/apps/files_readmemd.nix7
-rw-r--r--pkgs/webapps/nextcloud/apps/flowupload.nix9
-rw-r--r--pkgs/webapps/nextcloud/apps/gpxedit.nix9
-rw-r--r--pkgs/webapps/nextcloud/apps/gpxpod.nix9
-rw-r--r--pkgs/webapps/nextcloud/apps/keeweb.nix7
-rw-r--r--pkgs/webapps/nextcloud/apps/maps.nix7
-rw-r--r--pkgs/webapps/nextcloud/apps/metadata.nix7
-rw-r--r--pkgs/webapps/nextcloud/apps/music.nix7
-rw-r--r--pkgs/webapps/nextcloud/apps/notes.nix9
-rw-r--r--pkgs/webapps/nextcloud/apps/ocsms.nix9
-rw-r--r--pkgs/webapps/nextcloud/apps/passman.nix7
-rw-r--r--pkgs/webapps/nextcloud/apps/polls.nix7
-rw-r--r--pkgs/webapps/nextcloud/apps/spreed.nix7
-rw-r--r--pkgs/webapps/nextcloud/apps/tasks.nix7
-rw-r--r--pkgs/webapps/nextcloud/default.nix60
26 files changed, 132 insertions, 118 deletions
diff --git a/pkgs/webapps/default.nix b/pkgs/webapps/default.nix
index 2dea33b..e3ec07f 100644
--- a/pkgs/webapps/default.nix
+++ b/pkgs/webapps/default.nix
@@ -39,18 +39,6 @@ rec {
39 (name: callPackage (./mediagoblin/plugins + "/${name}") {}); 39 (name: callPackage (./mediagoblin/plugins + "/${name}") {});
40 40
41 nextcloud = callPackage ./nextcloud {}; 41 nextcloud = callPackage ./nextcloud {};
42 nextcloud-with-apps = nextcloud.withPlugins (builtins.attrValues nextcloud-apps);
43 nextcloud-apps = let
44 names = [
45 "audioplayer" "bookmarks" "calendar" "contacts" "deck"
46 "files_markdown" "gpxedit" "gpxpod" "keeweb" "music"
47 "notes" "ocsms" "passman" "spreed" "tasks"
48 "flowupload" "carnet" "maps" "cookbook" "polls"
49 "apporder" "extract" "files_readmemd" "metadata"
50 ];
51 in
52 lib.attrsets.genAttrs names
53 (name: callPackage (./nextcloud/apps + "/${name}.nix") { buildApp = nextcloud.buildApp; });
54 42
55 peertube = callPackage ./peertube { inherit mylibs; }; 43 peertube = callPackage ./peertube { inherit mylibs; };
56 phpbb = callPackage ./phpbb {}; 44 phpbb = callPackage ./phpbb {};
diff --git a/pkgs/webapps/nextcloud/apps/apporder.nix b/pkgs/webapps/nextcloud/apps/apporder.nix
index 1a4d1f0..29fd6e2 100644
--- a/pkgs/webapps/nextcloud/apps/apporder.nix
+++ b/pkgs/webapps/nextcloud/apps/apporder.nix
@@ -1,7 +1,8 @@
1{ buildApp }: 1{ buildApp, nextcloudVersion }:
2assert nextcloudVersion >= 16 && nextcloudVersion <= 18;
2buildApp rec { 3buildApp rec {
3 appName = "apporder"; 4 appName = "apporder";
4 version = "0.8.0"; 5 version = "0.9.0";
5 url = "https://github.com/juliushaertl/apporder/releases/download/v${version}/${appName}.tar.gz"; 6 url = "https://github.com/juliushaertl/apporder/releases/download/v${version}/${appName}.tar.gz";
6 sha256 = "04wlvhdngn3fkvphaply9lycvmfy6294pzpvccvkj2m8ihbdnigw"; 7 sha256 = "1add4i892n4bpmpxwrsr7x99fjyj5rk6maw04iwhviqqqr28fsw6";
7} 8}
diff --git a/pkgs/webapps/nextcloud/apps/audioplayer.nix b/pkgs/webapps/nextcloud/apps/audioplayer.nix
index e321002..a49776f 100644
--- a/pkgs/webapps/nextcloud/apps/audioplayer.nix
+++ b/pkgs/webapps/nextcloud/apps/audioplayer.nix
@@ -1,7 +1,8 @@
1{ buildApp }: 1{ buildApp, nextcloudVersion }:
2assert nextcloudVersion >= 17 && nextcloudVersion <= 19;
2buildApp rec { 3buildApp rec {
3 appName = "audioplayer"; 4 appName = "audioplayer";
4 version = "2.7.0"; 5 version = "2.10.0";
5 url = "https://github.com/Rello/${appName}/releases/download/${version}/${appName}-${version}.tar.gz"; 6 url = "https://github.com/Rello/${appName}/releases/download/${version}/${appName}-${version}.tar.gz";
6 sha256 = "05dylw45hs32agy6wqjy4r2x3h1dxzyzn0378ig6h5a22xd52mik"; 7 sha256 = "122wc05b0m8s5ksdhsiws98aqph894i7cffjkhfhq66c40a728s3";
7} 8}
diff --git a/pkgs/webapps/nextcloud/apps/bookmarks.nix b/pkgs/webapps/nextcloud/apps/bookmarks.nix
index 4632c92..1065c34 100644
--- a/pkgs/webapps/nextcloud/apps/bookmarks.nix
+++ b/pkgs/webapps/nextcloud/apps/bookmarks.nix
@@ -1,7 +1,8 @@
1{ buildApp }: 1{ buildApp, nextcloudVersion }:
2assert nextcloudVersion >= 17 && nextcloudVersion <= 19;
2buildApp rec { 3buildApp rec {
3 appName = "bookmarks"; 4 appName = "bookmarks";
4 version = "1.0.2"; 5 version = "3.0.10";
5 url = "https://github.com/nextcloud/${appName}/releases/download/v${version}/${appName}-${version}.tar.gz"; 6 url = "https://github.com/nextcloud/${appName}/releases/download/v${version}/${appName}-${version}.tar.gz";
6 sha256 = "1ph123d0pram9a0vq73rn0zw0pyg4l0xqg162b59ds68179m2jfp"; 7 sha256 = "0y12iqcc6yp25cisg7mg40ddx72531zdvsp2gcl37qi8vqf162ji";
7} 8}
diff --git a/pkgs/webapps/nextcloud/apps/calendar.nix b/pkgs/webapps/nextcloud/apps/calendar.nix
index 0812810..bc3ccea 100644
--- a/pkgs/webapps/nextcloud/apps/calendar.nix
+++ b/pkgs/webapps/nextcloud/apps/calendar.nix
@@ -1,7 +1,8 @@
1{ buildApp }: 1{ buildApp, nextcloudVersion }:
2assert nextcloudVersion >= 17 && nextcloudVersion <= 19;
2buildApp rec { 3buildApp rec {
3 appName = "calendar"; 4 appName = "calendar";
4 version = "1.7.0"; 5 version = "2.0.3";
5 url = "https://github.com/nextcloud/${appName}/releases/download/v${version}/${appName}.tar.gz"; 6 url = "https://github.com/nextcloud/${appName}/releases/download/v${version}/${appName}.tar.gz";
6 sha256 = "0cgvvgzc2kgs2ng36hzff8rrpw9n58f0hyrr41n3wjkf0iynm56r"; 7 sha256 = "17pjsa657p9n1kslqkfcxd6n4ssh2yd4f5l5ww79mixfs34idbl9";
7} 8}
diff --git a/pkgs/webapps/nextcloud/apps/carnet.nix b/pkgs/webapps/nextcloud/apps/carnet.nix
index 61431e5..879ab17 100644
--- a/pkgs/webapps/nextcloud/apps/carnet.nix
+++ b/pkgs/webapps/nextcloud/apps/carnet.nix
@@ -1,7 +1,8 @@
1{ buildApp }: 1{ buildApp, nextcloudVersion }:
2assert nextcloudVersion >= 13 && nextcloudVersion <= 18;
2buildApp rec { 3buildApp rec {
3 appName = "carnet"; 4 appName = "carnet";
4 version = "0.15.2"; 5 version = "0.20.0";
5 url = "https://github.com/PhieF/CarnetNextcloud/releases/download/v${version}/${appName}-nc-v${version}.tar.gz"; 6 url = "https://github.com/PhieF/CarnetNextcloud/releases/download/v${version}/${appName}-nc-v${version}.tar.gz";
6 sha256 = "1npjb2bgwcfxlf22ygl2hfhfgaigk1kpdk795yc79mx2l1iicmg0"; 7 sha256 = "1hbvs88vj830xalyq8fv8xlnf7livsj1xmnjl4xgla803ch4aym8";
7} 8}
diff --git a/pkgs/webapps/nextcloud/apps/contacts.nix b/pkgs/webapps/nextcloud/apps/contacts.nix
index 34329ab..d80f0b5 100644
--- a/pkgs/webapps/nextcloud/apps/contacts.nix
+++ b/pkgs/webapps/nextcloud/apps/contacts.nix
@@ -1,7 +1,8 @@
1{ buildApp }: 1{ buildApp, nextcloudVersion }:
2assert nextcloudVersion >= 17 && nextcloudVersion <= 19;
2buildApp rec { 3buildApp rec {
3 appName = "contacts"; 4 appName = "contacts";
4 version = "3.1.1"; 5 version = "3.3.0";
5 url = "https://github.com/nextcloud/${appName}/releases/download/v${version}/${appName}.tar.gz"; 6 url = "https://github.com/nextcloud/${appName}/releases/download/v${version}/${appName}.tar.gz";
6 sha256 = "1qfn532p1pb4m6q2jzyzlyw4c5qccmq6vj0h2zv9xfkajfvz7i7v"; 7 sha256 = "187avlksg4k7ci3jz4djfq8zfyq5jpvhbw2dzlp76wlppm1al4m0";
7} 8}
diff --git a/pkgs/webapps/nextcloud/apps/cookbook.nix b/pkgs/webapps/nextcloud/apps/cookbook.nix
index adc47c2..63cac0d 100644
--- a/pkgs/webapps/nextcloud/apps/cookbook.nix
+++ b/pkgs/webapps/nextcloud/apps/cookbook.nix
@@ -1,9 +1,10 @@
1{ buildApp }: 1{ buildApp, nextcloudVersion }:
2assert nextcloudVersion >= 14 && nextcloudVersion <= 19;
2buildApp rec { 3buildApp rec {
3 appName = "cookbook"; 4 appName = "cookbook";
4 version = "0.5.4"; 5 version = "0.6.5";
5 url = "https://github.com/mrzapp/nextcloud-cookbook/releases/download/v${version}/${appName}.tar.gz"; 6 url = "https://github.com/mrzapp/nextcloud-cookbook/releases/download/v${version}/${appName}.tar.gz";
6 sha256 = "1dav07jylmw9n05l7p3m20ywky27nrg3gna271mly5bvs9q6kanm"; 7 sha256 = "068dxdxy9ix37970mn348blkdrrnkzad26zgyx4f5s19wm439p5j";
7 installPhase = '' 8 installPhase = ''
8 sed -i -e "s/application..ld..json/application[^\"|\\\\']*ld[^\"|\\\\']*json/" lib/Service/RecipeService.php 9 sed -i -e "s/application..ld..json/application[^\"|\\\\']*ld[^\"|\\\\']*json/" lib/Service/RecipeService.php
9 mkdir -p $out 10 mkdir -p $out
diff --git a/pkgs/webapps/nextcloud/apps/deck.nix b/pkgs/webapps/nextcloud/apps/deck.nix
index c5737af..f4c4f94 100644
--- a/pkgs/webapps/nextcloud/apps/deck.nix
+++ b/pkgs/webapps/nextcloud/apps/deck.nix
@@ -1,7 +1,8 @@
1{ buildApp }: 1{ buildApp, nextcloudVersion }:
2assert nextcloudVersion == 17;
2buildApp rec { 3buildApp rec {
3 appName = "deck"; 4 appName = "deck";
4 version = "0.6.1"; 5 version = "0.8.2";
5 url = "https://github.com/nextcloud/${appName}/releases/download/v${version}/${appName}.tar.gz"; 6 url = "https://github.com/nextcloud/${appName}/releases/download/v${version}/${appName}.tar.gz";
6 sha256 = "1hafgj67zbhs4higf7nyr61p4s31axzxrsq09c4wmcwviz7p7zvs"; 7 sha256 = "0n4z1wbshahhvh3r532brzg0hgsyaf5djxpxg6hmma4ycrn4s358";
7} 8}
diff --git a/pkgs/webapps/nextcloud/apps/extract.nix b/pkgs/webapps/nextcloud/apps/extract.nix
index 99e4e8f..daa9d2d 100644
--- a/pkgs/webapps/nextcloud/apps/extract.nix
+++ b/pkgs/webapps/nextcloud/apps/extract.nix
@@ -1,7 +1,8 @@
1{ buildApp }: 1{ buildApp, nextcloudVersion }:
2assert nextcloudVersion >= 13 && nextcloudVersion <= 19;
2buildApp rec { 3buildApp rec {
3 appName = "extract"; 4 appName = "extract";
4 version = "1.2.2"; 5 version = "1.2.4";
5 url = "https://github.com/PaulLereverend/NextcloudExtract/releases/download/${version}/${appName}.tar.gz"; 6 url = "https://github.com/PaulLereverend/NextcloudExtract/releases/download/${version}/${appName}.tar.gz";
6 sha256 = "1aq8f5ps8259ihlh1qwhcj1gwy6w341gmagzz1r763pipkj960g6"; 7 sha256 = "0f1csv0warga12a1hkgdcnhnfiwfv5z2ab3mri4frn2qlh12wyby";
7} 8}
diff --git a/pkgs/webapps/nextcloud/apps/files_markdown.nix b/pkgs/webapps/nextcloud/apps/files_markdown.nix
index 9ed5007..5810ec9 100644
--- a/pkgs/webapps/nextcloud/apps/files_markdown.nix
+++ b/pkgs/webapps/nextcloud/apps/files_markdown.nix
@@ -1,7 +1,8 @@
1{ buildApp }: 1{ buildApp, nextcloudVersion }:
2assert nextcloudVersion >= 16 && nextcloudVersion <= 18;
2buildApp rec { 3buildApp rec {
3 appName = "files_markdown"; 4 appName = "files_markdown";
4 version = "2.0.6"; 5 version = "2.2.0";
5 url = "https://github.com/icewind1991/${appName}/releases/download/v${version}/${appName}.tar.gz"; 6 url = "https://github.com/icewind1991/${appName}/releases/download/v${version}/${appName}.tar.gz";
6 sha256 = "1ng8gpjl3g1141k1nii59cg005viidlcbsg4x9brzcj25c5qhjjp"; 7 sha256 = "05f793pznkkdgmr3wfqfbhwcg8s8kcvpfxnhzyj0pbw19srls2aw";
7} 8}
diff --git a/pkgs/webapps/nextcloud/apps/files_readmemd.nix b/pkgs/webapps/nextcloud/apps/files_readmemd.nix
index 1d0dd42..d31f8ee 100644
--- a/pkgs/webapps/nextcloud/apps/files_readmemd.nix
+++ b/pkgs/webapps/nextcloud/apps/files_readmemd.nix
@@ -1,7 +1,8 @@
1{ buildApp }: 1{ buildApp, nextcloudVersion }:
2assert nextcloudVersion >= 16 && nextcloudVersion <= 18;
2buildApp rec { 3buildApp rec {
3 appName = "files_readmemd"; 4 appName = "files_readmemd";
4 version = "1.1.2"; 5 version = "1.1.4";
5 url = "https://gitlab.univ-nantes.fr/uncloud/files_readmemd/wikis/uploads/3c17fcee5fe4a7a7d77ac59de6feca96/${appName}.tar.gz"; 6 url = "https://gitlab.univ-nantes.fr/uncloud/files_readmemd/-/wikis/uploads/e1d280e855f37e5f0a421c757868113c/${appName}.tar.gz";
6 sha256 = "1lx5rlh9n49cdbnxm6a85facjp4g88myaid764yr6jayc62g0qrq"; 7 sha256 = "1lx5rlh9n49cdbnxm6a85facjp4g88myaid764yr6jayc62g0qrq";
7} 8}
diff --git a/pkgs/webapps/nextcloud/apps/flowupload.nix b/pkgs/webapps/nextcloud/apps/flowupload.nix
index cbadbda..516ee32 100644
--- a/pkgs/webapps/nextcloud/apps/flowupload.nix
+++ b/pkgs/webapps/nextcloud/apps/flowupload.nix
@@ -1,7 +1,8 @@
1{ buildApp }: 1{ buildApp, nextcloudVersion }:
2assert nextcloudVersion >= 15 && nextcloudVersion <= 18;
2buildApp rec { 3buildApp rec {
3 appName = "flowupload"; 4 appName = "flowupload";
4 version = "0.1.0"; 5 version = "0.1.8";
5 url = "https://github.com/e-alfred/${appName}/releases/download/${version}/${appName}.tar.gz"; 6 url = "https://github.com/e-alfred/${appName}/releases/download/${version}/${appName}-${version}.tar.gz";
6 sha256 = "0cai76hcjrwvq32yav0nd9kkhslandp1sj5czz119gsfjlkpalw9"; 7 sha256 = "0llg5cr4fgqg512znp9bga77y7vdsi2pgsyl4m3a54c557zyjah3";
7} 8}
diff --git a/pkgs/webapps/nextcloud/apps/gpxedit.nix b/pkgs/webapps/nextcloud/apps/gpxedit.nix
index b9c267b..cd3e878 100644
--- a/pkgs/webapps/nextcloud/apps/gpxedit.nix
+++ b/pkgs/webapps/nextcloud/apps/gpxedit.nix
@@ -1,9 +1,10 @@
1{ buildApp }: 1{ buildApp, nextcloudVersion }:
2assert nextcloudVersion >= 14 && nextcloudVersion <= 19;
2buildApp rec { 3buildApp rec {
3 appName = "gpxedit"; 4 appName = "gpxedit";
4 version = "0.0.11"; 5 version = "0.0.13";
5 url = "https://gitlab.com/eneiluj/gpxedit-oc/wikis/uploads/18058077d0170256c3f4c9201443d09d/${appName}-${version}.tar.gz"; 6 url = "https://gitlab.com/eneiluj/gpxedit-oc/wikis/uploads/a7c638d1b038514d07bb5c787b6e7961/${appName}-${version}.tar.gz";
6 sha256 = "1ww32jysjnwxrn8r9fjdfhbfqnzgaakn08m64wcmavx29dd42y6m"; 7 sha256 = "1b15iqaq8fj3khpx3lh0fyqkhmj6x44fc59pg3cp3jrh3bpg0534";
7 otherConfig = { 8 otherConfig = {
8 mimetypealiases = { 9 mimetypealiases = {
9 "application/gpx+xml" = "gpx"; 10 "application/gpx+xml" = "gpx";
diff --git a/pkgs/webapps/nextcloud/apps/gpxpod.nix b/pkgs/webapps/nextcloud/apps/gpxpod.nix
index 6544ac2..0750144 100644
--- a/pkgs/webapps/nextcloud/apps/gpxpod.nix
+++ b/pkgs/webapps/nextcloud/apps/gpxpod.nix
@@ -1,9 +1,10 @@
1{ buildApp }: 1{ buildApp, nextcloudVersion }:
2assert nextcloudVersion >= 14 && nextcloudVersion <= 19;
2buildApp rec { 3buildApp rec {
3 appName = "gpxpod"; 4 appName = "gpxpod";
4 version = "3.0.3"; 5 version = "4.2.1";
5 url = "https://gitlab.com/eneiluj/gpxpod-oc/wikis/uploads/34af9435d7a2cd8fa915b84f0dda0724/${appName}-${version}.tar.gz"; 6 url = "https://gitlab.com/eneiluj/gpxpod-oc/wikis/uploads/0361f9dc50633f0f39d929442935435c/${appName}-${version}.tar.gz";
6 sha256 = "0v30j5b4ki6nbxqdmnlkrgl1lpg2x2nir9gik6rfj0c3jhmb5mch"; 7 sha256 = "0ycpychq6g8axdprvd0ahgdy2pwfdbfyf1pxk4cprr4ab986aq1x";
7 otherConfig = { 8 otherConfig = {
8 mimetypealiases = { 9 mimetypealiases = {
9 "application/gpx+xml" = "gpx"; 10 "application/gpx+xml" = "gpx";
diff --git a/pkgs/webapps/nextcloud/apps/keeweb.nix b/pkgs/webapps/nextcloud/apps/keeweb.nix
index 866f337..4ea1399 100644
--- a/pkgs/webapps/nextcloud/apps/keeweb.nix
+++ b/pkgs/webapps/nextcloud/apps/keeweb.nix
@@ -1,9 +1,10 @@
1{ buildApp }: 1{ buildApp, nextcloudVersion }:
2assert nextcloudVersion >= 11 && nextcloudVersion <= 18;
2buildApp rec { 3buildApp rec {
3 appName = "keeweb"; 4 appName = "keeweb";
4 version = "0.5.1"; 5 version = "0.6.2";
5 url = "https://github.com/jhass/nextcloud-keeweb/releases/download/v${version}/${appName}-${version}.tar.gz"; 6 url = "https://github.com/jhass/nextcloud-keeweb/releases/download/v${version}/${appName}-${version}.tar.gz";
6 sha256 = "1iaz4d6fz4zlgdn2hj7xx0nayyd0l865zxd6h795fpx5qpdj911h"; 7 sha256 = "067801qz0fcfvmb14ja1ringzk53j1wp7ys2fl7lnlhf45r81vxx";
7 installPhase = '' 8 installPhase = ''
8 mkdir -p $out 9 mkdir -p $out
9 cp -R . $out/ 10 cp -R . $out/
diff --git a/pkgs/webapps/nextcloud/apps/maps.nix b/pkgs/webapps/nextcloud/apps/maps.nix
index 4232a24..898df6c 100644
--- a/pkgs/webapps/nextcloud/apps/maps.nix
+++ b/pkgs/webapps/nextcloud/apps/maps.nix
@@ -1,7 +1,8 @@
1{ buildApp }: 1{ buildApp, nextcloudVersion }:
2assert nextcloudVersion >= 16 && nextcloudVersion <= 19;
2buildApp rec { 3buildApp rec {
3 appName = "maps"; 4 appName = "maps";
4 version = "0.1.2"; 5 version = "0.1.6";
5 url = "https://github.com/nextcloud/maps/releases/download/v${version}/${appName}-${version}.tar.gz"; 6 url = "https://github.com/nextcloud/maps/releases/download/v${version}/${appName}-${version}.tar.gz";
6 sha256 = "0jk4fikk72g2yj3p0f8i80d26lsi88kfpflrmh5c4acgf3jzxp02"; 7 sha256 = "1yh5h96c91lgz58zcm7zdpblvsc6c6nflx8pldfds102x292mprk";
7} 8}
diff --git a/pkgs/webapps/nextcloud/apps/metadata.nix b/pkgs/webapps/nextcloud/apps/metadata.nix
index 9adda9d..2d62f53 100644
--- a/pkgs/webapps/nextcloud/apps/metadata.nix
+++ b/pkgs/webapps/nextcloud/apps/metadata.nix
@@ -1,7 +1,8 @@
1{ buildApp }: 1{ buildApp, nextcloudVersion }:
2assert nextcloudVersion >= 13 && nextcloudVersion <= 19;
2buildApp rec { 3buildApp rec {
3 appName = "metadata"; 4 appName = "metadata";
4 version = "0.10.0"; 5 version = "0.11.1";
5 url = "https://github.com/gino0631/nextcloud-metadata/releases/download/v${version}/${appName}.tar.gz"; 6 url = "https://github.com/gino0631/nextcloud-metadata/releases/download/v${version}/${appName}.tar.gz";
6 sha256 = "1qqgzk0b13k5gfy9sdjqm9v325lm8qn7ikv3a8d21pzzqii6402x"; 7 sha256 = "11napkv5s29xk1gmbfvy610ab1kc06qxqzw606ix5x0d1x4m3h0c";
7} 8}
diff --git a/pkgs/webapps/nextcloud/apps/music.nix b/pkgs/webapps/nextcloud/apps/music.nix
index 1c7181a..1871e91 100644
--- a/pkgs/webapps/nextcloud/apps/music.nix
+++ b/pkgs/webapps/nextcloud/apps/music.nix
@@ -1,7 +1,8 @@
1{ buildApp }: 1{ buildApp, nextcloudVersion }:
2assert nextcloudVersion >= 9 && nextcloudVersion <= 19;
2buildApp rec { 3buildApp rec {
3 appName = "music"; 4 appName = "music";
4 version = "0.9.5"; 5 version = "0.14.0";
5 url = "https://github.com/owncloud/${appName}/archive/v${version}.tar.gz"; 6 url = "https://github.com/owncloud/${appName}/archive/v${version}.tar.gz";
6 sha256 = "0dx136z7anmi18harc1v2hyfdaq568lqf3wpy9hgx309ggb4wwzx"; 7 sha256 = "0f2nb69krnfgxx9x4nnlkmrlz33n01k6i9r2mbba7i34xgdi6vsq";
7} 8}
diff --git a/pkgs/webapps/nextcloud/apps/notes.nix b/pkgs/webapps/nextcloud/apps/notes.nix
index 23d6a06..7a06bbc 100644
--- a/pkgs/webapps/nextcloud/apps/notes.nix
+++ b/pkgs/webapps/nextcloud/apps/notes.nix
@@ -1,7 +1,8 @@
1{ buildApp }: 1{ buildApp, nextcloudVersion }:
2assert nextcloudVersion >= 16 && nextcloudVersion <= 19;
2buildApp rec { 3buildApp rec {
3 appName = "notes"; 4 appName = "notes";
4 version = "2.6.0"; 5 version = "3.3.0";
5 url = "https://github.com/nextcloud/${appName}/releases/download/v${version}/${appName}.tar.gz"; 6 url = "https://github.com/nextcloud/${appName}/releases/download/${version}/${appName}.tar.gz";
6 sha256 = "1b1vc8plv4mpsxl7mgwgrcrswphclsm9xa89vxf3s4xzlwwq11c4"; 7 sha256 = "03k0ijma7sccwqq9ch3bvgbg9kxr2wk0bmkxzxrc9in1d40d3k7f";
7} 8}
diff --git a/pkgs/webapps/nextcloud/apps/ocsms.nix b/pkgs/webapps/nextcloud/apps/ocsms.nix
index bd77295..aee1ff2 100644
--- a/pkgs/webapps/nextcloud/apps/ocsms.nix
+++ b/pkgs/webapps/nextcloud/apps/ocsms.nix
@@ -1,12 +1,11 @@
1{ buildApp }: 1{ buildApp, nextcloudVersion }:
2assert nextcloudVersion >= 16 && nextcloudVersion <= 18;
2buildApp rec { 3buildApp rec {
3 appName = "ocsms"; 4 appName = "ocsms";
4 version = "2.1.1"; 5 version = "2.1.7";
5 url = "https://github.com/nextcloud/${appName}/releases/download/${version}/${appName}-${version}.tar.gz"; 6 url = "https://github.com/nextcloud/${appName}/releases/download/${version}/${appName}-${version}.tar.gz";
6 sha256 = "0sgfbmy1c8rgzjvf9snc7rzgp8aqsc65zfwgi6qcsf2g6gam5n7a"; 7 sha256 = "1pfdzq16nbh4wfmkmif0dxacxg0fy4n4cp2d1hbq9k2z9awcx1vh";
7 installPhase = '' 8 installPhase = ''
8 sed -i -e "/addScript.*devel/d" -e "s@//\(.*addScript.*app.min\)@\1@" templates/main.php
9 sed -i -e 's/max-version="15.0"/max-version="16.0"/' appinfo/info.xml
10 mkdir -p $out 9 mkdir -p $out
11 cp -R . $out/ 10 cp -R . $out/
12 ''; 11 '';
diff --git a/pkgs/webapps/nextcloud/apps/passman.nix b/pkgs/webapps/nextcloud/apps/passman.nix
index 0d9d994..2de4882 100644
--- a/pkgs/webapps/nextcloud/apps/passman.nix
+++ b/pkgs/webapps/nextcloud/apps/passman.nix
@@ -1,9 +1,10 @@
1{ buildApp }: 1{ buildApp, nextcloudVersion }:
2assert nextcloudVersion >= 17 && nextcloudVersion <= 18;
2buildApp rec { 3buildApp rec {
3 # FIXME: it creates a /settings/user/additional setting url which 4 # FIXME: it creates a /settings/user/additional setting url which
4 # doesn’t work 5 # doesn’t work
5 appName = "passman"; 6 appName = "passman";
6 version = "2.3.4"; 7 version = "2.3.5";
7 url = "https://releases.passman.cc/${appName}_${version}.tar.gz"; 8 url = "https://releases.passman.cc/${appName}_${version}.tar.gz";
8 sha256 = "004bgdbz6ks0zizgx6gw6m60g30m1xclw4fakbh6qq1n8sxpdqsq"; 9 sha256 = "05gc288n43c7dhmq1jqfn8cfw7sycwdfhn36j8rh8nbx1irldbjn";
9} 10}
diff --git a/pkgs/webapps/nextcloud/apps/polls.nix b/pkgs/webapps/nextcloud/apps/polls.nix
index ff0258a..69e1102 100644
--- a/pkgs/webapps/nextcloud/apps/polls.nix
+++ b/pkgs/webapps/nextcloud/apps/polls.nix
@@ -1,7 +1,8 @@
1{ buildApp }: 1{ buildApp, nextcloudVersion }:
2assert nextcloudVersion >= 16 && nextcloudVersion <= 19;
2buildApp rec { 3buildApp rec {
3 appName = "polls"; 4 appName = "polls";
4 version = "0.10.4"; 5 version = "1.4.3";
5 url = "https://github.com/nextcloud/polls/releases/download/v${version}/${appName}.tar.gz"; 6 url = "https://github.com/nextcloud/polls/releases/download/v${version}/${appName}.tar.gz";
6 sha256 = "10h2i1ya1n4vkbd84ak5xcbprzai4nxjsq6b8z097p9fb90rbw4r"; 7 sha256 = "07l5x5xblk6w8f6mqz3a5hjpry8qc3zgqi49z6bp5ipnzj0s6wm4";
7} 8}
diff --git a/pkgs/webapps/nextcloud/apps/spreed.nix b/pkgs/webapps/nextcloud/apps/spreed.nix
index a958470..d6bd938 100644
--- a/pkgs/webapps/nextcloud/apps/spreed.nix
+++ b/pkgs/webapps/nextcloud/apps/spreed.nix
@@ -1,7 +1,8 @@
1{ buildApp }: 1{ buildApp, nextcloudVersion }:
2assert nextcloudVersion == 17;
2buildApp rec { 3buildApp rec {
3 appName = "spreed"; 4 appName = "spreed";
4 version = "6.0.0"; 5 version = "7.0.3";
5 url = "https://github.com/nextcloud/${appName}/releases/download/v${version}/${appName}-${version}.tar.gz"; 6 url = "https://github.com/nextcloud/${appName}/releases/download/v${version}/${appName}-${version}.tar.gz";
6 sha256 = "14rcskp4pdcf0g816cdp070c8pzrj33fg2w7jb3af8maf1d77306"; 7 sha256 = "09s5wabb516sfrq765hp6viag78xg349glwdxayjkbygkif0hw82";
7} 8}
diff --git a/pkgs/webapps/nextcloud/apps/tasks.nix b/pkgs/webapps/nextcloud/apps/tasks.nix
index 1e5f8f2..a2de465 100644
--- a/pkgs/webapps/nextcloud/apps/tasks.nix
+++ b/pkgs/webapps/nextcloud/apps/tasks.nix
@@ -1,7 +1,8 @@
1{ buildApp }: 1{ buildApp, nextcloudVersion }:
2assert nextcloudVersion >= 16 && nextcloudVersion <= 19;
2buildApp rec { 3buildApp rec {
3 appName = "tasks"; 4 appName = "tasks";
4 version = "0.10.1"; 5 version = "0.12.2";
5 url = "https://github.com/nextcloud/${appName}/releases/download/v${version}/${appName}.tar.gz"; 6 url = "https://github.com/nextcloud/${appName}/releases/download/v${version}/${appName}.tar.gz";
6 sha256 = "0r888yr6bl2y5mp65q8md5k139as1a0xw4yfzvkv7y77wmqn9wsm"; 7 sha256 = "092fg7dpx69jp5z0ka14ay6bnfdcnjq8zk2gc3rwpzc3llpdnqph";
7} 8}
diff --git a/pkgs/webapps/nextcloud/default.nix b/pkgs/webapps/nextcloud/default.nix
index 2d4eb39..fecb3a7 100644
--- a/pkgs/webapps/nextcloud/default.nix
+++ b/pkgs/webapps/nextcloud/default.nix
@@ -1,5 +1,13 @@
1{ varDir ? "/var/lib/nextcloud", otherConfig ? {}, lib, stdenv, fetchurl }: 1{ varDir ? "/var/lib/nextcloud", nextcloudVersion ? 17, otherConfig ? {}, lib, stdenv, callPackage, fetchurl }:
2let 2let
3 appNames = [
4 "apporder" "audioplayer" "bookmarks" "calendar" "carnet" "contacts"
5 "cookbook" "deck" "extract" "files_markdown" "files_readmemd"
6 "flowupload" "gpxedit" "gpxpod" "keeweb" "maps" "metadata" "music"
7 "notes" "ocsms" "passman" "polls" "spreed" "tasks"
8 ];
9 allApps = lib.attrsets.genAttrs appNames
10 (name: callPackage (./apps + "/${name}.nix") { inherit buildApp nextcloudVersion; });
3 buildApp = { appName, version, url, sha256, otherConfig ? {}, installPhase ? "mkdir -p $out && cp -R . $out/" }: 11 buildApp = { appName, version, url, sha256, otherConfig ? {}, installPhase ? "mkdir -p $out && cp -R . $out/" }:
4 stdenv.mkDerivation rec { 12 stdenv.mkDerivation rec {
5 name = "nextcloud-app-${appName}-${version}"; 13 name = "nextcloud-app-${appName}-${version}";
@@ -11,34 +19,33 @@ let
11 inherit appName otherConfig; 19 inherit appName otherConfig;
12 }; 20 };
13 }; 21 };
14 withApps = apps: package.overrideAttrs(old: { 22 toPassthru = pkg: apps: otherConfig: {
15 name = "${old.name}-with-apps"; 23 inherit apps otherConfig allApps buildApp varDir;
16 24 withApps = withApps pkg;
17 installPhase = old.installPhase + ( 25 };
18 builtins.concatStringsSep "\n" ( 26 withApps = pkg: toApps:
19 map (value: "ln -sf ${value} $out/apps/${value.appName}") apps 27 let
20 )); 28 apps = toApps allApps;
21 29 toInstallApp = n: ''
22 passthru = old.passthru // { 30 ln -sf ${n} $out/apps/${n.appName}
23 otherConfig = with lib.attrsets; with lib.lists; let 31 '';
24 zipped = zipAttrs ([old.otherConfig or {}] ++ map (v: v.otherConfig) apps); 32 zipped = lib.attrsets.zipAttrs ([pkg.otherConfig or {}] ++ map (v: v.otherConfig) apps);
25 in 33 appConfigs = with lib.attrsets; with lib.lists; {
26 { 34 mimetypealiases = foldr (h: prev: prev // h) {} (zipped.mimetypealiases or []);
27 mimetypealiases = foldr (h: prev: prev // h) {} zipped.mimetypealiases; 35 mimetypemapping = mapAttrs (_: v: unique (flatten v)) (zipAttrs (zipped.mimetypemapping or []));
28 mimetypemapping = mapAttrs (_: v: unique (flatten v)) (zipAttrs zipped.mimetypemapping); 36 };
29 }; 37 newNextcloud = pkg.overrideAttrs(old: {
30 inherit apps; 38 installPhase = old.installPhase + "\n" + builtins.concatStringsSep "\n" (map toInstallApp apps);
31 withApps = moreApps: old.withApps (moreApps ++ apps); 39 passthru = toPassthru newNextcloud (pkg.apps ++ apps) appConfigs;
32 }; 40 });
33 }); 41 in newNextcloud;
34
35 package = stdenv.mkDerivation rec { 42 package = stdenv.mkDerivation rec {
36 name = "nextcloud-${version}"; 43 name = "nextcloud-${version}";
37 version = "16.0.0"; 44 version = "${builtins.toString nextcloudVersion}.0.6";
38 45
39 src = fetchurl { 46 src = fetchurl {
40 url = "https://download.nextcloud.com/server/releases/${name}.tar.bz2"; 47 url = "https://download.nextcloud.com/server/releases/${name}.tar.bz2";
41 sha256 = "0bj014vczlrql1w32pqmr7cyqn9awnyzpi2syxhg16qxic1gfcj5"; 48 sha256 = "0qq7lkgzsn1zakfym5bjqzpcisxmgfcdd927ddqlhddy3zvgxrxx";
42 }; 49 };
43 50
44 installPhase = '' 51 installPhase = ''
@@ -48,10 +55,7 @@ let
48 ln -sf ${varDir}/config $out/config 55 ln -sf ${varDir}/config $out/config
49 ''; 56 '';
50 57
51 passthru = { 58 passthru = toPassthru package [] otherConfig;
52 apps = [];
53 inherit otherConfig buildApp withApps varDir;
54 };
55 meta = { 59 meta = {
56 description = "Sharing solution for files, calendars, contacts and more"; 60 description = "Sharing solution for files, calendars, contacts and more";
57 homepage = https://nextcloud.com; 61 homepage = https://nextcloud.com;
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-12 15:08:58 +0000