From a8acaf7143572dac1bc02b124e593d68b5bdddc7 Mon Sep 17 00:00:00 2001 From: asimon Date: Sun, 25 Jan 2026 12:15:49 +0100 Subject: [PATCH] fix(generator): replace gotmpl with gomplate --- README.md | 2 +- docs/index.md | 4 ++-- docs/usage.md | 4 ++-- lib/lib.nix | 2 +- lib/module.nix | 2 +- tests/fixtures/{gotmpl_template => gomplate_template} | 0 tests/soonix_test.nix | 10 +++++----- 7 files changed, 12 insertions(+), 12 deletions(-) rename tests/fixtures/{gotmpl_template => gomplate_template} (100%) diff --git a/README.md b/README.md index d46cb7c..4f95e22 100644 --- a/README.md +++ b/README.md @@ -53,7 +53,7 @@ use the `devshellModule` for easy integration, see the docs for more. - **`nix`**: Convert Nix data to JSON, YAML, TOML, INI, XML formats - **`string`**: Output raw string content with optional executable permissions - **`derivation`**: Use existing Nix derivations as file content -- **`gotmpl`**: Advanced Go template rendering via gomplate +- **`gomplate`**: Advanced Go template rendering via gomplate - **`jinja`**: Python Jinja2 template rendering ## Docs diff --git a/docs/index.md b/docs/index.md index b457a50..5d45fe9 100644 --- a/docs/index.md +++ b/docs/index.md @@ -19,7 +19,7 @@ Soonix helps you: - **nix**: Convert Nix data to JSON, YAML, TOML, INI, XML formats - **string**: Output raw string content with optional executable permissions - **derivation**: Use existing Nix derivations as file content -- **gotmpl**: Advanced Go template rendering via gomplate +- **gomplate**: Advanced Go template rendering via gomplate - **jinja**: Python Jinja2 template rendering ### Automatic File Management @@ -63,7 +63,7 @@ Automatically manage .gitignore entries for generated files to keep your reposit dockerfile = { output = "Dockerfile"; - generator = "gotmpl"; + generator = "gomplate"; data = { baseImage = "node:18-alpine"; port = 3000; diff --git a/docs/usage.md b/docs/usage.md index 2153ab2..7a02190 100644 --- a/docs/usage.md +++ b/docs/usage.md @@ -100,7 +100,7 @@ Use Go templates for more complex file generation: hooks = { dockerfile = { output = "Dockerfile"; - generator = "gotmpl"; + generator = "gomplate"; data = { baseImage = "node:18-alpine"; workdir = "/app"; @@ -331,7 +331,7 @@ in { hooks = { kubernetes-manifest = { output = "k8s/deployment.yaml"; - generator = "gotmpl"; + generator = "gomplate"; data = { app = { name = "my-app"; diff --git a/lib/lib.nix b/lib/lib.nix index cf82725..8bcfff9 100644 --- a/lib/lib.nix +++ b/lib/lib.nix @@ -50,7 +50,7 @@ # only a passthru derivation = {data, ...}: data; - gotmpl = { + gomplate = { name, opts, data, diff --git a/lib/module.nix b/lib/module.nix index 4546319..53017d9 100644 --- a/lib/module.nix +++ b/lib/module.nix @@ -30,7 +30,7 @@ in { }; generator = mkOption { - type = types.enum ["nix" "string" "derivation" "gotmpl" "jinja" "template"]; + type = types.enum ["nix" "string" "derivation" "gomplate" "jinja" "template"]; description = '' Which engine to use for content generation. ''; diff --git a/tests/fixtures/gotmpl_template b/tests/fixtures/gomplate_template similarity index 100% rename from tests/fixtures/gotmpl_template rename to tests/fixtures/gomplate_template diff --git a/tests/soonix_test.nix b/tests/soonix_test.nix index e59498e..8198e4b 100644 --- a/tests/soonix_test.nix +++ b/tests/soonix_test.nix @@ -19,10 +19,10 @@ }; }; gomplate = { - output = "gotmpl"; - generator = "gotmpl"; + output = "gomplate"; + generator = "gomplate"; data.hello = "world"; - opts.template = ./fixtures/gotmpl_template; + opts.template = ./fixtures/gomplate_template; }; jinja = { output = "jinja"; @@ -48,8 +48,8 @@ in { assert "-f ${finalFiles}/out/test.json" "should exist" assert_file_contains ${finalFiles}/out/test.json "soonix-test" - assert "-f ${finalFiles}/gotmpl" "should exist" - assert_file_contains ${finalFiles}/gotmpl "Hello world" + assert "-f ${finalFiles}/gomplate" "should exist" + assert_file_contains ${finalFiles}/gomplate "Hello world" assert "-f ${finalFiles}/jinja" "should exist" assert_file_contains ${finalFiles}/jinja "Hello world"