diff --git a/README.md b/README.md index e198879..1570632 100644 --- a/README.md +++ b/README.md @@ -56,7 +56,7 @@ Also makes it possible to split CI parts in a separate module which can be impor } ``` -Now either use this in your .gitlab-ci.yml or setup Soonix to auto generate this +Now either use this in your .gitlab-ci.yml or setup Soonix to auto generate this file for you with the right version (see the [docs][docs-soonix] for more). ```yaml diff --git a/lib/default.nix b/lib/default.nix index 5203efe..ff3ec88 100644 --- a/lib/default.nix +++ b/lib/default.nix @@ -10,7 +10,10 @@ args: let cilib = { inherit (impl) helpers modules mkPipeline mkJobRun mkJobDeps mkJobPatched; utils = import ./utils.nix {inherit pkgs;}; - version = trimWith { start = true; end = true; } (builtins.readFile ./VERSION); + version = trimWith { + start = true; + end = true; + } (builtins.readFile ./VERSION); mkCI = config: (evalModules { diff --git a/lib/impl/helpers.nix b/lib/impl/helpers.nix index 147788c..ebeeb46 100644 --- a/lib/impl/helpers.nix +++ b/lib/impl/helpers.nix @@ -64,7 +64,7 @@ in rec { unsetOr = typ: (types.either unsetType typ) // { - description = typ.description; + inherit (typ) description; }; mkUnsetOption = opts: mkOption (opts diff --git a/lib/impl/modules/root.nix b/lib/impl/modules/root.nix index db7e19a..84fb5ba 100644 --- a/lib/impl/modules/root.nix +++ b/lib/impl/modules/root.nix @@ -18,7 +18,7 @@ in rec { nixJobsByDefault = mkOption { description = '' Whether to transform all jobs to nix-configured jobs by default. - If false, you need to set [`nix.enable`](#pipelinesnamejobsnamenixenable) + If false, you need to set [`nix.enable`](#pipelinesnamejobsnamenixenable) for each job you want to be transformed. ''; type = types.bool; diff --git a/nix/repo/devShells.nix b/nix/repo/devShells.nix index 4a7da34..10889f9 100644 --- a/nix/repo/devShells.nix +++ b/nix/repo/devShells.nix @@ -19,7 +19,7 @@ in { yamlfmt.enable = true; }; settings.formatter = { - yamlfmt.excludes = ["templates/nix-gitlab-ci.yml"]; + yamlfmt.excludes = ["templates/nix-gitlab-ci.yml" ".gitlab-ci.yml"]; mdformat.command = let pkg = pkgs.python3.withPackages (p: [ p.mdformat