mdebray/tvl-depot
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

<nix/fetchurl.nix>: Use tarballs.nixos.org

Browse source 
This ensures that the disappearance of upstream bootstrap tarballs
(e.g. https://github.com/NixOS/nixpkgs-channels/pull/1) doesn't break
stdenv rebuilds.
This commit is contained in:
Eelco Dolstra 2016-06-01 17:11:51 +02:00
parent dead8189ac
commit f2682e6e18
1 changed files with 32 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

35
src/libstore/builtins.cc
View file

@ -8,9 +8,13 @@ namespace nix {
void builtinFetchurl(const BasicDerivation & drv) void builtinFetchurl(const BasicDerivation & drv)
{ {
auto url = drv.env.find("url"); auto getAttr = [&](const string & name) {
if (url == drv.env.end()) throw Error("attribute ‘url’ missing"); auto i = drv.env.find(name);
if (i == drv.env.end()) throw Error(format("attribute ‘%s’ missing") % name);
return i->second;
};
auto fetch = [&](const string & url) {
/* No need to do TLS verification, because we check the hash of /* No need to do TLS verification, because we check the hash of
the result anyway. */ the result anyway. */
DownloadOptions options; DownloadOptions options;
@ -19,22 +23,33 @@ void builtinFetchurl(const BasicDerivation & drv)
/* Show a progress indicator, even though stderr is not a tty. */ /* Show a progress indicator, even though stderr is not a tty. */
options.showProgress = DownloadOptions::yes; options.showProgress = DownloadOptions::yes;
auto data = makeDownloader()->download(url->second, options); auto data = makeDownloader()->download(url, options);
assert(data.data); assert(data.data);
auto out = drv.env.find("out"); return data.data;
if (out == drv.env.end()) throw Error("attribute ‘out’ missing"); };
Path storePath = out->second; std::shared_ptr<std::string> data;
try {
if (getAttr("outputHashMode") == "flat")
data = fetch("http://tarballs.nixos.org/" + getAttr("outputHashAlgo") + "/" + getAttr("outputHash"));
} catch (Error & e) {
debug(e.what());
}
if (!data) data = fetch(getAttr("url"));
Path storePath = getAttr("out");
auto unpack = drv.env.find("unpack"); auto unpack = drv.env.find("unpack");
if (unpack != drv.env.end() && unpack->second == "1") { if (unpack != drv.env.end() && unpack->second == "1") {
if (string(*data.data, 0, 6) == string("\xfd" "7zXZ\0", 6)) if (string(*data, 0, 6) == string("\xfd" "7zXZ\0", 6))
data.data = decompress("xz", *data.data); data = decompress("xz", *data);
StringSource source(*data.data); StringSource source(*data);
restorePath(storePath, source); restorePath(storePath, source);
} else } else
writeFile(storePath, *data.data); writeFile(storePath, *data);
auto executable = drv.env.find("executable"); auto executable = drv.env.find("executable");
if (executable != drv.env.end() && executable->second == "1") { if (executable != drv.env.end() && executable->second == "1") {