diff options
author | Théophane Hufschmitt <theophane@hufschmitt.net> | 2022-04-05 11:03:43 +0200 |
---|---|---|
committer | Théophane Hufschmitt <theophane@hufschmitt.net> | 2022-04-05 11:03:43 +0200 |
commit | 5abe3f4aa61f33ac2124a624763e067257541871 (patch) | |
tree | 4bfed48bc12ec559ee73780310ea8de860bd6c7c | |
parent | a4a1de69dcc3c6e0c40a093d67b5f20568a5f31e (diff) |
Allow `welcomeText` when checking a flake template
Fix https://github.com/NixOS/nix/issues/6321
-rw-r--r-- | src/nix/flake.cc | 2 | ||||
-rw-r--r-- | tests/flakes.sh | 3 |
2 files changed, 4 insertions, 1 deletions
diff --git a/src/nix/flake.cc b/src/nix/flake.cc index 47a380238..ce7dc101a 100644 --- a/src/nix/flake.cc +++ b/src/nix/flake.cc @@ -463,7 +463,7 @@ struct CmdFlakeCheck : FlakeCommand for (auto & attr : *v.attrs) { std::string name(attr.name); - if (name != "path" && name != "description") + if (name != "path" && name != "description" && name != "welcomeText") throw Error("template '%s' has unsupported attribute '%s'", attrPath, name); } } catch (Error & e) { diff --git a/tests/flakes.sh b/tests/flakes.sh index ea629ae70..46e6a7982 100644 --- a/tests/flakes.sh +++ b/tests/flakes.sh @@ -376,6 +376,9 @@ cat > $templatesDir/flake.nix <<EOF trivial = { path = ./trivial; description = "A trivial flake"; + welcomeText = '' + Welcome to my trivial flake + ''; }; default = trivial; }; |