aboutsummaryrefslogtreecommitdiff
path: root/src/libexpr
diff options
context:
space:
mode:
authorEelco Dolstra <edolstra@gmail.com>2019-08-30 16:38:27 +0200
committerEelco Dolstra <edolstra@gmail.com>2019-08-30 16:38:27 +0200
commit80c36d4562af71a90c67b3adb886a1003834890e (patch)
tree82be5f00ade2b2f8ba79bb150bcd5a91965d12c1 /src/libexpr
parent30ccf4e52d31ea0f1531feb8cccdc0314a41265d (diff)
Remove 'name' attribute from flakes
This is no longer needed since flakes are given an identity in the 'inputs' attribute.
Diffstat (limited to 'src/libexpr')
-rw-r--r--src/libexpr/flake/flake.cc6
-rw-r--r--src/libexpr/flake/flake.hh1
2 files changed, 0 insertions, 7 deletions
diff --git a/src/libexpr/flake/flake.cc b/src/libexpr/flake/flake.cc
index ce5dd55a2..ba337cf97 100644
--- a/src/libexpr/flake/flake.cc
+++ b/src/libexpr/flake/flake.cc
@@ -239,11 +239,6 @@ Flake getFlake(EvalState & state, const FlakeRef & flakeRef)
} else
throw Error("flake '%s' lacks attribute 'edition'", flakeRef);
- if (auto name = vInfo.attrs->get(state.sName))
- flake.id = state.forceStringNoCtx(*(**name).value, *(**name).pos);
- else
- throw Error("flake '%s' lacks attribute 'name'", flakeRef);
-
if (auto description = vInfo.attrs->get(state.sDescription))
flake.description = state.forceStringNoCtx(*(**description).value, *(**description).pos);
@@ -292,7 +287,6 @@ Flake getFlake(EvalState & state, const FlakeRef & flakeRef)
for (auto & attr : *vInfo.attrs) {
if (attr.name != sEdition &&
attr.name != sEpoch &&
- attr.name != state.sName &&
attr.name != state.sDescription &&
attr.name != sInputs &&
attr.name != sOutputs)
diff --git a/src/libexpr/flake/flake.hh b/src/libexpr/flake/flake.hh
index 84bce9b5a..8f05e9799 100644
--- a/src/libexpr/flake/flake.hh
+++ b/src/libexpr/flake/flake.hh
@@ -67,7 +67,6 @@ struct FlakeInput
struct Flake
{
- FlakeId id;
FlakeRef originalRef;
std::string description;
SourceInfo sourceInfo;