Merge remote-tracking branch 'upstream/master' into new-store-settings

obsidiansystems · Jul 18, 2024 · 118b050 · 118b050
2 parents 9052c09 + 606ace4
commit 118b050
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 9 deletions.
diff --git a/src/libstore/local-fs-store.hh b/src/libstore/local-fs-store.hh
@@ -10,13 +10,13 @@ namespace nix {
 template<template<typename> class F>
 struct LocalFSStoreConfigT
 {
-    F<std::optional<Path>> rootDir;
+    const F<std::optional<Path>> rootDir;
 
-    F<Path> stateDir;
+    const F<Path> stateDir;
 
-    F<Path> logDir;
+    const F<Path> logDir;
 
-    F<Path> realStoreDir;
+    const F<Path> realStoreDir;
 };
 
 struct LocalFSStoreConfig :

diff --git a/src/libstore/store-api.hh b/src/libstore/store-api.hh
@@ -99,9 +99,9 @@ typedef std::map<StorePath, std::optional<ContentAddress>> StorePathCAMap;
 template<template<typename> class F>
 struct StoreConfigT
 {
-    F<int> pathInfoCacheSize;
+    const F<int> pathInfoCacheSize;
 
-    F<bool> isTrusted;
+    const F<bool> isTrusted;
 
     F<int> priority;
 

diff --git a/src/libstore/store-dir-config.hh b/src/libstore/store-dir-config.hh
@@ -22,7 +22,7 @@ MakeError(BadStorePathName, BadStorePath);
 template<template<typename> class F>
 struct StoreDirConfigT
 {
-    F<Path> _storeDir;
+    const F<Path> _storeDir;
 };
 
 struct StoreDirConfig : StoreDirConfigT<config::JustValue>

diff --git a/tests/unit/libstore/local-overlay-store.cc b/tests/unit/libstore/local-overlay-store.cc
@@ -1,6 +1,9 @@
-#include <gtest/gtest.h>
+// 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 "local-overlay-store.hh"
+#  include "local-overlay-store.hh"
 
 namespace nix {
 
@@ -28,3 +31,4 @@ TEST(LocalOverlayStore, constructConfig_rootPath)
 }
 
 } // namespace nix
+#endif