Tagging release 2.28.0

-----BEGIN PGP SIGNATURE-----
 
 iQFHBAABCAAxFiEEtUHVUwEnDgvPFcpdgXC0cm1xmN4FAmfv9fITHGVkb2xzdHJh
 QGdtYWlsLmNvbQAKCRCBcLRybXGY3ohrCAC1Uw/JJr3yEPlJ/jLc9t9HqEKMY08W
 W6SEjpYJHYixMXmoonexkqojncNWBaiytRa+vBY7JQq0xTOOBwj42TM2ZzMF4GXi
 vO4Ox0hEsRa/v7tSmK6GFz1sNEKEUOHDNbilg4kzkkBHPEGPUGMwdWkT0akO576Q
 SQ6ERwPPLsHDI2YtAeAD8R4p07CraiyA34ljDPz3rChTAXRPVKWxJUt1enwEWYTr
 cKk45RcR4S8rP1BVwf3wsNsrHjqjbaY45kPAo8GD79hFH0zkyJarS3Kgv8qsWLra
 9ph0DVVG0wiArlET7Y3uchqtAC0Z5LOnutAmOFYFw6DKfWp9yGfl/SVW
 =XRda
 -----END PGP SIGNATURE-----

Merge tag '2.28.0' into sync-2.28.0

Tagging release 2.28.0

src/libutil-test-support/hash.cc

@@ -2,9 +2,9 @@
 
 #include <rapidcheck.h>
 
-#include "hash.hh"
+#include "nix/util/hash.hh"
 
-#include "tests/hash.hh"
+#include "nix/util/tests/hash.hh"
 
 namespace rc {
 using namespace nix;

src/libutil-test-support/include/nix/util/tests/characterization.hh

@@ -3,9 +3,9 @@
 
 #include <gtest/gtest.h>
 
-#include "types.hh"
-#include "environment-variables.hh"
-#include "file-system.hh"
+#include "nix/util/types.hh"
+#include "nix/util/environment-variables.hh"
+#include "nix/util/file-system.hh"
 
 namespace nix {
 

src/libutil-test-support/include/nix/util/tests/hash.hh

@@ -3,7 +3,7 @@
 
 #include <rapidcheck/gen/Arbitrary.h>
 
-#include <hash.hh>
+#include "nix/util/hash.hh"
 
 namespace rc {
 using namespace nix;

src/libutil-test-support/include/nix/util/tests/meson.build

@@ -0,0 +1,11 @@
+# Public headers directory
+
+include_dirs = [include_directories('../../..')]
+
+headers = files(
+  'characterization.hh',
+  'gtest-with-params.hh',
+  'hash.hh',
+  'nix_api_util.hh',
+  'string_callback.hh',
+)

src/libutil-test-support/include/nix/util/tests/tracing-file-system-object-sink.hh

@@ -1,5 +1,5 @@
 #pragma once
-#include "fs-sink.hh"
+#include "nix/util/fs-sink.hh"
 
 namespace nix::test {
 

src/libutil-test-support/meson.build

@@ -25,29 +25,14 @@ subdir('nix-meson-build-support/subprojects')
 rapidcheck = dependency('rapidcheck')
 deps_public += rapidcheck
 
-add_project_arguments(
-  # TODO(Qyriad): Yes this is how the autoconf+Make system did it.
-  # It would be nice for our headers to be idempotent instead.
-  '-include', 'config-util.hh',
-  language : 'cpp',
-)
-
 subdir('nix-meson-build-support/common')
 
 sources = files(
-  'tests/hash.cc',
-  'tests/string_callback.cc',
+  'hash.cc',
+  'string_callback.cc',
 )
 
-include_dirs = [include_directories('.')]
-
-headers = files(
-  'tests/characterization.hh',
-  'tests/gtest-with-params.hh',
-  'tests/hash.hh',
-  'tests/nix_api_util.hh',
-  'tests/string_callback.hh',
-)
+subdir('include/nix/util/tests')
 
 subdir('nix-meson-build-support/export-all-symbols')
 subdir('nix-meson-build-support/windows-version')
@@ -64,7 +49,7 @@ this_library = library(
   install : true,
 )
 
-install_headers(headers, subdir : 'nix', preserve_path : true)
+install_headers(headers, subdir : 'nix/util/tests', preserve_path : true)
 
 libraries_private = []
 

src/libutil-test-support/package.nix

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

src/libutil-test-support/string_callback.cc

@@ -1,4 +1,4 @@
-#include "string_callback.hh"
+#include "nix/util/tests/string_callback.hh"
 
 namespace nix::testing {
 

src/libutil-test-support/tracing-file-system-object-sink.cc

@@ -1,5 +1,5 @@
 #include <iostream>
-#include "tracing-file-system-object-sink.hh"
+#include "nix/tracing-file-system-object-sink.hh"
 
 namespace nix::test {