From 982b8f7d7c6b5681a94102e4b29a38722c46be5b Mon Sep 17 00:00:00 2001
From: Jonas Heinrich <heinrich@synyx.de>
Date: Wed, 13 Dec 2023 16:51:34 +0100
Subject: [PATCH] upgrade to nextcloud28

---
 flake.nix        | 11 +++--------
 vm-nextcloud.nix |  6 +++---
 2 files changed, 6 insertions(+), 11 deletions(-)

diff --git a/flake.nix b/flake.nix
index dfca561..ddceeb6 100644
--- a/flake.nix
+++ b/flake.nix
@@ -1,6 +1,8 @@
 {
   inputs = {
-    nixpkgs.url = "nixpkgs/23.11";
+    # FIXME
+    #nixpkgs.url = "nixpkgs/23.11";
+    nixpkgs.url = "github:onny/nixpkgs/nextcloud-update2";
     # Required for multi platform support
     flake-utils.url = "github:numtide/flake-utils";
   };
@@ -14,13 +16,6 @@
             export QEMU_NET_OPTS="hostfwd=tcp::8080-:80,hostfwd=tcp::1433-:143,hostfwd=tcp::5877-:587"
             ${pkgs.nixos-shell}/bin/nixos-shell vm-nextcloud.nix
           '';
-        phpunit = pkgs.phpunit.overrideAttrs (oldAttrs: rec {
-          version = "9.6.13";
-          src = pkgs.fetchurl {
-            url = "https://phar.phpunit.de/phpunit-${version}.phar";
-            hash = "sha256-1nxGBJCGBPQMyA91xbVd8baFoGoeqBkf7feFMcxdAeU=";
-          };
-        });
       in
       {
         devShell = pkgs.mkShell {
diff --git a/vm-nextcloud.nix b/vm-nextcloud.nix
index 42b32ab..ff1329d 100644
--- a/vm-nextcloud.nix
+++ b/vm-nextcloud.nix
@@ -19,7 +19,7 @@
       (self: super: {
         # Remove first run wizard and password policy check from Nextcloud
         # package
-        nextcloud27 = super.nextcloud27.overrideAttrs (oldAttrs: rec {
+        nextcloud28 = super.nextcloud28.overrideAttrs (oldAttrs: rec {
           #patches = [];
           #src = ./server;
           installPhase = oldAttrs.installPhase + ''
@@ -37,10 +37,10 @@
   # Setup Nextcloud including apps
   services.nextcloud = {
     enable = true;
-    package = pkgs.nextcloud27;
+    package = pkgs.nextcloud28;
     hostName = "localhost";
     extraApps = with config.services.nextcloud.package.packages.apps; {
-      inherit contacts;
+      inherit contacts calendar;
       # FIXME
       # enable hmr when debug flag is enabled
       hmr_enabler = pkgs.php.buildComposerProject (finalAttrs: {