yshui/lix
0
0
Fork 0
forked from lix-project/lix
Code Pull requests 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
Show stats Download patch file Download diff file Expand all files Collapse all files

8
corepkgs/unpack-channel.nix
View file

@ -18,21 +18,17 @@ let
if [ * != $channelName ]; then
mv * $out/$channelName
fi
if [ -n "$binaryCacheURL" ]; then
mkdir $out/binary-caches
echo -n "$binaryCacheURL" > $out/binary-caches/$channelName
fi
'';
in
{ name, channelName, src, binaryCacheURL ? "" }:
{ name, channelName, src }:
derivation {
system = builtins.currentSystem;
builder = shell;
args = [ "-e" builder ];
inherit name channelName src binaryCacheURL;
inherit name channelName src;
PATH = "${nixBinDir}:${coreutils}";

23
doc/manual/command-ref/nix-channel.xml
View file

@ -31,12 +31,11 @@
<refsection><title>Description</title>
<para>A Nix channel is a mechanism that allows you to automatically stay
up-to-date with a set of pre-built Nix expressions. A Nix channel is
just a URL that points to a place containing both a set of Nix
expressions and a pointer to a binary cache. <phrase
condition="manual">See also <xref linkend="sec-channels"
/>.</phrase></para>
<para>A Nix channel is a mechanism that allows you to automatically
stay up-to-date with a set of pre-built Nix expressions. A Nix
channel is just a URL that points to a place containing a set of Nix
expressions. <phrase condition="manual">See also <xref
linkend="sec-channels" />.</phrase></para>
<para>This command has the following operations:
@ -172,18 +171,6 @@ following files:</para>
</varlistentry>
<varlistentry><term><filename>binary-cache-url</filename></term>
<listitem><para>A file containing the URL to a binary cache (such
as <uri>https://cache.nixos.org</uri>). Nix will automatically
check this cache for pre-built binaries, if the user has
sufficient rights to add binary caches. For instance, in a
multi-user Nix setup, the binary caches provided by the channels
of the root user are used automatically, but caches corresponding
to the channels of non-root users are ignored.</para></listitem>
</varlistentry>
</variablelist>
</refsection>

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;