From 73c98405695837dd93448ed38c0eeb0b56060dfc Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Thu, 20 Feb 2020 23:44:06 +0100 Subject: Restore subdir -> dir Got this mixed up somewhere. --- src/nix/flake.cc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/nix') diff --git a/src/nix/flake.cc b/src/nix/flake.cc index 42f5b2ce0..0887fb402 100644 --- a/src/nix/flake.cc +++ b/src/nix/flake.cc @@ -507,7 +507,7 @@ struct CmdFlakeAdd : MixEvalArgs, Command auto fromRef = parseFlakeRef(fromUrl); auto toRef = parseFlakeRef(toUrl); fetchers::Input::Attrs extraAttrs; - if (toRef.subdir != "") extraAttrs["subdir"] = toRef.subdir; + if (toRef.subdir != "") extraAttrs["dir"] = toRef.subdir; auto userRegistry = fetchers::getUserRegistry(); userRegistry->remove(fromRef.input); userRegistry->add(fromRef.input, toRef.input, extraAttrs); @@ -558,7 +558,7 @@ struct CmdFlakePin : virtual Args, EvalCommand userRegistry->remove(ref.input); auto [tree, resolved] = ref.resolve(store).input->fetchTree(store); fetchers::Input::Attrs extraAttrs; - if (ref.subdir != "") extraAttrs["subdir"] = ref.subdir; + if (ref.subdir != "") extraAttrs["dir"] = ref.subdir; userRegistry->add(ref.input, resolved, extraAttrs); } }; -- cgit v1.2.3