aboutsummaryrefslogtreecommitdiff
path: root/src/nix-channel
diff options
context:
space:
mode:
authorEelco Dolstra <edolstra@gmail.com>2020-04-09 15:54:21 +0200
committerEelco Dolstra <edolstra@gmail.com>2020-04-09 15:54:21 +0200
commitd103c79144723d95eb3650593ad4d3e96abe59d3 (patch)
tree44bc23261fe42a60afa666ab770cf8d7f55c5138 /src/nix-channel
parent03a4a3c95cf0e10cd05c1c4ce9dd35c9fc64c331 (diff)
parent30d4618cc944a41c2ca202babd0be0da4a1cd9d2 (diff)
Merge remote-tracking branch 'origin/master' into flakes
Diffstat (limited to 'src/nix-channel')
-rwxr-xr-xsrc/nix-channel/nix-channel.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/nix-channel/nix-channel.cc b/src/nix-channel/nix-channel.cc
index 2a9defb4e..abd390414 100755
--- a/src/nix-channel/nix-channel.cc
+++ b/src/nix-channel/nix-channel.cc
@@ -1,6 +1,6 @@
#include "shared.hh"
#include "globals.hh"
-#include "download.hh"
+#include "filetransfer.hh"
#include "store-api.hh"
#include "../nix/legacy.hh"
#include "fetchers.hh"
@@ -113,7 +113,7 @@ static void update(const StringSet & channelNames)
// Download the channel tarball.
try {
filename = store->toRealPath(fetchers::downloadFile(store, url + "/nixexprs.tar.xz", "nixexprs.tar.xz", false).storePath);
- } catch (DownloadError & e) {
+ } catch (FileTransferError & e) {
filename = store->toRealPath(fetchers::downloadFile(store, url + "/nixexprs.tar.bz2", "nixexprs.tar.bz2", false).storePath);
}
}