about summary refs log tree commit diff
path: root/src
diff options
context:
space:
mode:
authorEelco Dolstra <edolstra@gmail.com>2019-06-25T11·27+0200
committerEelco Dolstra <edolstra@gmail.com>2019-06-25T11·27+0200
commit88571219d97f2bdfdbafcff25ef6ee424b0b008f (patch)
tree76030dc84fb2ac15d0fbc28fb7f6198a240c8d57 /src
parent09dde33c19129b949a064d35e248a3e318178b08 (diff)
nix-channel: Don't fetch binary-cache-url
This has been ignored since the Perl->C++ rewrite.
Diffstat (limited to 'src')
-rw-r--r--src/libstore/store-api.hh3
-rwxr-xr-xsrc/nix-channel/nix-channel.cc9
2 files changed, 1 insertions, 11 deletions
diff --git a/src/libstore/store-api.hh b/src/libstore/store-api.hh
index 7a1b31d0ff59..59967737670d 100644
--- a/src/libstore/store-api.hh
+++ b/src/libstore/store-api.hh
@@ -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();
 
 
diff --git a/src/nix-channel/nix-channel.cc b/src/nix-channel/nix-channel.cc
index bd1371dbae3c..06eb3d23ba83 100755
--- a/src/nix-channel/nix-channel.cc
+++ b/src/nix-channel/nix-channel.cc
@@ -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;