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

6
third_party/nix/src/nix-channel/nix-channel.cc vendored
View file

@ -112,7 +112,7 @@ static void update(const StringSet& channelNames) {
std::smatch match;
auto urlBase = baseNameOf(url);
if (std::regex_search(urlBase, match, std::regex("(-\\d.*)$"))) {
cname = cname + std::string(match[1]);
cname = cname + (std::string)match[1];
}
std::string extraAttrs;
@ -163,7 +163,7 @@ static void update(const StringSet& channelNames) {
runProgram(settings.nixBinDir + "/nix-env", false, envArgs);
// Make the channels appear in nix-env.
struct stat st {};
struct stat st;
if (lstat(nixDefExpr.c_str(), &st) == 0) {
if (S_ISLNK(st.st_mode)) {
// old-skool ~/.nix-defexpr
@ -193,7 +193,7 @@ static int _main(int argc, char** argv) {
enum { cNone, cAdd, cRemove, cList, cUpdate, cRollback } cmd = cNone;
std::vector<std::string> args;
parseCmdLine(argc, argv,
[&](Strings::iterator& arg, const Strings::iterator& _end) {
[&](Strings::iterator& arg, const Strings::iterator& end) {
if (*arg == "--help") {
showManPage("nix-channel");
} else if (*arg == "--version") {