From b9289e4855d0221825c6f673d64f69802daa6b42 Mon Sep 17 00:00:00 2001 From: Yorick van Pelt Date: Wed, 9 May 2018 15:23:08 +0200 Subject: make sure not to use cached channels for nix-channel --update fixes #1964 --- src/libstore/download.hh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'src/libstore/download.hh') diff --git a/src/libstore/download.hh b/src/libstore/download.hh index 0b8d29b21dfe..7ade756fc356 100644 --- a/src/libstore/download.hh +++ b/src/libstore/download.hh @@ -2,6 +2,7 @@ #include "types.hh" #include "hash.hh" +#include "globals.hh" #include #include @@ -54,7 +55,7 @@ struct Downloader use the recorded ETag to verify if the server has a more recent version, and if so, download it to the Nix store. */ Path downloadCached(ref store, const string & uri, bool unpack, string name = "", - const Hash & expectedHash = Hash(), string * effectiveUri = nullptr); + const Hash & expectedHash = Hash(), string * effectiveUri = nullptr, int ttl = settings.tarballTtl); enum Error { NotFound, Forbidden, Misc, Transient, Interrupted }; }; -- cgit 1.4.1