puck/lix
0
0
Fork 0
forked from lix-project/lix
Code Pull requests Activity

fetchTarball: Use "source" as the default name

Browse source 
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
This commit is contained in:
Eelco Dolstra 2017-10-30 10:19:33 +01:00
parent 66ddbef754
commit 23ce4b3393
No known key found for this signature in database
GPG key ID: 8170B4726D7198DE
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/libexpr/primops.cc
View file

@ -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, 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; string url;
Hash expectedHash; Hash expectedHash;
string name = ""; string name = defaultName;
state.forceValue(*args[0]); 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) 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) 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");
} }