style(3p/nix): Reformat all includes to match new style

third_party/nix/src/libstore/binary-cache-store.cc

@@ -1,6 +1,8 @@
 #include "binary-cache-store.hh"
+
 #include <chrono>
 #include <future>
+
 #include "archive.hh"
 #include "compression.hh"
 #include "derivations.hh"

third_party/nix/src/libstore/binary-cache-store.hh

@@ -1,6 +1,7 @@
 #pragma once
 
 #include <atomic>
+
 #include "crypto.hh"
 #include "pool.hh"
 #include "store-api.hh"

third_party/nix/src/libstore/build.cc

@@ -1,3 +1,14 @@
+#include <algorithm>
+#include <chrono>
+#include <cstring>
+#include <future>
+#include <iostream>
+#include <map>
+#include <queue>
+#include <regex>
+#include <sstream>
+#include <thread>
+
 #include <errno.h>
 #include <fcntl.h>
 #include <grp.h>
@@ -14,16 +25,7 @@
 #include <sys/wait.h>
 #include <termios.h>
 #include <unistd.h>
-#include <algorithm>
-#include <chrono>
-#include <cstring>
-#include <future>
-#include <iostream>
-#include <map>
-#include <queue>
-#include <regex>
-#include <sstream>
-#include <thread>
+
 #include "affinity.hh"
 #include "archive.hh"
 #include "builtins.hh"

third_party/nix/src/libstore/builtins/buildenv.cc

@@ -1,8 +1,10 @@
+#include <algorithm>
+
 #include <fcntl.h>
 #include <glog/logging.h>
 #include <sys/stat.h>
 #include <sys/types.h>
