[achatina-fulica] Setup Infcloud for Radicale

modules/radicale.nix

@@ -1,24 +1,34 @@
-{ config, pkgs, ... }:
+{ config, pkgs, lib, ... }:
 
 let
   internalPort = 5232;
 
-  radicaleOverlay = self: super: {
-    radicaleWithInfcloud = super.radicale.overrideAttrs (old: {
+  radicale_infcloud = pkgs.python3.pkgs.radicale_infcloud.overrideAttrs (old: {
+    src = pkgs.fetchFromGitHub {
+      owner = "Unrud";
+      repo = "RadicaleInfCloud";
+      rev = "40f88a5dc0003120d62533ea635f0d94d77f1aca";
+      sha256 = "h6t8LlXAWErVlVq88fGFGrVEvZeJ7HJsr61/fiKRIGY=";
+    };
+    # Remove depend on radicale to fix infinite recursion
+    # and set some of my own settings
+    patches = (old.patches or [ ]) ++ [ ../patches/radicale_infcloud.patch ];
+  });
+
+  overlay = self: super: {
+    radicale = super.radicale.overrideAttrs (old: {
       propagatedBuildInputs = old.propagatedBuildInputs
-        ++ [ pkgs.python3Packages.radicale_infcloud ];
+        ++ [ radicale_infcloud ];
     });
   };
 
   htpasswd_filename = "/etc/radicale/users";
 
 in {
-
-  nixpkgs.overlays = [ radicaleOverlay ];
+  nixpkgs.overlays = [ overlay ];
 
   services.radicale = {
     enable = true;
-    package = pkgs.radicaleWithInfcloud;
     settings = {
       server = {
         hosts = [ "[::1]:${builtins.toString internalPort}" ];
@@ -37,7 +47,7 @@ in {
         stock = "utf-8";
       };
       storage = { filesystem_folder = "/var/lib/radicale/collections"; };
-      web = { type = "internal"; };
+      web = { type = "radicale_infcloud"; };
       logging = { mask_passwords = true; };
     };
   };

patches/radicale_infcloud.patch

@@ -0,0 +1,32 @@
+diff --git a/radicale_infcloud/web/config.js b/radicale_infcloud/web/config.js
+index 560c1d1..798b22b 100644
+--- a/radicale_infcloud/web/config.js
++++ b/radicale_infcloud/web/config.js
+@@ -476,7 +476,7 @@ var globalEnableKbNavigation=true;
+ //   uk_UA (Українська [Ukrainian]; thanks Serge Yakimchuck)
+ //   zh_CN (中国 [Chinese]; thanks Fandy)
+ // Example:
+-var globalInterfaceLanguage='en_US';
++var globalInterfaceLanguage='de_DE';
+ 
+ 
+ // globalInterfaceCustomLanguages
+@@ -665,7 +665,7 @@ var globalActiveTodoCollections=[];
+ // - 'agendaDay'
+ // NOTE: we use custom and enhanced version of fullcalendar!
+ // Example:
+-var globalActiveView='multiWeek';
++var globalActiveView='month';
+ 
+ 
+ // globalOpenFormMode
+diff --git a/setup.py b/setup.py
+index 0e1bf2a..c3bae30 100755
+--- a/setup.py
++++ b/setup.py
+@@ -23,4 +23,4 @@ setup(
+     platforms="Any",
+     packages=["radicale_infcloud"],
+     package_data={"radicale_infcloud": web_data},
+-    install_requires=["radicale>=3.0.0"])
++    install_requires=[])