Make more string values work as installables

Progress towards NixOS#7417
obsidiansystems · Jan 14, 2023 · 738c727 · 738c727
1 parent 5576d5e
commit 738c727
Show file tree

Hide file tree

Showing 2 changed files with 66 additions and 11 deletions.
diff --git a/src/libcmd/installables.cc b/src/libcmd/installables.cc
@@ -619,17 +619,49 @@ DerivedPathsWithInfo InstallableFlake::toDerivedPaths()
         }
 
         else if (v.type() == nString) {
-            PathSet context;
-            auto s = state->forceString(v, context, noPos, fmt("while evaluating the flake output attribute '%s'", attrPath));
-            auto storePath = state->store->maybeParseStorePath(s);
-            if (storePath && context.count(std::string(s))) {
-                return {{
-                    .path = DerivedPath::Opaque {
-                        .path = std::move(*storePath),
-                    }
-                }};
-            } else
-                throw Error("flake output attribute '%s' evaluates to the string '%s' which is not a store path", attrPath, s);
+            auto context = v.getContext(*state->store);
+            std::string_view s = state->forceString(v, noPos, fmt("while evaluating the flake output attribute '%s'", attrPath));
+            if (context.size() != 1)
+                throw Error(
+                    "flake output attribute '%s' evaluates to the string '%s' which does not denote exactly one store",
+                    attrPath, s);
+            return {{
+                .path = std::visit(overloaded {
+                    [&](NixStringContextElem::Opaque & o) -> DerivedPath {
+                       auto sExpected = state->store->printStorePath(o.path);
+                       if (s != sExpected)
+                           throw Error(
+                               "flake output attribute '%s' evaluates to the string '%s' which should be '%s' but is not",
+                               attrPath, s, sExpected);
+                       return DerivedPath::Opaque {
+                           .path = std::move(o.path),
+                       };
+                    },
+                    [&](NixStringContextElem::DrvDeep & o) -> DerivedPath {
+                       throw Error(
+                           "flake output attribute '%s' evaluates to the string '%s' which unsupported String Context",
+                           attrPath, s);
+                    },
+                    [&](NixStringContextElem::Built & o) -> DerivedPath {
+                       auto drv = state->store->readDerivation(o.drvPath);
+                       auto i = drv.outputs.find(o.output);
+                       if (i == drv.outputs.end())
+                           throw Error("derivation '%s' does not have output '%s'", state->store->printStorePath(o.drvPath), o.output);
+                       auto optOutputPath = i->second.path(*state->store, drv.name, o.output);
+                       auto sExpected = optOutputPath
+                           ? state->store->printStorePath(*optOutputPath)
+                           : downstreamPlaceholder(*state->store, o.drvPath, o.output);
+                       if (s != sExpected)
+                           throw Error(
+                               "flake output attribute '%s' evaluates to the string '%s' which should be '%s' but is not",
+                               attrPath, s, sExpected);
+                       return DerivedPath::Built {
+                           .drvPath = std::move(o.drvPath),
+                           .outputs = { std::move(o.output) },
+                       };
+                    },
+                }, context[0].raw()),
+            }};
         }
 
         else

diff --git a/tests/flakes/build-paths.sh b/tests/flakes/build-paths.sh
@@ -41,10 +41,25 @@ cat > $flake1Dir/flake.nix <<EOF
     a8 = builtins.storePath $dep;
 
     a9 = "$dep";
+
+    drvCall = with import ./config.nix; mkDerivation {
+      name = "simple";
+      builder = ./simple.builder.sh;
+      PATH = "";
+      goodPath = path;
+    };
+
+    a10 = builtins.unsafeDiscardOutputDependency self.drvCall.drvPath;
+
+    a11 = self.drvCall.drvPath;
+
+    a12 = self.drvCall.outPath;
   };
 }
 EOF
 
+cp ../simple.nix ../simple.builder.sh ../config.nix $flake1Dir/
+
 echo bar > $flake1Dir/foo
 
 nix build --json --out-link $TEST_ROOT/result $flake1Dir#a1
@@ -64,3 +79,11 @@ nix build --impure --json --out-link $TEST_ROOT/result $flake1Dir#a8
 diff common.sh $TEST_ROOT/result
 
 (! nix build --impure --json --out-link $TEST_ROOT/result $flake1Dir#a9)
+
+nix build --json --out-link $TEST_ROOT/result $flake1Dir#a10
+[[ $(readlink -e $TEST_ROOT/result) = *simple.drv ]]
+
+(! nix build --json --out-link $TEST_ROOT/result $flake1Dir#a11)
+
+nix build --json --out-link $TEST_ROOT/result $flake1Dir#a12
+[[ -e $TEST_ROOT/result/hello ]]