Skip to content
Merged
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
5 changes: 4 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,10 @@ source by.
| `home-manager` | `home-manager` | Home Manager configurations |
| `home-manager-minimal` | `home-manager` | the `homeManager` class with Home Manager's necessary modules alone, the configuration importing what it uses from `modulesPath`; a second integration over the class `home-manager` owns |
| `terranix` | `terranix` | Terranix and Terraform configurations |
| `colmena` | `colmena` | colmena configurations (class `caisson-colmena`), projected onto the hive colmena's binary reads; not compatible with colmena's hive modules |
| `caisson-colmena` | `colmena` | colmena configurations whose machines are NixOS configurations declared inside them, published as the hive colmena's command reads; the colmena integration we recommend for new configurations |
| `colmena` | `colmena` | a hive written for colmena, taken as it is, with each node a NixOS configuration; for porting an existing hive and the modules written for it |
| `caisson-disko` | `disko` | disk layouts, with the NixOS configurations installed onto each declared inside it; a machine gets the layout's file systems and no disko scripts; the disko integration we recommend for new configurations |
| `disko` | `disko` | disk layouts written as disko reads them, whose machines import disko's NixOS module, so disko's command, `disko-install` and its image builder work on them |
| `system-manager` | `system-manager` | system-manager configurations on foreign distros |
| `structural` | none | a configuration that only exports and holds configurations beneath it: the top of a repository whose point is what it exports, such as caisson itself, or a layer at any depth |

Expand Down
2 changes: 2 additions & 0 deletions configs/structural/impl/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,8 @@
home-manager-minimal
caisson-colmena
colmena
caisson-disko
disko
terranix
system-manager
;
Expand Down
5 changes: 3 additions & 2 deletions docs/development/repository-structure.md
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,8 @@ without nixpkgs can depend on it directly.

The layer users reach for: the integrations (`structural`,
`flake-parts`, `nixpkgs`, `nixos`, `nixos-minimal`, `home-manager`,
`home-manager-minimal`, `colmena`, `terranix`, `system-manager`), each
`home-manager-minimal`, `caisson-colmena`, `colmena`, `caisson-disko`,
`disko`, `terranix`, `system-manager`), each
a library overlay
contributing its `lib.caisson` namespace, registering its module
class where it has a class (`nixos-minimal` and `home-manager-minimal`
Expand All @@ -49,7 +50,7 @@ inject the same names beside `self`.
## The pinned world

The upstream world caisson is tested against (nixpkgs, home-manager,
colmena, terranix, system-manager, and the test tooling) is pinned in
colmena, disko, terranix, system-manager, and the test tooling) is pinned in
`tests/dependencies/flake.lock`, a lock only the checks and formatter
partitions read, so caisson's `flake.nix` carries no churning pin. The
pinned-world suite, `tests/pinned-world`, composes caisson with those
Expand Down
2 changes: 1 addition & 1 deletion docs/development/testing-architecture.md
Original file line number Diff line number Diff line change
Expand Up @@ -311,6 +311,6 @@ The checks partition merges outputs from all test and example flakes into the
| `literate-flake-default` | `examples/literate-flake/` | Example default package builds |
| `literate-flake-greeting` | `examples/literate-flake/` | Example greeting package builds |
| `debug-disabled` | `checks.nix` (inline) | `self.debug` is not exposed in production |
| `pinned-world` | `checks.nix` + `tests/pinned-world/` | caisson composed with the pinned upstream world (nixpkgs, home-manager, colmena, terranix, system-manager) evaluates end to end; the `drift` workflow runs the same check against advanced pins |
| `pinned-world` | `checks.nix` + `tests/pinned-world/` | caisson composed with the pinned upstream world (nixpkgs, home-manager, colmena, disko, terranix, system-manager) evaluates end to end; the `drift` workflow runs the same check against advanced pins |
| `argument-errors` | `checks.nix` + `tests/argument-errors/` | The argument error of every entry point comes from Nix itself, raised at the call site with no frame of caisson |
| `eval-weight` | `checks.nix` + `tests/eval-weight/` | Framework evaluation cost held to committed ceilings ([guide](https://nix-caisson.github.io/docs/eval-weight.html)) |
7 changes: 4 additions & 3 deletions docs/development/testing.md
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,10 @@ plumbing works.
## Pinned-World Suite

- **Scope:** caisson composed with concrete pinned versions of the upstream
world (nixpkgs, home-manager, colmena, terranix, system-manager) and
exercised end to end: a home configuration, a NixOS system with
homes declared inside it, a colmena hive, a terranix and a system-manager
world (nixpkgs, home-manager, colmena, disko, terranix, system-manager)
and exercised end to end: a home configuration, a NixOS system with
homes declared inside it, a colmena hive, disk layouts with the
machines installed onto them, a terranix and a system-manager
configuration, and the composition guarantees of the real exported
overlays. Every upstream expectation caisson relies on is a probe here.
- **Location:** `tests/pinned-world/default.nix`; the pins in
Expand Down
6 changes: 3 additions & 3 deletions flake.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading
Loading