aboutsummaryrefslogtreecommitdiff
path: root/src/nix-channel
diff options
context:
space:
mode:
authorShea Levy <shea@shealevy.com>2016-08-31 09:57:56 -0400
committerShea Levy <shea@shealevy.com>2016-08-31 09:57:56 -0400
commitdfe09386148901e4d9f2dc84641d2d5544c886f7 (patch)
tree15a106b8b30ff5a57d995803288d7f41fc8caa47 /src/nix-channel
parent572aba284a161cb94532cec297785266ee719b99 (diff)
download.hh: Fix conflicts from nix-channel-c++ merge
Diffstat (limited to 'src/nix-channel')
-rwxr-xr-xsrc/nix-channel/nix-channel.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/nix-channel/nix-channel.cc b/src/nix-channel/nix-channel.cc
index 79c9d0ece..0f7858aa5 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