Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -79,6 +79,12 @@ let
examples = lib.mapAttrs (
_: project: lib.mapAttrs (_: example: example.module) project.nixos.examples
) self.hydrated-projects;
demos = lib.mapAttrs (
_: project: lib.filterAttrs (_: v: v != null) {
vm = project.nixos.demo.vm.module or null;
shell = project.nixos.demo.shell.module or null;
}
) self.hydrated-projects;
Comment on lines +82 to +87
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is already composed in overview/demo/default.nix. We could just expose raw-demos and pass that to sources.

};
};

Expand Down
5 changes: 0 additions & 5 deletions projects/Teamtype/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -34,11 +34,6 @@
module = ./programs/teamtype/module.nix;
examples."Enable Teamtype" = {
module = ./programs/teamtype/examples/basic.nix;
tests.basic.module = import ./programs/teamtype/tests/basic.nix args;
tests.basic.problem.broken.reason = ''
Needs a self-hosted relay server to work non-interactively (without internet).
Requires: https://github.com/teamtype/teamtype/issues/344
'';
Comment on lines -37 to -41
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Self-hosted relays still don't exist AFAIK, so the test shouldn't be unbroken. Please revert this.

};
};
};
Expand Down
2 changes: 1 addition & 1 deletion projects/Teamtype/programs/teamtype/tests/basic.nix
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
imports = [
sources.modules.ngipkgs
sources.modules.programs.teamtype
sources.examples.Teamtype."Enable Teamtype"
sources.demos.Teamtype.shell
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

A demo can be either shell or vm for any given project. It's a bit redundant to have to have to explicitly specify this. Instead, I think this makes more sense: sources.demos.Teamtype

];
services.getty.autologinUser = "root";
};
Expand Down