From dfe09386148901e4d9f2dc84641d2d5544c886f7 Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Wed, 31 Aug 2016 09:57:56 -0400 Subject: download.hh: Fix conflicts from nix-channel-c++ merge --- src/nix-channel/nix-channel.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/nix-channel') 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 -- cgit 1.4.1