16 files changed, 28 insertions, 7 deletions
diff --git a/third_party/nix/src/nix/command.cc b/third_party/nix/src/nix/command.cc
index 5565e49f56f2..cf109c441612 100644
--- a/third_party/nix/src/nix/command.cc
+++ b/third_party/nix/src/nix/command.cc
@@ -1,4 +1,5 @@
 #include "command.hh"
+
 #include "derivations.hh"
 #include "store-api.hh"
 
diff --git a/third_party/nix/src/nix/copy.cc b/third_party/nix/src/nix/copy.cc
index 030a13a3d019..fe5e37363c30 100644
--- a/third_party/nix/src/nix/copy.cc
+++ b/third_party/nix/src/nix/copy.cc
@@ -1,4 +1,5 @@
 #include <atomic>
+
 #include "command.hh"
 #include "shared.hh"
 #include "store-api.hh"
diff --git a/third_party/nix/src/nix/edit.cc b/third_party/nix/src/nix/edit.cc
index 631cae60ebc7..61d700592b76 100644
--- a/third_party/nix/src/nix/edit.cc
+++ b/third_party/nix/src/nix/edit.cc
@@ -1,5 +1,6 @@
 #include <glog/logging.h>
 #include <unistd.h>
+
 #include "attr-path.hh"
 #include "command.hh"
 #include "eval.hh"
diff --git a/third_party/nix/src/nix/eval.cc b/third_party/nix/src/nix/eval.cc
index 9da265a641bd..d84b86bc531e 100644
--- a/third_party/nix/src/nix/eval.cc
+++ b/third_party/nix/src/nix/eval.cc
@@ -1,4 +1,5 @@
 #include "eval.hh"
+
 #include "command.hh"
 #include "common-args.hh"
 #include "json.hh"
diff --git a/third_party/nix/src/nix/hash.cc b/third_party/nix/src/nix/hash.cc
index 11fefb7939f1..e3278ea77a59 100644
--- a/third_party/nix/src/nix/hash.cc
+++ b/third_party/nix/src/nix/hash.cc
@@ -1,4 +1,5 @@
 #include "hash.hh"
+
 #include "command.hh"
 #include "legacy.hh"
 #include "shared.hh"
diff --git a/third_party/nix/src/nix/installables.cc b/third_party/nix/src/nix/installables.cc
index 8a2a5fd19d94..00cb71a231fa 100644
--- a/third_party/nix/src/nix/installables.cc
+++ b/third_party/nix/src/nix/installables.cc
@@ -1,4 +1,5 @@
 #include <regex>
+
 #include "attr-path.hh"
 #include "command.hh"
 #include "common-eval-args.hh"
diff --git a/third_party/nix/src/nix/log.cc b/third_party/nix/src/nix/log.cc
index 3dab7746dd99..0a10924cad7b 100644
--- a/third_party/nix/src/nix/log.cc
+++ b/third_party/nix/src/nix/log.cc
@@ -1,4 +1,5 @@
 #include <glog/logging.h>
+
 #include "command.hh"
 #include "common-args.hh"
 #include "shared.hh"
diff --git a/third_party/nix/src/nix/main.cc b/third_party/nix/src/nix/main.cc
index cc4b8aef8411..6e4db63cce0a 100644
--- a/third_party/nix/src/nix/main.cc
+++ b/third_party/nix/src/nix/main.cc
@@ -1,9 +1,11 @@
+#include <algorithm>
+
 #include <ifaddrs.h>
 #include <netdb.h>
 #include <netinet/in.h>
 #include <sys/socket.h>
 #include <sys/types.h>
-#include <algorithm>
+
 #include "command.hh"
 #include "common-args.hh"
 #include "download.hh"
diff --git a/third_party/nix/src/nix/optimise-store.cc b/third_party/nix/src/nix/optimise-store.cc
index 49871df680bc..7814a1bcabf0 100644
--- a/third_party/nix/src/nix/optimise-store.cc
+++ b/third_party/nix/src/nix/optimise-store.cc
@@ -1,4 +1,5 @@
 #include <atomic>
