A bunch of small fixes

obsidiansystems · Jul 18, 2024 · de1ec5a · de1ec5a
1 parent 307440b
commit de1ec5a
Show file tree

Hide file tree

Showing 29 changed files with 38 additions and 53 deletions.
diff --git a/src/build-remote/build-remote.cc b/src/build-remote/build-remote.cc
@@ -16,7 +16,7 @@
 #include "globals.hh"
 #include "serialise.hh"
 #include "build-result.hh"
-#include "store-api.hh"
+#include "store-open.hh"
 #include "strings.hh"
 #include "derivations.hh"
 #include "local-store.hh"

diff --git a/src/libcmd/command.cc b/src/libcmd/command.cc
@@ -2,7 +2,7 @@
 
 #include "command.hh"
 #include "markdown.hh"
-#include "store-api.hh"
+#include "store-open.hh"
 #include "local-fs-store.hh"
 #include "derivations.hh"
 #include "nixexpr.hh"

diff --git a/src/libexpr/primops/fetchClosure.cc b/src/libexpr/primops/fetchClosure.cc
@@ -1,5 +1,5 @@
 #include "primops.hh"
-#include "store-api.hh"
+#include "store-open.hh"
 #include "realisation.hh"
 #include "make-content-addressed.hh"
 #include "url.hh"

