Merge pull request #12836 from NixOS/component-in-header-path

Expose the nix component in header include paths

src/libstore-test-support/derived-path.cc

@@ -2,7 +2,7 @@
 
 #include <rapidcheck.h>
 
-#include "nix/tests/derived-path.hh"
+#include "nix/store/tests/derived-path.hh"
 
 namespace rc {
 using namespace nix;

src/libstore-test-support/include/nix/meson.build

@@ -1,12 +0,0 @@
-# Public headers directory
-
-include_dirs = [include_directories('..')]
-
-headers = files(
-  'tests/derived-path.hh',
-  'tests/libstore.hh',
-  'tests/nix_api_store.hh',
-  'tests/outputs-spec.hh',
-  'tests/path.hh',
-  'tests/protocol.hh',
-)

src/libstore-test-support/include/nix/store/tests/derived-path.hh

@@ -3,10 +3,10 @@
 
 #include <rapidcheck/gen/Arbitrary.h>
 
-#include "nix/derived-path.hh"
+#include "nix/store/derived-path.hh"
 
-#include "nix/tests/path.hh"
-#include "nix/tests/outputs-spec.hh"
+#include "nix/store/tests/path.hh"
+#include "nix/store/tests/outputs-spec.hh"
 
 namespace rc {
 using namespace nix;

src/libstore-test-support/include/nix/store/tests/libstore.hh

@@ -4,7 +4,7 @@
 #include <gtest/gtest.h>
 #include <gmock/gmock.h>
 
-#include "nix/store-api.hh"
+#include "nix/store/store-api.hh"
 
 namespace nix {
 

src/libstore-test-support/include/nix/store/tests/meson.build

@@ -0,0 +1,12 @@
+# Public headers directory
+
+include_dirs = [include_directories('../../..')]
+
+headers = files(
+  'derived-path.hh',
+  'libstore.hh',
+  'nix_api_store.hh',
+  'outputs-spec.hh',
+  'path.hh',
+  'protocol.hh',
+)

src/libstore-test-support/include/nix/store/tests/nix_api_store.hh

@@ -1,8 +1,8 @@
 #pragma once
 ///@file
-#include "nix/tests/nix_api_util.hh"
+#include "nix/util/tests/nix_api_util.hh"
 
-#include "nix/file-system.hh"
+#include "nix/util/file-system.hh"
 #include <filesystem>
 
 #include "nix_api_store.h"

src/libstore-test-support/include/nix/store/tests/outputs-spec.hh

@@ -3,9 +3,9 @@
 
 #include <rapidcheck/gen/Arbitrary.h>
 
-#include "nix/outputs-spec.hh"
+#include "nix/store/outputs-spec.hh"
 
-#include "nix/tests/path.hh"
+#include "nix/store/tests/path.hh"
 
 namespace rc {
 using namespace nix;

src/libstore-test-support/include/nix/store/tests/path.hh

@@ -3,7 +3,7 @@
 
 #include <rapidcheck/gen/Arbitrary.h>
 
-#include "nix/path.hh"
+#include "nix/store/path.hh"
 
 namespace nix {
 

src/libstore-test-support/include/nix/store/tests/protocol.hh

@@ -4,8 +4,8 @@
 #include <nlohmann/json.hpp>
 #include <gtest/gtest.h>
 
-#include "nix/tests/libstore.hh"
-#include "nix/tests/characterization.hh"
+#include "nix/store/tests/libstore.hh"
+#include "nix/util/tests/characterization.hh"
 
 namespace nix {
 

src/libstore-test-support/meson.build

@@ -35,7 +35,7 @@ sources = files(
   'path.cc',
 )
 
-subdir('include/nix')
+subdir('include/nix/store/tests')
 
 subdir('nix-meson-build-support/export-all-symbols')
 subdir('nix-meson-build-support/windows-version')
@@ -52,7 +52,7 @@ this_library = library(
   install : true,
 )
 
-install_headers(headers, subdir : 'nix', preserve_path : true)
+install_headers(headers, subdir : 'nix/store/tests', preserve_path : true)
 
 libraries_private = []
 

src/libstore-test-support/outputs-spec.cc

@@ -1,4 +1,4 @@
-#include "nix/tests/outputs-spec.hh"
+#include "nix/store/tests/outputs-spec.hh"
 
 #include <rapidcheck.h>
 

src/libstore-test-support/package.nix

@@ -29,7 +29,7 @@ mkMesonLibrary (finalAttrs: {
     ./.version
     ./meson.build
     # ./meson.options
-    ./include/nix/meson.build
+    ./include/nix/store/tests/meson.build
     (fileset.fileFilter (file: file.hasExt "cc") ./.)
     (fileset.fileFilter (file: file.hasExt "hh") ./.)
   ];

src/libstore-test-support/path.cc

@@ -3,11 +3,11 @@
 
 #include <rapidcheck.h>
 
-#include "nix/path-regex.hh"
-#include "nix/store-api.hh"
+#include "nix/store/path-regex.hh"
+#include "nix/store/store-api.hh"
 
-#include "nix/tests/hash.hh"
-#include "nix/tests/path.hh"
+#include "nix/util/tests/hash.hh"
+#include "nix/store/tests/path.hh"
 
 namespace nix {