migrated channel 24.05 to unstable

modules/servers/mealie.nix

@@ -4,8 +4,6 @@ let
   setup = import ./setup.nix { inherit lib config; };
 in
 {
-  disabledModules = [ "services/web-apps/mealie.nix" ];
-  imports = [ ../../pkgs/mealie-service.nix ];
   options.my.servers.mealie = setup.mkOptions "mealie" "mealie" 9925;
   config = {
     networking.firewall.allowedTCPPorts = lib.mkIf (!cfg.isLocal) [ cfg.port ];

modules/servers/nextcloud.nix

@@ -43,7 +43,7 @@ in
         mediainfo
         nodejs
         perl
-        (python3.withPackages (ps: with ps; [ tensorflow ]))
+        (python311.withPackages (ps: with ps; [ tensorflow ]))
         (perlPackages.buildPerlPackage rec {
           pname = "Image-ExifTool";
           version = "12.70";
@@ -84,7 +84,6 @@ in
           adminpassFile = config.sops.secrets.nextcloud-adminpass.path;
           dbtype = "pgsql";
           dbhost = config.my.postgresSocket;
-          dbtableprefix = "oc_";
           dbname = "nextcloud";
         };
         phpOptions = {
@@ -134,7 +133,10 @@ in
             "OC\\Preview\\Movie"
           ];
         };
-        # phpExtraExtensions = all: [ all.pdlib all.bz2 ];
+        phpExtraExtensions = all: [
+          all.pdlib
+          all.bz2
+        ];
       };
       nginx.virtualHosts = {
         "${config.services.nextcloud.hostName}" = lib.mkIf cfg.enableProxy {

modules/servers/shiori.nix

@@ -4,8 +4,6 @@ let
   setup = import ./setup.nix { inherit lib config; };
 in
 {
-  disabledModules = [ "services/web-apps/shiori.nix" ];
-  imports = [ ../../pkgs/shiori-service.nix ];
   options.my.servers.shiori = setup.mkOptions "shiori" "bookmarks" 4368;
   config = lib.mkIf (config.my.servers.shiori.enable && config.my.servers.postgres.enable) {
     networking.firewall.allowedTCPPorts = lib.mkIf (!cfg.isLocal) [ cfg.port ];