-#include <algorithm>
+
 #include "builtins.hh"
 
 namespace nix {

third_party/nix/src/libstore/builtins/fetchurl.cc

@@ -1,4 +1,5 @@
 #include <glog/logging.h>
+
 #include "archive.hh"
 #include "builtins.hh"
 #include "compression.hh"

third_party/nix/src/libstore/crypto.cc

@@ -1,4 +1,5 @@
 #include "crypto.hh"
+
 #include "globals.hh"
 #include "util.hh"
 

third_party/nix/src/libstore/crypto.hh

@@ -1,6 +1,7 @@
 #pragma once
 
 #include <map>
+
 #include "types.hh"
 
 namespace nix {

third_party/nix/src/libstore/derivations.cc

@@ -1,4 +1,5 @@
 #include "derivations.hh"
+
 #include "fs-accessor.hh"
 #include "globals.hh"
 #include "istringstream_nocopy.hh"

third_party/nix/src/libstore/derivations.hh

@@ -1,6 +1,7 @@
 #pragma once
 
 #include <map>
+
 #include "hash.hh"
 #include "store-api.hh"
 #include "types.hh"

third_party/nix/src/libstore/download.cc

@@ -1,4 +1,5 @@
 #include "download.hh"
+
 #include "archive.hh"
 #include "compression.hh"
 #include "finally.hh"
@@ -13,10 +14,6 @@
 #include <aws/core/client/ClientConfiguration.h>
 #endif
 
-#include <curl/curl.h>
-#include <fcntl.h>
-#include <glog/logging.h>
-#include <unistd.h>
 #include <algorithm>
 #include <cmath>
 #include <cstring>
@@ -25,6 +22,11 @@
 #include <random>
 #include <thread>
 
+#include <curl/curl.h>
+#include <fcntl.h>
+#include <glog/logging.h>
+#include <unistd.h>
+
 using namespace std::string_literals;
 
 namespace nix {

third_party/nix/src/libstore/download.hh

@@ -2,6 +2,7 @@
 
 #include <future>
 #include <string>
+
 #include "globals.hh"
 #include "hash.hh"
 #include "types.hh"

third_party/nix/src/libstore/export-import.cc

@@ -1,4 +1,5 @@
 #include <algorithm>
+
 #include "archive.hh"
 #include "store-api.hh"
 #include "worker-protocol.hh"

third_party/nix/src/libstore/gc.cc

@@ -1,15 +1,17 @@
-#include <errno.h>
-#include <fcntl.h>
-#include <sys/stat.h>
-#include <sys/statvfs.h>
-#include <sys/types.h>
-#include <unistd.h>
 #include <algorithm>
 #include <climits>
 #include <functional>
 #include <queue>
 #include <random>
 #include <regex>
+
+#include <errno.h>
+#include <fcntl.h>
+#include <sys/stat.h>
+#include <sys/statvfs.h>
+#include <sys/types.h>
+#include <unistd.h>
+
 #include "derivations.hh"
 #include "finally.hh"
 #include "globals.hh"

third_party/nix/src/libstore/globals.cc

@@ -1,8 +1,11 @@
 #include "globals.hh"
-#include <dlfcn.h>
+
 #include <algorithm>
 #include <map>
 #include <thread>
+
+#include <dlfcn.h>
+
 #include "archive.hh"
 #include "args.hh"
 #include "util.hh"

third_party/nix/src/libstore/globals.hh

@@ -1,8 +1,10 @@
 #pragma once
 
-#include <sys/types.h>
 #include <limits>
 #include <map>
+
+#include <sys/types.h>
+
 #include "config.hh"
 #include "types.hh"
 #include "util.hh"

third_party/nix/src/libstore/http-binary-cache-store.cc

@@ -1,4 +1,5 @@
 #include <glog/logging.h>
+
 #include "binary-cache-store.hh"
 #include "download.hh"
 #include "globals.hh"

third_party/nix/src/libstore/local-store.cc

@@ -1,4 +1,9 @@
 #include "local-store.hh"
+
+#include <algorithm>
+#include <cstring>
+#include <iostream>
+
 #include <errno.h>
 #include <fcntl.h>
 #include <glog/logging.h>
@@ -11,9 +16,7 @@
 #include <time.h>
 #include <unistd.h>
 #include <utime.h>
-#include <algorithm>
-#include <cstring>
-#include <iostream>
+
 #include "archive.hh"
 #include "derivations.hh"
 #include "globals.hh"

third_party/nix/src/libstore/local-store.hh

@@ -4,6 +4,7 @@
 #include <future>
 #include <string>
 #include <unordered_set>
+
 #include "pathlocks.hh"
 #include "sqlite.hh"
 #include "store-api.hh"

third_party/nix/src/libstore/machines.cc

@@ -1,6 +1,9 @@
 #include "machines.hh"
-#include <glog/logging.h>
+
 #include <algorithm>
+
+#include <glog/logging.h>
+
 #include "globals.hh"
 #include "util.hh"
 

third_party/nix/src/libstore/misc.cc

@@ -1,4 +1,5 @@
 #include <glog/logging.h>
+
 #include "derivations.hh"
 #include "globals.hh"
 #include "local-store.hh"

third_party/nix/src/libstore/nar-accessor.cc

@@ -1,8 +1,10 @@
 #include "nar-accessor.hh"
+
 #include <algorithm>
 #include <map>
 #include <nlohmann/json.hpp>
 #include <stack>
+
 #include "archive.hh"
 #include "json.hh"
 

third_party/nix/src/libstore/nar-accessor.hh

@@ -1,6 +1,7 @@
 #pragma once
 
 #include <functional>
+
 #include "fs-accessor.hh"
 
 namespace nix {

third_party/nix/src/libstore/nar-info-disk-cache.cc

@@ -1,6 +1,8 @@
 #include "nar-info-disk-cache.hh"
+
 #include <glog/logging.h>
 #include <sqlite3.h>
+
 #include "globals.hh"
 #include "sqlite.hh"
 #include "sync.hh"

third_party/nix/src/libstore/nar-info.cc

@@ -1,4 +1,5 @@
 #include "nar-info.hh"
+
 #include "globals.hh"
 
 namespace nix {

third_party/nix/src/libstore/optimise-store.cc

@@ -1,11 +1,13 @@
+#include <cstdlib>
+#include <cstring>
+#include <regex>
+
 #include <errno.h>
 #include <stdio.h>
 #include <sys/stat.h>
 #include <sys/types.h>
 #include <unistd.h>
-#include <cstdlib>
-#include <cstring>
-#include <regex>
+
 #include "globals.hh"
 #include "glog/logging.h"
 #include "local-store.hh"

third_party/nix/src/libstore/parsed-derivations.hh

@@ -1,4 +1,5 @@
 #include <nlohmann/json.hpp>
+
 #include "derivations.hh"
 
 namespace nix {

third_party/nix/src/libstore/pathlocks.cc

@@ -1,11 +1,14 @@
 #include "pathlocks.hh"
+
+#include <cerrno>
+#include <cstdlib>
+
 #include <fcntl.h>
 #include <glog/logging.h>
 #include <sys/file.h>
 #include <sys/stat.h>
 #include <sys/types.h>
-#include <cerrno>
-#include <cstdlib>
+
 #include "sync.hh"
 #include "util.hh"
 

third_party/nix/src/libstore/profiles.cc

@@ -1,10 +1,12 @@
 #include "profiles.hh"
+
 #include <errno.h>
 #include <glog/logging.h>
 #include <stdio.h>
 #include <sys/stat.h>
 #include <sys/types.h>
 #include <unistd.h>
+
 #include "store-api.hh"
 #include "util.hh"
 

third_party/nix/src/libstore/profiles.hh

@@ -1,6 +1,7 @@
 #pragma once
 
 #include <time.h>
+
 #include "pathlocks.hh"
 #include "types.hh"
 

third_party/nix/src/libstore/references.cc

@@ -1,7 +1,10 @@
 #include "references.hh"
-#include <glog/logging.h>
+
 #include <cstdlib>
 #include <map>
+
+#include <glog/logging.h>
+
 #include "archive.hh"
 #include "hash.hh"
 #include "util.hh"

third_party/nix/src/libstore/remote-fs-accessor.cc

@@ -1,7 +1,9 @@
 #include "remote-fs-accessor.hh"
+
 #include <fcntl.h>
 #include <sys/stat.h>
 #include <sys/types.h>
+
 #include "json.hh"
 #include "nar-accessor.hh"
 

third_party/nix/src/libstore/remote-store.cc

@@ -1,4 +1,7 @@
 #include "remote-store.hh"
+
+#include <cstring>
+
 #include <errno.h>
 #include <fcntl.h>
 #include <glog/logging.h>
@@ -7,7 +10,7 @@
 #include <sys/types.h>
 #include <sys/un.h>
 #include <unistd.h>
-#include <cstring>
+
 #include "affinity.hh"
 #include "archive.hh"
 #include "derivations.hh"

third_party/nix/src/libstore/remote-store.hh

@@ -2,6 +2,7 @@
 
 #include <limits>
 #include <string>
+
 #include "store-api.hh"
 
 namespace nix {

third_party/nix/src/libstore/s3-binary-cache-store.cc

@@ -1,6 +1,7 @@
 #if ENABLE_S3
 
 #include "s3-binary-cache-store.hh"
+
 #include <aws/core/Aws.h>
 #include <aws/core/VersionConfig.h>
 #include <aws/core/auth/AWSCredentialsProvider.h>
@@ -16,6 +17,7 @@
 #include <aws/s3/model/ListObjectsRequest.h>
 #include <aws/s3/model/PutObjectRequest.h>
 #include <aws/transfer/TransferManager.h>
+
 #include "compression.hh"
 #include "download.hh"
 #include "globals.hh"

third_party/nix/src/libstore/s3-binary-cache-store.hh

@@ -1,6 +1,7 @@
 #pragma once
 
 #include <atomic>
+
 #include "binary-cache-store.hh"
 
 namespace nix {

third_party/nix/src/libstore/sqlite.cc

@@ -1,7 +1,10 @@
 #include "sqlite.hh"
+
+#include <atomic>
+
 #include <glog/logging.h>
 #include <sqlite3.h>
-#include <atomic>
+
 #include "util.hh"
 
 namespace nix {

third_party/nix/src/libstore/sqlite.hh

@@ -2,6 +2,7 @@
 
 #include <functional>
 #include <string>
+
 #include "types.hh"
 
 class sqlite3;

third_party/nix/src/libstore/store-api.cc

@@ -1,6 +1,9 @@
 #include "store-api.hh"
-#include <glog/logging.h>
+
 #include <future>
+
+#include <glog/logging.h>
+
 #include "crypto.hh"
 #include "derivations.hh"
 #include "globals.hh"

third_party/nix/src/libstore/store-api.hh

@@ -7,6 +7,7 @@
 #include <string>
 #include <unordered_map>
 #include <unordered_set>
+
 #include "config.hh"
 #include "crypto.hh"
 #include "globals.hh"