From 1b057929885fd3f339d4c85b44ad9f10fef7d8a9 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <edolstra@gmail.com>
Date: Tue, 4 Jun 2019 22:35:43 +0200
Subject: [PATCH] Shorter syntax for referencing flake outputs

Fixes #2819.
---
 src/libexpr/primops/flake.cc | 16 +++++++++++++---
 tests/flakes.sh              | 12 ++++++------
 2 files changed, 19 insertions(+), 9 deletions(-)

diff --git a/src/libexpr/primops/flake.cc b/src/libexpr/primops/flake.cc
index 734f650f2..793d6da35 100644
--- a/src/libexpr/primops/flake.cc
+++ b/src/libexpr/primops/flake.cc
@@ -468,10 +468,12 @@ static void prim_callNonFlake(EvalState & state, const Pos & pos, Value * * args
 void callFlake(EvalState & state,
     const Flake & flake,
     const FlakeInputs & inputs,
-    Value & v)
+    Value & vRes)
 {
-    // Construct the resulting attrset '{description, outputs,
-    // ...}'. This attrset is passed lazily as an argument to 'outputs'.
+    // Construct the resulting attrset '{outputs, ...}'. This attrset
+    // is passed lazily as an argument to the 'outputs' function.
+
+    auto & v = *state.allocValue();
 
     state.mkAttrs(v,
         inputs.flakeInputs.size() +
@@ -513,6 +515,14 @@ void callFlake(EvalState & state,
     v.attrs->push_back(Attr(state.symbols.create("self"), &v));
 
     v.attrs->sort();
+
+    /* For convenience, put the outputs directly in the result, so you
+       can refer to an output of an input as 'inputs.foo.bar' rather
+       than 'inputs.foo.outputs.bar'. */
+    auto v2 = *state.allocValue();
+    state.eval(state.parseExprFromString("res: res.outputs // res", "/"), v2);
+
+    state.callFunction(v2, v, vRes, noPos);
 }
 
 void callFlake(EvalState & state,
diff --git a/tests/flakes.sh b/tests/flakes.sh
index 1cd8259b9..c380b405b 100644
--- a/tests/flakes.sh
+++ b/tests/flakes.sh
@@ -55,7 +55,7 @@ cat > $flake2Dir/flake.nix <<EOF
   description = "Fnord";
 
   outputs = inputs: rec {
-    packages.bar = inputs.flake1.outputs.packages.foo;
+    packages.bar = inputs.flake1.packages.foo;
   };
 }
 EOF
@@ -74,7 +74,7 @@ cat > $flake3Dir/flake.nix <<EOF
   description = "Fnord";
 
   outputs = inputs: rec {
-    packages.xyzzy = inputs.flake2.outputs.packages.bar;
+    packages.xyzzy = inputs.flake2.packages.bar;
   };
 }
 EOF
@@ -176,8 +176,8 @@ cat > $flake3Dir/flake.nix <<EOF
   description = "Fnord";
 
   outputs = inputs: rec {
-    packages.xyzzy = inputs.flake2.outputs.packages.bar;
-    packages.sth = inputs.flake1.outputs.packages.foo;
+    packages.xyzzy = inputs.flake2.packages.bar;
+    packages.sth = inputs.flake1.packages.foo;
   };
 }
 EOF
@@ -233,8 +233,8 @@ cat > $flake3Dir/flake.nix <<EOF
   description = "Fnord";
 
   outputs = inputs: rec {
-    packages.xyzzy = inputs.flake2.outputs.packages.bar;
-    packages.sth = inputs.flake1.outputs.packages.foo;
+    packages.xyzzy = inputs.flake2.packages.bar;
+    packages.sth = inputs.flake1.packages.foo;
     packages.fnord =
       with import ./config.nix;
       mkDerivation {