aboutsummaryrefslogtreecommitdiff
path: root/src/libexpr
diff options
context:
space:
mode:
authorEelco Dolstra <edolstra@gmail.com>2020-10-26 17:59:36 +0100
committerEelco Dolstra <edolstra@gmail.com>2020-10-26 17:59:36 +0100
commitb875b8f45c8d73c26e2cf13843fa25cc6762eebc (patch)
treecdba79c8a3334dba8c40a5e018f6f38a55870b9f /src/libexpr
parent1e66d146a343cff8ea60fa24b1642762de27c787 (diff)
Remove edition field
Diffstat (limited to 'src/libexpr')
-rw-r--r--src/libexpr/flake/flake.cc8
1 files changed, 1 insertions, 7 deletions
diff --git a/src/libexpr/flake/flake.cc b/src/libexpr/flake/flake.cc
index bae4d65e5..ca3b185f9 100644
--- a/src/libexpr/flake/flake.cc
+++ b/src/libexpr/flake/flake.cc
@@ -196,11 +196,6 @@ static Flake getFlake(
expectType(state, tAttrs, vInfo, Pos(foFile, state.symbols.create(flakeFile), 0, 0));
- auto sEdition = state.symbols.create("edition"); // FIXME: remove soon
-
- if (vInfo.attrs->get(sEdition))
- warn("flake '%s' has deprecated attribute 'edition'", lockedRef);
-
if (auto description = vInfo.attrs->get(state.sDescription)) {
expectType(state, tString, *description->value, *description->pos);
flake.description = description->value->string.s;
@@ -229,8 +224,7 @@ static Flake getFlake(
throw Error("flake '%s' lacks attribute 'outputs'", lockedRef);
for (auto & attr : *vInfo.attrs) {
- if (attr.name != sEdition &&
- attr.name != state.sDescription &&
+ if (attr.name != state.sDescription &&
attr.name != sInputs &&
attr.name != sOutputs)
throw Error("flake '%s' has an unsupported attribute '%s', at %s",