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-c/meson.build

@@ -23,24 +23,11 @@ deps_public_maybe_subproject = [
 ]
 subdir('nix-meson-build-support/subprojects')
 
-# TODO rename, because it will conflict with downstream projects
 configdata.set_quoted('PACKAGE_VERSION', meson.project_version())
 
-config_h = configure_file(
+config_priv_h = configure_file(
   configuration : configdata,
-  output : 'config-util.h',
-)
-
-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.
-
-  # From C++ libraries, only for internals
-  '-include', 'config-util.hh',
-
-  # From C libraries, for our public, installed headers too
-  '-include', 'config-util.h',
-  language : 'cpp',
+  output : 'nix_api_util_config.h',
 )
 
 subdir('nix-meson-build-support/common')
@@ -51,7 +38,7 @@ sources = files(
 
 include_dirs = [include_directories('.')]
 
-headers = [config_h] + files(
+headers = files(
   'nix_api_util.h',
 )
 
@@ -64,6 +51,7 @@ subdir('nix-meson-build-support/windows-version')
 this_library = library(
   'nixutilc',
   sources,
+  config_priv_h,
   dependencies : deps_public + deps_private + deps_other,
   include_directories : include_dirs,
   link_args: linker_export_flags,
@@ -71,7 +59,7 @@ this_library = library(
   install : true,
 )
 
-install_headers(headers, subdir : 'nix', preserve_path : true)
+install_headers(headers, preserve_path : true)
 
 libraries_private = []
 

src/libutil-c/nix_api_util.cc

@@ -1,12 +1,14 @@
 #include "nix_api_util.h"
-#include "config-global.hh"
-#include "error.hh"
+#include "nix/util/config-global.hh"
+#include "nix/util/error.hh"
 #include "nix_api_util_internal.h"
-#include "util.hh"
+#include "nix/util/util.hh"
 
 #include <cxxabi.h>
 #include <typeinfo>
 
+#include "nix_api_util_config.h"
+
 nix_c_context * nix_c_context_create()
 {
     return new nix_c_context();

src/libutil-c/nix_api_util_internal.h

@@ -4,7 +4,7 @@
 #include <string>
 #include <optional>
 
-#include "error.hh"
+#include "nix/util/error.hh"
 #include "nix_api_util.h"
 
 struct nix_c_context