wroclaw-git-backups/nix
1
0
Fork 0
mirror of https://github.com/NixOS/nix synced 2025-07-07 10:11:47 +02:00
Code Activity

nix-channel: Don't fetch binary-cache-url

Browse source 
This has been ignored since the Perl->C++ rewrite.
This commit is contained in:
Eelco Dolstra 2019-06-25 13:27:16 +02:00
parent 09dde33c19
commit 88571219d9
No known key found for this signature in database
GPG key ID: 8170B4726D7198DE
4 changed files with 8 additions and 35 deletions
Download patch file Download diff file Expand all files Collapse all files

3
src/libstore/store-api.hh
View file

@ -766,8 +766,7 @@ StoreType getStoreType(const std::string & uri = settings.storeUri.get(),
const std::string & stateDir = settings.nixStateDir);
/* Return the default substituter stores, defined by the
‘substituters’ option and various legacy options like
‘binary-caches’. */
‘substituters’ option and various legacy options. */
std::list<ref<Store>> getDefaultSubstituters();

9
src/nix-channel/nix-channel.cc
View file

@ -113,15 +113,6 @@ static void update(const StringSet & channelNames)
}
if (!unpacked) {
// The URL doesn't unpack directly, so let's try treating it like a full channel folder with files in it
// Check if the channel advertises a binary cache.
DownloadRequest request(url + "/binary-cache-url");
try {
auto dlRes = dl->download(request);
extraAttrs = "binaryCacheURL = \"" + *dlRes.data + "\";";
} catch (DownloadError & e) {
}
// Download the channel tarball.
try {
filename = dl->downloadCached(store, CachedDownloadRequest(url + "/nixexprs.tar.xz")).path;