+
 #include "command.hh"
 #include "shared.hh"
 #include "store-api.hh"
diff --git a/third_party/nix/src/nix/path-info.cc b/third_party/nix/src/nix/path-info.cc
index bd12be5c2311..31f2897a81c8 100644
--- a/third_party/nix/src/nix/path-info.cc
+++ b/third_party/nix/src/nix/path-info.cc
@@ -1,5 +1,6 @@
 #include <algorithm>
 #include <array>
+
 #include "command.hh"
 #include "common-args.hh"
 #include "json.hh"
diff --git a/third_party/nix/src/nix/repl.cc b/third_party/nix/src/nix/repl.cc
index c47338073444..27bb77071f73 100644
--- a/third_party/nix/src/nix/repl.cc
+++ b/third_party/nix/src/nix/repl.cc
@@ -1,10 +1,11 @@
-#include <glog/logging.h>
-#include <setjmp.h>
 #include <climits>
 #include <cstdlib>
 #include <cstring>
 #include <iostream>
 
+#include <glog/logging.h>
+#include <setjmp.h>
+
 #ifdef READLINE
 #include <readline/history.h>
 #include <readline/readline.h>
diff --git a/third_party/nix/src/nix/search.cc b/third_party/nix/src/nix/search.cc
index 90aea17a6e39..b7cb586b0f4d 100644
--- a/third_party/nix/src/nix/search.cc
+++ b/third_party/nix/src/nix/search.cc
@@ -1,6 +1,8 @@
-#include <glog/logging.h>
 #include <fstream>
 #include <regex>
+
+#include <glog/logging.h>
+
 #include "command.hh"
 #include "common-args.hh"
 #include "eval-inline.hh"
diff --git a/third_party/nix/src/nix/sigs.cc b/third_party/nix/src/nix/sigs.cc
index 78ac8612e778..cc9d579909e2 100644
--- a/third_party/nix/src/nix/sigs.cc
+++ b/third_party/nix/src/nix/sigs.cc
@@ -1,5 +1,7 @@
-#include <glog/logging.h>
 #include <atomic>
+
+#include <glog/logging.h>
+
 #include "command.hh"
 #include "shared.hh"
 #include "store-api.hh"
diff --git a/third_party/nix/src/nix/upgrade-nix.cc b/third_party/nix/src/nix/upgrade-nix.cc
index 96ce2305db60..49f8db3b5b5f 100644
--- a/third_party/nix/src/nix/upgrade-nix.cc
+++ b/third_party/nix/src/nix/upgrade-nix.cc
@@ -1,4 +1,5 @@
 #include <glog/logging.h>
+
 #include "attr-path.hh"
 #include "command.hh"
 #include "common-args.hh"
diff --git a/third_party/nix/src/nix/verify.cc b/third_party/nix/src/nix/verify.cc
index 73c3649b1470..67128d866858 100644
--- a/third_party/nix/src/nix/verify.cc
+++ b/third_party/nix/src/nix/verify.cc
@@ -1,5 +1,7 @@
-#include <glog/logging.h>
 #include <atomic>
+
+#include <glog/logging.h>
+
 #include "command.hh"
 #include "shared.hh"
 #include "store-api.hh"
diff --git a/third_party/nix/src/nix/why-depends.cc b/third_party/nix/src/nix/why-depends.cc
index e169d1c5085a..88e1e357f4b4 100644
--- a/third_party/nix/src/nix/why-depends.cc
+++ b/third_party/nix/src/nix/why-depends.cc
@@ -1,5 +1,7 @@
-#include <glog/logging.h>
 #include <queue>
+
+#include <glog/logging.h>
+
 #include "command.hh"
 #include "fs-accessor.hh"
 #include "shared.hh"