2 files changed, 5 insertions, 5 deletions
diff --git a/third_party/nix/src/libexpr/eval.hh b/third_party/nix/src/libexpr/eval.hh
index aa7af777a1..f36d11b92b 100644
--- a/third_party/nix/src/libexpr/eval.hh
+++ b/third_party/nix/src/libexpr/eval.hh
@@ -54,7 +54,7 @@ void copyContext(const Value& v, PathSet& context);
 
 /* Cache for calls to addToStore(); maps source paths to the store
    paths. */
-typedef std::map<Path, Path> SrcToStore;
+using SrcToStore = std::map<Path, Path>;
 
 std::ostream& operator<<(std::ostream& str, const Value& v);
 
@@ -298,15 +298,15 @@ class EvalState {
   std::function<void(const Path&)> file_access_trace_fn = nullptr;
   Path last_traced_file = "";
 
-  typedef std::map<Symbol, size_t> PrimOpCalls;
+  using PrimOpCalls = std::map<Symbol, size_t>;
   PrimOpCalls primOpCalls;
 
-  typedef std::map<ExprLambda*, size_t> FunctionCalls;
+  using FunctionCalls = std::map<ExprLambda*, size_t>;
   FunctionCalls functionCalls;
 
   void incrFunctionCall(ExprLambda* fun);
 
-  typedef std::map<Pos, size_t> AttrSelects;
+  using AttrSelects = std::map<Pos, size_t>;
   AttrSelects attrSelects;
 
   friend struct ExprOpUpdate;
diff --git a/third_party/nix/src/libexpr/get-drvs.hh b/third_party/nix/src/libexpr/get-drvs.hh
index b17efe8b33..3de266d0c0 100644
--- a/third_party/nix/src/libexpr/get-drvs.hh
+++ b/third_party/nix/src/libexpr/get-drvs.hh
@@ -69,7 +69,7 @@ struct DrvInfo {
   bool hasFailed() { return failed; };
 };
 
-typedef std::list<DrvInfo> DrvInfos;
+using DrvInfos = std::list<DrvInfo>;
 
 /* If value `v' denotes a derivation, return a DrvInfo object
    describing it. Otherwise return nothing. */