diff options
| author | Jan Tojnar <jtojnar@gmail.com> | 2023-12-31 02:31:32 +0100 |
|---|---|---|
| committer | Jan Tojnar <jtojnar@gmail.com> | 2023-12-31 02:31:32 +0100 |
| commit | 80020c7db424d64d352babc390bbf14e0aceaf23 (patch) | |
| tree | f0fe36ea8af3f42d03d28a2865eeaf763b05fb2f /nixos/modules/module-list.nix | |
| parent | f50aae4fb10dd51bd6ffcce0eb96d02b608a9595 (diff) | |
| parent | 55b9aa64c39d6c34b6ef878fbad405900782e998 (diff) | |
| download | nixlib-80020c7db424d64d352babc390bbf14e0aceaf23.tar nixlib-80020c7db424d64d352babc390bbf14e0aceaf23.tar.gz nixlib-80020c7db424d64d352babc390bbf14e0aceaf23.tar.bz2 nixlib-80020c7db424d64d352babc390bbf14e0aceaf23.tar.lz nixlib-80020c7db424d64d352babc390bbf14e0aceaf23.tar.xz nixlib-80020c7db424d64d352babc390bbf14e0aceaf23.tar.zst nixlib-80020c7db424d64d352babc390bbf14e0aceaf23.zip | |
Merge branch 'master' into staging-next
; Conflicts: ; pkgs/development/lua-modules/generated-packages.nix ; pkgs/development/lua-modules/overrides.nix
Diffstat (limited to 'nixos/modules/module-list.nix')
| -rw-r--r-- | nixos/modules/module-list.nix | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index a08650f92b1c..893a49e5763a 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -723,6 +723,7 @@ ./services/misc/nzbget.nix ./services/misc/nzbhydra2.nix ./services/misc/octoprint.nix + ./services/misc/ollama.nix ./services/misc/ombi.nix ./services/misc/osrm.nix ./services/misc/owncast.nix |