nix/nextcloud
Watch
1
0
Fork
You've already forked nextcloud
 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix module evaluation recursion

Browse source
This commit is contained in:
Alois 2026-08-22 11:29:22 +02:00
commit 6e3d7c9b22
No known key found for this signature in database
1 changed files with 16 additions and 32 deletions
Download patch file Download diff file Expand all files Collapse all files

48
flake.nix
View file

@ -22,7 +22,6 @@
mkOption mkOption
optional optional
optionalAttrs optionalAttrs
setAttrByPath
types types
unique unique
; ;
@ -143,12 +142,21 @@
whiteboardModuleAvailable = hasAttrByPath [ "services" "nextcloud-whiteboard-server" ] options; whiteboardModuleAvailable = hasAttrByPath [ "services" "nextcloud-whiteboard-server" ] options;
anubisModuleAvailable = hasAttrByPath [ "services" "anubis" "instances" ] options; anubisModuleAvailable = hasAttrByPath [ "services" "anubis" "instances" ] options;
authentikTargetAvailable = hasAttrByPath cfg.authentik.blueprint.targetOption options; whiteboardPackage =
if cfg.addons.whiteboard.disableRecording then
pkgs.nextcloud-whiteboard-server.overrideAttrs (old: {
postPatch = (old.postPatch or "") + ''
substituteInPlace websocket_server/SocketManager.js \
--replace-fail $'const support = await checkPuppeteerAvailability({ force: false })\n\t\t\tsocket.emit(\'recording-availability\', {\n\t\t\t\tavailable: support.available,\n\t\t\t\treason: support.reason || null,\n\t\t\t})' $'if (process.env.DISABLE_RECORDING === "1") {\n\t\t\tsocket.emit(\'recording-availability\', {\n\t\t\t\tavailable: false,\n\t\t\t\treason: null,\n\t\t\t})\n\t\t\treturn\n\t\t}\n\n\t\t\tconst support = await checkPuppeteerAvailability({ force: false })\n\t\tsocket.emit(\'recording-availability\', {\n\t\t\tavailable: support.available,\n\t\t\treason: support.reason || null,\n\t\t})'
'';
})
else
pkgs.nextcloud-whiteboard-server;
whiteboardStart = pkgs.writeShellScript "nextcloud-whiteboard-with-secret" '' whiteboardStart = pkgs.writeShellScript "nextcloud-whiteboard-with-secret" ''
set -euo pipefail set -euo pipefail
export JWT_SECRET_KEY="$(<"$CREDENTIALS_DIRECTORY/jwt")" export JWT_SECRET_KEY="$(<"$CREDENTIALS_DIRECTORY/jwt")"
exec ${lib.getExe pkgs.nextcloud-whiteboard-server} exec ${lib.getExe whiteboardPackage}
''; '';
configScript = pkgs.writeShellScript "nextcloud-stack-config" '' configScript = pkgs.writeShellScript "nextcloud-stack-config" ''
@ -398,20 +406,10 @@
description = "Generate an Authentik blueprint under /etc/nextcloud."; description = "Generate an Authentik blueprint under /etc/nextcloud.";
}; };
autoAttach = mkOption { content = mkOption {
type = types.bool; type = types.str;
default = true; readOnly = true;
description = "Also attach the blueprint to targetOption when that option exists."; description = "Generated Authentik blueprint for use by an Authentik module.";
};
targetOption = mkOption {
type = types.listOf types.str;
default = [
"methanium"
"authentik"
"blueprints"
"nextcloud"
];
}; };
secretEnvName = mkOption { secretEnvName = mkOption {
@ -691,17 +689,6 @@
}) })
(mkIf (cfg.addons.whiteboard.enable && cfg.addons.whiteboard.disableRecording) { (mkIf (cfg.addons.whiteboard.enable && cfg.addons.whiteboard.disableRecording) {
nixpkgs.overlays = [
(final: prev: {
nextcloud-whiteboard-server = prev.nextcloud-whiteboard-server.overrideAttrs (old: {
postPatch = (old.postPatch or "") + ''
substituteInPlace websocket_server/SocketManager.js \
--replace-fail $'const support = await checkPuppeteerAvailability({ force: false })\n\t\t\tsocket.emit(\'recording-availability\', {\n\t\t\t\tavailable: support.available,\n\t\t\t\treason: support.reason || null,\n\t\t\t})' $'if (process.env.DISABLE_RECORDING === "1") {\n\t\t\t\tsocket.emit(\'recording-availability\', {\n\t\t\t\t\tavailable: false,\n\t\t\t\t\treason: null,\n\t\t\t\t})\n\t\t\t\treturn\n\t\t\t}\n\n\t\t\tconst support = await checkPuppeteerAvailability({ force: false })\n\t\t\tsocket.emit(\'recording-availability\', {\n\t\t\t\tavailable: support.available,\n\t\t\t\treason: support.reason || null,\n\t\t\t})'
'';
});
})
];
services.nextcloud-whiteboard-server.settings.DISABLE_RECORDING = "1"; services.nextcloud-whiteboard-server.settings.DISABLE_RECORDING = "1";
}) })
@ -744,12 +731,9 @@
}) })
(mkIf cfg.authentik.blueprint.enable { (mkIf cfg.authentik.blueprint.enable {
custom.nextcloud.authentik.blueprint.content = authentikBlueprint;
environment.etc."nextcloud/authentik-blueprint.yaml".text = authentikBlueprint; environment.etc."nextcloud/authentik-blueprint.yaml".text = authentikBlueprint;
}) })
(mkIf (
cfg.authentik.blueprint.enable && cfg.authentik.blueprint.autoAttach && authentikTargetAvailable
) (setAttrByPath cfg.authentik.blueprint.targetOption authentikBlueprint))
]); ]);
}; };
}; };