aboutsummaryrefslogtreecommitdiff
path: root/src/nix
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/nix
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/nix')
-rw-r--r--src/nix/flake.cc11
1 files changed, 0 insertions, 11 deletions
diff --git a/src/nix/flake.cc b/src/nix/flake.cc
index aab29b626..4129ef323 100644
--- a/src/nix/flake.cc
+++ b/src/nix/flake.cc
@@ -103,7 +103,6 @@ static void sourceInfoToJson(const SourceInfo & sourceInfo, nlohmann::json & j)
static void printFlakeInfo(const Flake & flake)
{
- std::cout << fmt("ID: %s\n", flake.id);
std::cout << fmt("Description: %s\n", flake.description);
std::cout << fmt("Edition: %s\n", flake.edition);
printSourceInfo(flake.sourceInfo);
@@ -112,7 +111,6 @@ static void printFlakeInfo(const Flake & flake)
static nlohmann::json flakeToJson(const Flake & flake)
{
nlohmann::json j;
- j["id"] = flake.id;
j["description"] = flake.description;
j["edition"] = flake.edition;
sourceInfoToJson(flake.sourceInfo, j);
@@ -120,12 +118,6 @@ static nlohmann::json flakeToJson(const Flake & flake)
}
#if 0
-static void printNonFlakeInfo(const NonFlake & nonFlake)
-{
- std::cout << fmt("ID: %s\n", nonFlake.alias);
- printSourceInfo(nonFlake.sourceInfo);
-}
-
// FIXME: merge info CmdFlakeInfo?
struct CmdFlakeDeps : FlakeCommand
{
@@ -148,9 +140,6 @@ struct CmdFlakeDeps : FlakeCommand
auto resFlake = std::move(todo.front());
todo.pop();
- for (auto & nonFlake : resFlake.nonFlakeDeps)
- printNonFlakeInfo(nonFlake);
-
for (auto & info : resFlake.flakeDeps) {
printFlakeInfo(info.second.flake);
todo.push(info.second);