Merge pull request #13190 from roberth/render-upcoming-notes

Render upcoming notes

doc/manual/package.nix

@@ -11,6 +11,8 @@
   python3,
   rsync,
   nix-cli,
+  changelog-d,
+  officialRelease,
 
   # Configuration Options
 
@@ -44,16 +46,24 @@ mkMesonDerivation (finalAttrs: {
   ];
 
   # Hack for sake of the dev shell
-  passthru.externalNativeBuildInputs = [
-    meson
-    ninja
-    (lib.getBin lowdown-unsandboxed)
-    mdbook
-    mdbook-linkcheck
-    jq
-    python3
-    rsync
-  ];
+  passthru.externalNativeBuildInputs =
+    [
+      meson
+      ninja
+      (lib.getBin lowdown-unsandboxed)
+      mdbook
+      mdbook-linkcheck
+      jq
+      python3
+      rsync
+      changelog-d
+    ]
+    ++ lib.optionals (!officialRelease) [
+      # When not an official release, we likely have changelog entries that have
+      # yet to be rendered.
+      # When released, these are rendered into a committed file to save a dependency.
+      changelog-d
+    ];
 
   nativeBuildInputs = finalAttrs.passthru.externalNativeBuildInputs ++ [
     nix-cli

doc/manual/rl-next/c-api.md

@@ -0,0 +1,19 @@
+---
+synopsis: "C API: functions for locking and loading a flake"
+issues: 10435
+prs: [12877, 13098]
+---
+
+This release adds functions to the C API for handling the loading of flakes. Previously, this had to be worked around by using `builtins.getFlake`.
+C API consumers and language bindings now have access to basic locking functionality.
+
+It does not expose the full locking API, so that the implementation can evolve more freely.
+Locking is controlled with the functions, which cover the common use cases for consuming a flake:
+- `nix_flake_lock_flags_set_mode_check`
+- `nix_flake_lock_flags_set_mode_virtual`
+- `nix_flake_lock_flags_set_mode_write_as_needed`
+- `nix_flake_lock_flags_add_input_override`, which also enables `virtual`
+
+This change also introduces the new `nix-fetchers-c` library, whose single purpose for now is to manage the (`nix.conf`) settings for the built-in fetchers.
+
+More details can be found in the [C API documentation](@docroot@/c-api.md).

packaging/components.nix

@@ -211,6 +211,7 @@ in
 {
   version = baseVersion + versionSuffix;
   inherit versionSuffix;
+  inherit officialRelease;
   inherit maintainers;
 
   inherit filesetToSource;