diff --git a/.gitmodules b/.gitmodules index 8791f9c..26dd48f 100644 --- a/.gitmodules +++ b/.gitmodules @@ -17,3 +17,9 @@ [submodule "files_fulltextsearch"] path = files_fulltextsearch url = https://github.com/nextcloud/files_fulltextsearch.git +[submodule "ical.js"] + path = ical.js + url = https://github.com/kewisch/ical.js.git +[submodule "calendar-js"] + path = calendar-js + url = https://github.com/nextcloud/calendar-js.git diff --git a/calendar b/calendar index 56467f0..04eeeaa 160000 --- a/calendar +++ b/calendar @@ -1 +1 @@ -Subproject commit 56467f051c18b638b134335973f4cd2ab4f90927 +Subproject commit 04eeeaabab222fb35a96bc43b5723e8f7d3607a4 diff --git a/flake.nix b/flake.nix index f62700a..9be0be2 100644 --- a/flake.nix +++ b/flake.nix @@ -21,6 +21,7 @@ phpPackages.composer phpunit nodejs + nodePackages.rollup ]; }; packages = { inherit start; }; diff --git a/vm-nextcloud.nix b/vm-nextcloud.nix index 8075f71..bf7616f 100644 --- a/vm-nextcloud.nix +++ b/vm-nextcloud.nix @@ -43,12 +43,23 @@ package = pkgs.nextcloud27; hostName = "localhost"; extraApps = with config.services.nextcloud.package.packages.apps; { - inherit contacts polls; - # hmr_enable = pkgs.fetchNextcloudApp rec { - # url = "https://github.com/nextcloud/hmr_enabler/archive/852acc47c64db1be85051197bf7939298059fe09.zip"; - # sha256 = "sha256-eTc51pkg3OdHJB7X4/hD39Ce+9vKzw1nlJ7BhPOzlll="; - - # }; + inherit contacts; + hmr_enabler = pkgs.php.buildComposerProject (finalAttrs: { + pname = "hmr_enabler"; + version = "1.0.0"; + src = pkgs.fetchFromGitHub { + owner = "onny"; + repo = "hmr_enabler"; + rev = "85404e232344c856133e0b14e3ea30bbb8118034"; + hash = "sha256-mxUTWQozqcnTnlHrUtfUcsAX+X/N0fcLiUec4cGjGdg="; + }; + composerNoDev = false; + vendorHash = "sha256-ENfs9gsXtrWP7u8+LKDMQ+hhiP3UKtn6t5lPl6wKOdQ="; + postInstall = '' + cp -r $out/share/php/hmr_enabler/* $out/ + rm -r $out/share + ''; + }); }; extraAppsEnable = true; config = {