From b2e8120d25de5303bfb6a99c14d3ecad21f55a05 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <edolstra@gmail.com>
Date: Thu, 2 Sep 2021 14:01:07 +0200
Subject: [PATCH] parseInstallables(): Parse store paths as store paths

If the store path contains a flake, this means that a command like
"nix path-info /path" will show info about /path, not about the
default output of the flake in /path. If you want the latter, you can
explicitly ask for it by doing "nix path-info path:/path".

Fixes #4568.
---
 src/libcmd/installables.cc | 29 +++++++++++------------------
 tests/flakes.sh            |  4 ++++
 2 files changed, 15 insertions(+), 18 deletions(-)

diff --git a/src/libcmd/installables.cc b/src/libcmd/installables.cc
index 68e0469c3..0091a938a 100644
--- a/src/libcmd/installables.cc
+++ b/src/libcmd/installables.cc
@@ -654,6 +654,17 @@ std::vector<std::shared_ptr<Installable>> SourceExprCommand::parseInstallables(
         for (auto & s : ss) {
             std::exception_ptr ex;
 
+            if (s.find('/') != std::string::npos) {
+                try {
+                    result.push_back(std::make_shared<InstallableStorePath>(store, store->followLinksToStorePath(s)));
+                    continue;
+                } catch (BadStorePath &) {
+                } catch (...) {
+                    if (!ex)
+                        ex = std::current_exception();
+                }
+            }
+
             try {
                 auto [flakeRef, fragment] = parseFlakeRefWithFragment(s, absPath("."));
                 result.push_back(std::make_shared<InstallableFlake>(
@@ -668,25 +679,7 @@ std::vector<std::shared_ptr<Installable>> SourceExprCommand::parseInstallables(
                 ex = std::current_exception();
             }
 
-            if (s.find('/') != std::string::npos) {
-                try {
-                    result.push_back(std::make_shared<InstallableStorePath>(store, store->followLinksToStorePath(s)));
-                    continue;
-                } catch (BadStorePath &) {
-                } catch (...) {
-                    if (!ex)
-                        ex = std::current_exception();
-                }
-            }
-
             std::rethrow_exception(ex);
-
-            /*
-            throw Error(
-                pathExists(s)
-                ? "path '%s' is not a flake or a store path"
-                : "don't know how to handle argument '%s'", s);
-            */
         }
     }
 
diff --git a/tests/flakes.sh b/tests/flakes.sh
index 29f0fe05e..610bab391 100644
--- a/tests/flakes.sh
+++ b/tests/flakes.sh
@@ -775,6 +775,10 @@ git -C $flakeFollowsA add flake.nix
 nix flake lock $flakeFollowsA 2>&1 | grep 'this is a security violation'
 
 # Test flake in store does not evaluate
+rm -rf $badFlakeDir
 mkdir $badFlakeDir
 echo INVALID > $badFlakeDir/flake.nix
 nix store delete $(nix store add-path $badFlakeDir)
+
+[[ $(nix path-info      $(nix store add-path $flake1Dir)) =~ flake1 ]]
+[[ $(nix path-info path:$(nix store add-path $flake1Dir)) =~ simple ]]