lehmanator/lix
0
0
Fork 0
forked from lix-project/lix
Code Pull requests Activity

Merge pull request #6360 from thufschmitt/flake-check-accept-welcomeText

Browse source 
Allow `welcomeText` when checking a flake template
This commit is contained in:
Eelco Dolstra 2022-04-05 11:50:45 +02:00 committed by GitHub
parent a4a1de69dc 5abe3f4aa6
commit ec90fc4d1f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/nix/flake.cc
View file

@ -463,7 +463,7 @@ struct CmdFlakeCheck : FlakeCommand
for (auto & attr : *v.attrs) { for (auto & attr : *v.attrs) {
std::string name(attr.name); 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); throw Error("template '%s' has unsupported attribute '%s'", attrPath, name);
} }
} catch (Error & e) { } catch (Error & e) {

3
tests/flakes.sh
View file

@ -376,6 +376,9 @@ cat > $templatesDir/flake.nix <<EOF
trivial = { trivial = {
path = ./trivial; path = ./trivial;
description = "A trivial flake"; description = "A trivial flake";
welcomeText = ''
Welcome to my trivial flake
'';
}; };
default = trivial; default = trivial;
}; };