diff --git a/clients/quadraticserver/lasuite-docs/default.nix b/clients/quadraticserver/lasuite-docs/default.nix index df11cfc..03c8182 100644 --- a/clients/quadraticserver/lasuite-docs/default.nix +++ b/clients/quadraticserver/lasuite-docs/default.nix @@ -7,12 +7,26 @@ let s3Domain = "http://127.0.0.1${config.services.minio-vendored.listenAddress}"; cfg = config.services.lasuite-docs; + # FIXME: pinned to 5.7.0 until migrated to 6.x + lasuitePkgs = import inputs.nixpkgs-lasuite { inherit (pkgs.stdenv.hostPlatform) system; }; in { + disabledModules = [ "services/web-apps/lasuite-docs.nix" ]; imports = [ + "${inputs.nixpkgs-lasuite}/nixos/modules/services/web-apps/lasuite-docs.nix" inputs.lasuite-docs-proxy.nixosModules.default ]; + nixpkgs.overlays = [ + (_: _: { + inherit (lasuitePkgs) + lasuite-docs + lasuite-docs-frontend + lasuite-docs-collaboration-server + ; + }) + ]; + systemd.services = { lasuite-docs-collaboration-server.serviceConfig = { EnvironmentFile = cfg.environmentFile; diff --git a/flake.lock b/flake.lock index 53b9281..2f53721 100644 --- a/flake.lock +++ b/flake.lock @@ -926,6 +926,22 @@ "type": "github" } }, + "nixpkgs-lasuite": { + "locked": { + "lastModified": 1793726008, + "narHash": "sha256-jQp1wKvbwWdLBASTXkSi/VYmDJ5AbBi1WvcMt9HWJC8=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "1d060086d60cb76a40cf37109f979d88a5bd6396", + "type": "github" + }, + "original": { + "owner": "nixos", + "repo": "nixpkgs", + "rev": "1d060086d60cb76a40cf37109f979d88a5bd6396", + "type": "github" + } + }, "nixpkgs-lib": { "locked": { "lastModified": 1793504054, @@ -1139,6 +1155,7 @@ "nix-maid": "nix-maid", "nixphone": "nixphone", "nixpkgs": "nixpkgs_2", + "nixpkgs-lasuite": "nixpkgs-lasuite", "redlib": "redlib", "run0-sudo-shim": "run0-sudo-shim", "sable": "sable", diff --git a/flake.nix b/flake.nix index 3af0b6f..7a672ea 100755 --- a/flake.nix +++ b/flake.nix @@ -1,6 +1,8 @@ { inputs = { nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable"; + # FIXME: pinned for lasuite-docs 5.7.0 until migrated to 6.x + nixpkgs-lasuite.url = "github:nixos/nixpkgs/1d060086d60cb76a40cf37109f979d88a5bd6396"; wrapper-manager.url = "git+https://codeberg.org/viperML/wrapper-manager"; flake-parts.url = "github:hercules-ci/flake-parts"; nix-maid.url = "git+https://codeberg.org/viperML/nix-maid";