aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEelco Dolstra <edolstra@gmail.com>2023-01-18 14:26:35 +0100
committerGitHub <noreply@github.com>2023-01-18 14:26:35 +0100
commitee1372d2467bba3f40fc849c4a5a9e1d782ee502 (patch)
tree8df189c0079a83195ed28c4028f6bea6850b1ca9
parente3bb97d44aeca08f20c5b1d0396bab018cc9d5a7 (diff)
parent01f268322a71de11de8eccd2bfa3130c2d4e9c10 (diff)
Merge pull request #7627 from edolstra/fetchTarball-channel
Restore support for channel: URLs in fetchTarball
-rw-r--r--src/libexpr/primops/fetchTree.cc3
1 files changed, 3 insertions, 0 deletions
diff --git a/src/libexpr/primops/fetchTree.cc b/src/libexpr/primops/fetchTree.cc
index 680446787..fb392a6e8 100644
--- a/src/libexpr/primops/fetchTree.cc
+++ b/src/libexpr/primops/fetchTree.cc
@@ -220,6 +220,9 @@ static void fetch(EvalState & state, const PosIdx pos, Value * * args, Value & v
} else
url = state.forceStringNoCtx(*args[0], pos);
+ if (who == "fetchTarball")
+ url = evalSettings.resolvePseudoUrl(*url);
+
state.checkURI(*url);
if (name == "")