aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEelco Dolstra <edolstra@gmail.com>2017-10-30 10:19:33 +0100
committerEelco Dolstra <edolstra@gmail.com>2017-10-30 10:22:58 +0100
commit23ce4b33932260ad1f1bca4978ea274a1da1e0ad (patch)
treeeb427d369c990c7aefc2dab926a50f8da74aca1a
parent66ddbef7547a2b5430c6d87e2d8d52977f7bf6f0 (diff)
fetchTarball: Use "source" as the default name
This ensures that it produces the same output as fetchgit: $ nix eval --raw '(builtins.fetchgit https://github.com/NixOS/patchelf.git)' /nix/store/ghigrkw02l440g8vfxa9wj4c3zpfmw99-source $ nix eval --raw '(fetchTarball https://github.com/NixOS/patchelf/archive/master.tar.gz)' /nix/store/ghigrkw02l440g8vfxa9wj4c3zpfmw99-source
-rw-r--r--src/libexpr/primops.cc8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/libexpr/primops.cc b/src/libexpr/primops.cc
index 43dc20080..a01af05e3 100644
--- a/src/libexpr/primops.cc
+++ b/src/libexpr/primops.cc
@@ -1907,11 +1907,11 @@ static void prim_compareVersions(EvalState & state, const Pos & pos, Value * * a
void fetch(EvalState & state, const Pos & pos, Value * * args, Value & v,
- const string & who, bool unpack)
+ const string & who, bool unpack, const std::string & defaultName)
{
string url;
Hash expectedHash;
- string name = "";
+ string name = defaultName;
state.forceValue(*args[0]);
@@ -1947,13 +1947,13 @@ void fetch(EvalState & state, const Pos & pos, Value * * args, Value & v,
static void prim_fetchurl(EvalState & state, const Pos & pos, Value * * args, Value & v)
{
- fetch(state, pos, args, v, "fetchurl", false);
+ fetch(state, pos, args, v, "fetchurl", false, "");
}
static void prim_fetchTarball(EvalState & state, const Pos & pos, Value * * args, Value & v)
{
- fetch(state, pos, args, v, "fetchTarball", true);
+ fetch(state, pos, args, v, "fetchTarball", true, "source");
}