maurice/snix
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix(3p/nix): revert "apply all clang-tidy fixes"

Browse source 
This reverts commit ef54f5da9f.

Resolved conflicts:
	third_party/nix/src/libexpr/eval.cc
	third_party/nix/src/libstore/builtins/fetchurl.cc
	third_party/nix/src/libstore/references.cc
	third_party/nix/src/libutil/hash.cc
	third_party/nix/src/nix-daemon/nix-daemon.cc

Change-Id: Ib9cf6e96a79a23bde3983579ced3f92e530cb011
Reviewed-on: https://cl.tvl.fyi/c/depot/+/1547
Reviewed-by: glittershark <grfn@gws.fyi>
Tested-by: BuildkiteCI
This commit is contained in:
Kane York 2020-08-01 15:32:00 -07:00 • committed by kanepyork
parent cc3c45f739
commit 72fc2fd27e
64 changed files with 479 additions and 555 deletions
Download patch file Download diff file Expand all files Collapse all files

8
third_party/nix/src/nix-prefetch-url/nix-prefetch-url.cc vendored
View file

@ -33,7 +33,7 @@ std::string resolveMirrorUri(EvalState& state, std::string uri) {
}
std::string mirrorName(s, 0, p);
Value vMirrors{};
Value vMirrors;
state.eval(
state.parseExprFromString(
"import <nixpkgs/pkgs/build-support/fetchurl/mirrors.nix>", "."),
@ -120,7 +120,7 @@ static int _main(int argc, char** argv) {
} else {
Path path =
resolveExprPath(lookupFileArg(*state, args.empty() ? "." : args[0]));
Value vRoot{};
Value vRoot;
state->evalFile(path, vRoot);
Value& v(*findAlongAttrPath(*state, attrPath, autoArgs, vRoot));
state->forceAttrs(v);
@ -181,7 +181,7 @@ static int _main(int argc, char** argv) {
auto actualUri = resolveMirrorUri(*state, uri);
AutoDelete tmpDir(createTempDir(), true);
Path tmpFile = Path(tmpDir) + "/tmp";
Path tmpFile = (Path)tmpDir + "/tmp";
/* Download the file. */
{
@ -201,7 +201,7 @@ static int _main(int argc, char** argv) {
/* Optionally unpack the file. */
if (unpack) {
LOG(INFO) << "unpacking...";
Path unpacked = Path(tmpDir) + "/unpacked";
Path unpacked = (Path)tmpDir + "/unpacked";
createDirs(unpacked);
if (absl::EndsWith(baseNameOf(uri), ".zip")) {
runProgram("unzip", true, {"-qq", tmpFile, "-d", unpacked});