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

26
third_party/nix/src/nix-store/nix-store.cc vendored
View file

@ -155,8 +155,8 @@ static void opRealise(Strings opFlags, Strings opArgs) {
store->followLinksToStorePath(p.first), p.second));
}
unsigned long long downloadSize = 0;
unsigned long long narSize = 0;
unsigned long long downloadSize;
unsigned long long narSize;
PathSet willBuild;
PathSet willSubstitute;
PathSet unknown;
@ -962,9 +962,9 @@ static void opServe(Strings opFlags, Strings opArgs) {
};
while (true) {
ServeCommand cmd{};
ServeCommand cmd;
try {
cmd = static_cast<ServeCommand>(readInt(in));
cmd = (ServeCommand)readInt(in);
} catch (EndOfFile& e) {
break;
}
@ -991,8 +991,8 @@ static void opServe(Strings opFlags, Strings opArgs) {
paths2.insert(path);
}
}
unsigned long long downloadSize = 0;
unsigned long long narSize = 0;
unsigned long long downloadSize;
unsigned long long narSize;
PathSet willBuild;
PathSet willSubstitute;
PathSet unknown;
@ -1174,15 +1174,13 @@ static void opGenerateBinaryCacheKey(Strings opFlags, Strings opArgs) {
throw Error("key generation failed");
}
writeFile(publicKeyFile,
keyName + ":" +
absl::Base64Escape(std::string(reinterpret_cast<char*>(pk),
crypto_sign_PUBLICKEYBYTES)));
writeFile(publicKeyFile, keyName + ":" +
absl::Base64Escape(std::string(
(char*)pk, crypto_sign_PUBLICKEYBYTES)));
umask(0077);
writeFile(secretKeyFile,
keyName + ":" +
absl::Base64Escape(std::string(reinterpret_cast<char*>(sk),
crypto_sign_SECRETKEYBYTES)));
writeFile(secretKeyFile, keyName + ":" +
absl::Base64Escape(std::string(
(char*)sk, crypto_sign_SECRETKEYBYTES)));
#else
throw Error(
"Nix was not compiled with libsodium, required for signed binary cache "