diff options
author | Shea Levy <shea@shealevy.com> | 2016-08-31T13·57-0400 |
---|---|---|
committer | Shea Levy <shea@shealevy.com> | 2016-08-31T13·57-0400 |
commit | dfe09386148901e4d9f2dc84641d2d5544c886f7 (patch) | |
tree | 15a106b8b30ff5a57d995803288d7f41fc8caa47 /src/nix-channel/nix-channel.cc | |
parent | 572aba284a161cb94532cec297785266ee719b99 (diff) |
download.hh: Fix conflicts from nix-channel-c++ merge
Diffstat (limited to '')
-rwxr-xr-x | src/nix-channel/nix-channel.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/nix-channel/nix-channel.cc b/src/nix-channel/nix-channel.cc index 79c9d0eceb6b..0f7858aa53a5 100755 --- a/src/nix-channel/nix-channel.cc +++ b/src/nix-channel/nix-channel.cc @@ -86,7 +86,7 @@ static void update(const StringSet & channelNames) // definition from a consistent location if the redirect changes mid-download. auto effectiveUrl = string{}; auto dl = makeDownloader(); - auto filename = dl->downloadCached(store, url, false, effectiveUrl); + auto filename = dl->downloadCached(store, url, false, "", Hash(), &effectiveUrl); url = chomp(std::move(effectiveUrl)); // If the URL contains a version number, append it to the name |