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

@@ -14,8 +14,6 @@ cxx = meson.get_compiler('cpp')
 
 subdir('nix-meson-build-support/deps-lists')
 
-configdata = configuration_data()
-
 deps_private_maybe_subproject = [
   dependency('nix-util'),
   dependency('nix-store'),
@@ -29,33 +27,6 @@ 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(
-  configuration : configdata,
-  output : 'config-flake.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',
-  '-include', 'config-store.hh',
-  '-include', 'config-expr.hh',
-  # not generated (yet?)
-  # '-include', 'config-flake.hh',
-
-  # From C libraries, for our public, installed headers too
-  '-include', 'config-util.h',
-  '-include', 'config-store.h',
-  '-include', 'config-expr.h',
-  '-include', 'config-flake.h',
-  language : 'cpp',
-)
-
 subdir('nix-meson-build-support/common')
 
 sources = files(
@@ -64,7 +35,7 @@ sources = files(
 
 include_dirs = [include_directories('.')]
 
-headers = [config_h] + files(
+headers = files(
   'nix_api_flake.h',
 )
 
@@ -84,7 +55,7 @@ this_library = library(
   install : true,
 )
 
-install_headers(headers, subdir : 'nix', preserve_path : true)
+install_headers(headers, preserve_path : true)
 
 libraries_private = []
 

src/libflake-c/nix_api_flake.cc

@@ -1,8 +1,9 @@
 #include "nix_api_flake.h"
 #include "nix_api_flake_internal.hh"
 #include "nix_api_util_internal.h"
+#include "nix_api_expr_internal.h"
 
-#include "flake/flake.hh"
+#include "nix/flake/flake.hh"
 
 nix_flake_settings * nix_flake_settings_new(nix_c_context * context)
 {
@@ -18,15 +19,11 @@ void nix_flake_settings_free(nix_flake_settings * settings)
     delete settings;
 }
 
-nix_err nix_flake_init_global(nix_c_context * context, nix_flake_settings * settings)
+nix_err nix_flake_settings_add_to_eval_state_builder(
+    nix_c_context * context, nix_flake_settings * settings, nix_eval_state_builder * builder)
 {
-    static std::shared_ptr<nix::flake::Settings> registeredSettings;
     try {
-        if (registeredSettings)
-            throw nix::Error("nix_flake_init_global already initialized");
-
-        registeredSettings = settings->settings;
-        nix::flake::initLib(*registeredSettings);
+        settings->settings->configureEvalSettings(builder->settings);
     }
     NIXC_CATCH_ERRS
 }

src/libflake-c/nix_api_flake.h

@@ -35,9 +35,15 @@ nix_flake_settings * nix_flake_settings_new(nix_c_context * context);
 void nix_flake_settings_free(nix_flake_settings * settings);
 
 /**
- * @brief Register Flakes support process-wide.
+ * @brief Initialize a `nix_flake_settings` to contain `builtins.getFlake` and
+ * potentially more.
+ *
+ * @param[out] context Optional, stores error information
+ * @param[in] settings The settings to use for e.g. `builtins.getFlake`
+ * @param[in] builder The builder to modify
  */
-nix_err nix_flake_init_global(nix_c_context * context, nix_flake_settings * settings);
+nix_err nix_flake_settings_add_to_eval_state_builder(
+    nix_c_context * context, nix_flake_settings * settings, nix_eval_state_builder * builder);
 
 #ifdef __cplusplus
 } // extern "C"

src/libflake-c/nix_api_flake_internal.hh

@@ -1,7 +1,7 @@
 #pragma once
 
-#include "ref.hh"
-#include "flake/settings.hh"
+#include "nix/util/ref.hh"
+#include "nix/flake/settings.hh"
 
 struct nix_flake_settings
 {