From 051f375ca96f448820f0da33a24a8ee4bb937ad2 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Isma=C3=ABl=20Bouya?= <ismael.bouya@normalesup.org>
Date: Sat, 24 Oct 2020 10:41:43 +0200
Subject: [PATCH] Add circles and social nextcloud apps

---
 pkgs/webapps/nextcloud/apps/circles.nix | 8 ++++++++
 pkgs/webapps/nextcloud/apps/social.nix  | 9 +++++++++
 pkgs/webapps/nextcloud/default.nix      | 9 +++++----
 3 files changed, 22 insertions(+), 4 deletions(-)
 create mode 100644 pkgs/webapps/nextcloud/apps/circles.nix
 create mode 100644 pkgs/webapps/nextcloud/apps/social.nix

diff --git a/pkgs/webapps/nextcloud/apps/circles.nix b/pkgs/webapps/nextcloud/apps/circles.nix
new file mode 100644
index 0000000..64a4f2f
--- /dev/null
+++ b/pkgs/webapps/nextcloud/apps/circles.nix
@@ -0,0 +1,8 @@
+{ buildApp, nextcloudVersion }:
+assert nextcloudVersion >= 18 && nextcloudVersion <= 18;
+buildApp rec {
+  appName = "circles";
+  version = "0.18.9";
+  url = "https://github.com/nextcloud/circles/releases/download/v${version}/${appName}-${version}.tar.gz";
+  sha256 = "1a58zrjg4cc0igq14s5zfc5zva83mahmfr0mxvhvnasw7rwkpyzr";
+}
diff --git a/pkgs/webapps/nextcloud/apps/social.nix b/pkgs/webapps/nextcloud/apps/social.nix
new file mode 100644
index 0000000..75b790a
--- /dev/null
+++ b/pkgs/webapps/nextcloud/apps/social.nix
@@ -0,0 +1,9 @@
+{ buildApp, nextcloudVersion }:
+assert nextcloudVersion >= 17 && nextcloudVersion <= 19;
+buildApp rec {
+  appName = "social";
+  version = "0.3.1";
+  url = "https://github.com/nextcloud/social/releases/download/v${version}/${appName}-${version}.tar.gz";
+  sha256 = "03hh6vr34p33dphrjqmc7s8mvsk5n7dl817j8qkf75203y8szhdy";
+}
+
diff --git a/pkgs/webapps/nextcloud/default.nix b/pkgs/webapps/nextcloud/default.nix
index 1213494..54849bf 100644
--- a/pkgs/webapps/nextcloud/default.nix
+++ b/pkgs/webapps/nextcloud/default.nix
@@ -1,10 +1,11 @@
 { varDir ? "/var/lib/nextcloud", nextcloudVersion ? 18, otherConfig ? {}, lib, stdenv, callPackage, fetchzip, fetchurl }:
 let
   appNames = [
-    "apporder" "audioplayer" "bookmarks" "calendar" "carnet" "contacts"
-    "cookbook" "deck" "extract" "files_markdown" "files_readmemd"
-    "flowupload" "gpxedit" "gpxpod" "keeweb" "maps" "metadata" "music"
-    "notes" "ocsms" "passman" "polls" "spreed" "tasks"
+    "apporder" "audioplayer" "bookmarks" "calendar" "carnet" "circles"
+    "contacts" "cookbook" "deck" "extract" "files_markdown"
+    "files_readmemd" "flowupload" "gpxedit" "gpxpod" "keeweb" "maps"
+    "metadata" "music" "notes" "ocsms" "passman" "polls" "spreed"
+    "social" "tasks"
   ];
   allApps = lib.attrsets.genAttrs appNames
     (name: callPackage (./apps + "/${name}.nix") { inherit buildApp nextcloudVersion; });
-- 
2.41.0