diff --git a/src/libstore-c/nix_api_store.cc b/src/libstore-c/nix_api_store.cc
@@ -43,7 +43,7 @@ Store * nix_store_open(nix_c_context * context, const char * uri, const char ***
         if (!params)
             return new Store{nix::openStore(uri_str)};
 
-        nix::Store::Params params_map;
+        nix::StoreReference::Params params_map;
         for (size_t i = 0; params[i] != nullptr; i++) {
             params_map[params[i][0]] = params[i][1];
         }

diff --git a/src/libstore/build/drv-output-substitution-goal.cc b/src/libstore/build/drv-output-substitution-goal.cc
@@ -3,6 +3,7 @@
 #include "worker.hh"
 #include "substitution-goal.hh"
 #include "callback.hh"
+#include "store-open.hh"
 
 namespace nix {
 

diff --git a/src/libstore/profiles.hh b/src/libstore/profiles.hh
@@ -84,7 +84,7 @@ typedef std::list<Generation> Generations;
  */
 std::pair<Generations, std::optional<GenerationNumber>> findGenerations(Path profile);
 
-class LocalFSStore;
+struct LocalFSStore;
 
 /**
  * Create a new generation of the given profile

diff --git a/src/libstore/remote-store.hh b/src/libstore/remote-store.hh
@@ -35,14 +35,15 @@ struct RemoteStoreConfig : virtual StoreConfig
  * \todo RemoteStore is a misnomer - should be something like
  * DaemonStore.
  */
-class RemoteStore : public virtual RemoteStoreConfig,
+struct RemoteStore :
+    public virtual RemoteStoreConfig,
     public virtual Store,
     public virtual GcStore,
     public virtual LogStore
 {
-public:
+    using Config = RemoteStoreConfig;
 
-    RemoteStore(const Params & params);
+    RemoteStore(const Config & config);
 
     /* Implementations of abstract store API methods. */
 

diff --git a/src/libstore/store-reference.cc b/src/libstore/store-reference.cc
@@ -1,5 +1,7 @@
 #include <regex>
 
+#include <nlohmann/json.hpp>
+
 #include "error.hh"
 #include "url.hh"
 #include "store-reference.hh"

diff --git a/src/libutil/config-abstract.hh b/src/libutil/config-abstract.hh
@@ -23,7 +23,7 @@ struct JustValue
 };
 
 template<typename T>
-auto && operator <<(auto && str, const JustValue<T> & opt)
+auto && operator<<(auto && str, const JustValue<T> & opt)
 {
     return str << opt.get();
 }

diff --git a/src/nix-build/nix-build.cc b/src/nix-build/nix-build.cc
@@ -11,7 +11,7 @@
 
 #include "current-process.hh"
 #include "parsed-derivations.hh"
-#include "store-api.hh"
+#include "store-open.hh"
 #include "local-fs-store.hh"
 #include "globals.hh"
 #include "realisation.hh"

diff --git a/src/nix-channel/nix-channel.cc b/src/nix-channel/nix-channel.cc
@@ -2,7 +2,6 @@
 #include "shared.hh"
 #include "globals.hh"
 #include "filetransfer.hh"
-#include "store-api.hh"
 #include "store-open.hh"
 #include "legacy.hh"
 #include "eval-settings.hh" // for defexpr

diff --git a/src/nix-collect-garbage/nix-collect-garbage.cc b/src/nix-collect-garbage/nix-collect-garbage.cc
@@ -1,6 +1,6 @@
 #include "file-system.hh"
 #include "signals.hh"
-#include "store-api.hh"
+#include "store-open.hh"
 #include "store-cast.hh"
 #include "gc-store.hh"
 #include "profiles.hh"

diff --git a/src/nix-copy-closure/nix-copy-closure.cc b/src/nix-copy-closure/nix-copy-closure.cc
@@ -1,6 +1,6 @@
 #include "shared.hh"
 #include "realisation.hh"
-#include "store-api.hh"
+#include "store-open.hh"
 #include "legacy.hh"
 
 using namespace nix;

diff --git a/src/nix-env/nix-env.cc b/src/nix-env/nix-env.cc
@@ -9,7 +9,7 @@
 #include "profiles.hh"
 #include "path-with-outputs.hh"
 #include "shared.hh"
-#include "store-api.hh"
+#include "store-open.hh"
 #include "local-fs-store.hh"
 #include "user-env.hh"
 #include "value-to-json.hh"

diff --git a/src/nix-instantiate/nix-instantiate.cc b/src/nix-instantiate/nix-instantiate.cc
@@ -8,7 +8,7 @@
 #include "signals.hh"
 #include "value-to-xml.hh"
 #include "value-to-json.hh"
-#include "store-api.hh"
+#include "store-open.hh"
 #include "local-fs-store.hh"
 #include "common-eval-args.hh"
 #include "legacy.hh"

diff --git a/src/nix-store/nix-store.cc b/src/nix-store/nix-store.cc
@@ -2,6 +2,7 @@
 #include "derivations.hh"
 #include "dotgraph.hh"
 #include "globals.hh"
+#include "store-open.hh"
 #include "store-cast.hh"
 #include "local-fs-store.hh"
 #include "log-store.hh"

diff --git a/src/nix/flake.cc b/src/nix/flake.cc
@@ -8,7 +8,7 @@
 #include "flake/flake.hh"
 #include "get-drvs.hh"
 #include "signals.hh"
-#include "store-api.hh"
+#include "store-open.hh"
 #include "derivations.hh"
 #include "outputs-spec.hh"
 #include "attr-path.hh"

diff --git a/src/nix/log.cc b/src/nix/log.cc
@@ -1,7 +1,7 @@
 #include "command.hh"
 #include "common-args.hh"
 #include "shared.hh"
-#include "store-api.hh"
+#include "store-open.hh"
 #include "log-store.hh"
 #include "progress-bar.hh"
 

diff --git a/src/nix/main.cc b/src/nix/main.cc
@@ -8,7 +8,8 @@
 #include "globals.hh"
 #include "legacy.hh"
 #include "shared.hh"
-#include "store-api.hh"
+#include "store-open.hh"
+#include "store-registration.hh"
 #include "filetransfer.hh"
 #include "finally.hh"
 #include "loggers.hh"

diff --git a/src/nix/make-content-addressed.cc b/src/nix/make-content-addressed.cc
@@ -1,5 +1,5 @@
 #include "command.hh"
-#include "store-api.hh"
+#include "store-open.hh"
 #include "make-content-addressed.hh"
 #include "common-args.hh"
 

diff --git a/src/nix/prefetch.cc b/src/nix/prefetch.cc
@@ -1,7 +1,7 @@
 #include "command.hh"
 #include "common-args.hh"
 #include "shared.hh"
-#include "store-api.hh"
+#include "store-open.hh"
 #include "filetransfer.hh"
 #include "finally.hh"
 #include "progress-bar.hh"

diff --git a/src/nix/repl.cc b/src/nix/repl.cc
@@ -1,6 +1,7 @@
 #include "eval.hh"
 #include "eval-settings.hh"
 #include "globals.hh"
+#include "store-open.hh"
 #include "command.hh"
 #include "installable-value.hh"
 #include "repl.hh"

diff --git a/src/nix/sigs.cc b/src/nix/sigs.cc
@@ -1,7 +1,7 @@
 #include "signals.hh"
 #include "command.hh"
 #include "shared.hh"
-#include "store-api.hh"
+#include "store-open.hh"
 #include "thread-pool.hh"
 #include "progress-bar.hh"
 

diff --git a/src/nix/unix/daemon.cc b/src/nix/unix/daemon.cc
@@ -7,6 +7,7 @@
 #include "local-store.hh"
 #include "remote-store.hh"
 #include "remote-store-connection.hh"
+#include "store-open.hh"
 #include "serialise.hh"
 #include "archive.hh"
 #include "globals.hh"
@@ -239,7 +240,7 @@ static PeerInfo getPeerInfo(int remote)
  */
 static ref<Store> openUncachedStore()
 {
-    Store::Params params; // FIXME: get params from somewhere
+    StoreReference::Params params; // FIXME: get params from somewhere
     // Disable caching since the client already does that.
     params["path-info-cache-size"] = "0";
     return openStore(settings.storeUri, params);

diff --git a/src/nix/verify.cc b/src/nix/verify.cc
@@ -1,6 +1,6 @@
 #include "command.hh"
 #include "shared.hh"
-#include "store-api.hh"
+#include "store-open.hh"
 #include "thread-pool.hh"
 #include "signals.hh"
 #include "keys.hh"

diff --git a/tests/unit/libstore/local-overlay-store.cc b/tests/unit/libstore/local-overlay-store.cc
@@ -1,9 +1,6 @@
-// FIXME: Odd failures for templates that are causing the PR to break
-// for now with discussion with @Ericson2314 to comment out.
-#if 0
-#  include <gtest/gtest.h>
+#include <gtest/gtest.h>
 
-#  include "local-overlay-store.hh"
+#include "local-overlay-store.hh"
 
 namespace nix {
 
@@ -31,4 +28,3 @@ TEST(LocalOverlayStore, constructConfig_rootPath)
 }
 
 } // namespace nix
-#endif
diff --git a/tests/unit/libstore/local-store.cc b/tests/unit/libstore/local-store.cc
@@ -1,15 +1,6 @@
-// FIXME: Odd failures for templates that are causing the PR to break
-// for now with discussion with @Ericson2314 to comment out.
-#if 0
-#  include <gtest/gtest.h>
+#include <gtest/gtest.h>
 
-#  include "local-store.hh"
-
-// Needed for template specialisations. This is not good! When we
-// overhaul how store configs work, this should be fixed.
-#  include "args.hh"
-#  include "config-impl.hh"
-#  include "abstract-setting-to-json.hh"
+#include "local-store.hh"
 
 namespace nix {
 
@@ -37,4 +28,3 @@ TEST(LocalStore, constructConfig_rootPath)
 }
 
 } // namespace nix
-#endif
diff --git a/tests/unit/libstore/ssh-store.cc b/tests/unit/libstore/ssh-store.cc
@@ -1,9 +1,6 @@
-// FIXME: Odd failures for templates that are causing the PR to break
-// for now with discussion with @Ericson2314 to comment out.
-#if 0
-#  include <gtest/gtest.h>
+#include <gtest/gtest.h>
 
-#  include "ssh-store.hh"
+#include "ssh-store.hh"
 
 namespace nix {
 
@@ -52,4 +49,3 @@ TEST(MountedSSHStore, constructConfig)
 }
 
 }
-#endif
diff --git a/tests/unit/libstore/uds-remote-store.cc b/tests/unit/libstore/uds-remote-store.cc
@@ -1,9 +1,6 @@
-// FIXME: Odd failures for templates that are causing the PR to break
-// for now with discussion with @Ericson2314 to comment out.
-#if 0
-#  include <gtest/gtest.h>
+#include <gtest/gtest.h>
 
-#  include "uds-remote-store.hh"
+#include "uds-remote-store.hh"
 
 namespace nix {
 
@@ -20,4 +17,3 @@ TEST(UDSRemoteStore, constructConfigWrongScheme)
 }
 
 } // namespace nix
-#endif