diff options
author | Kane York <kanepyork@gmail.com> | 2020-08-01T22·32-0700 |
---|---|---|
committer | kanepyork <rikingcoding@gmail.com> | 2020-08-01T22·45+0000 |
commit | 72fc2fd27e8ca9ddd6dad7f1c8f508e115aa2b60 (patch) | |
tree | eacd58ae5e0de9ffaadc265b8fd417f2f62d0433 /third_party/nix/src/nix-env/user-env.cc | |
parent | cc3c45f739133162c840d500c0d633f46a524e06 (diff) |
fix(3p/nix): revert "apply all clang-tidy fixes" r/1534
This reverts commit ef54f5da9fa30b5c302f2a49595ee5d041f9706a. 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
Diffstat (limited to 'third_party/nix/src/nix-env/user-env.cc')
-rw-r--r-- | third_party/nix/src/nix-env/user-env.cc | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/third_party/nix/src/nix-env/user-env.cc b/third_party/nix/src/nix-env/user-env.cc index 93dcde96993a..06329e74f340 100644 --- a/third_party/nix/src/nix-env/user-env.cc +++ b/third_party/nix/src/nix-env/user-env.cc @@ -17,7 +17,7 @@ DrvInfos queryInstalled(EvalState& state, const Path& userEnv) { DrvInfos elems; Path manifestFile = userEnv + "/manifest.nix"; if (pathExists(manifestFile)) { - Value v{}; + Value v; state.evalFile(manifestFile, v); Bindings& bindings(*Bindings::NewGC()); getDerivations(state, v, "", bindings, elems, false); @@ -42,7 +42,7 @@ bool createUserEnv(EvalState& state, DrvInfos& elems, const Path& profile, /* Construct the whole top level derivation. */ PathSet references; - Value manifest{}; + Value manifest; state.mkList(manifest, elems.size()); unsigned int n = 0; for (auto& i : elems) { @@ -109,13 +109,13 @@ bool createUserEnv(EvalState& state, DrvInfos& elems, const Path& profile, "env-manifest.nix", (format("%1%") % manifest).str(), references); /* Get the environment builder expression. */ - Value envBuilder{}; + Value envBuilder; state.evalFile(state.findFile("nix/buildenv.nix"), envBuilder); /* Construct a Nix expression that calls the user environment builder with the manifest as argument. */ - Value args{}; - Value topLevel{}; + Value args; + Value topLevel; state.mkAttrs(args, 3); mkString(*state.allocAttr(args, state.symbols.Create("manifest")), manifestFile, {manifestFile}); |