xen: 4.20.2 -> 4.21.0

doc/release-notes/rl-2605.section.md

@@ -13,6 +13,8 @@
 
 - `spoof` has been removed, as there are many issues upstream with it working on modern OS versions, and it appears to be unmaintained.
 
+- The OCaml-based Xen Store Daemon has been split off the `xen` package, and is now present in the `ocamlPackages.oxenstored` package.
+
 - `kanata` now requires `karabiner-dk` version 6.0+ or later.
   The package has been updated to use the new `karabiner-dk` package and the `darwinDriver` output stays at the version defined in the package.
 

nixos/modules/virtualisation/xen-dom0.nix

@@ -368,6 +368,12 @@ in
         readOnly = true;
         description = "Helper internal option that determines the type of the Xen Store Daemon based on cfg.store.path.";
       };
+      package = mkPackageOption pkgs [ "ocamlPackages" "oxenstored" ] {
+        extraDescription = ''
+          This is only used if the Xen Store Daemon being used is the newer OCaml-based store.
+          The legacy C-based store is always included.
+        '';
+      };
       settings = mkOption {
         default = { };
         example = {
@@ -799,7 +805,8 @@ in
       systemPackages = [
         cfg.package
         (hiPrio cfg.qemu.package)
-      ];
+      ]
+      ++ optional (cfg.store.type == "ocaml") (hiPrio cfg.store.package);
       etc =
         # Set up Xen Domain 0 configuration files.
         {

pkgs/by-name/xe/xen/0001-makefile-efi-output-directory.patch

@@ -1,20 +1,9 @@
-From 7f802ceac03252ad5182ee8c69ebb01da24a307c Mon Sep 17 00:00:00 2001
-From: Fernando Rodrigues <[email protected]>
-Date: Fri, 4 Jul 2025 18:07:01 +0000
-Subject: [PATCH 1/2] xen/Makefile: patch .efi output directory
-
-This is necessary so the build does not fail when Xen tries to install
-.efi files to $boot/efi/nixos and panics when the directory doesn't
-exist. It also has the benefit of installing the files in a location
-that is easier to access.
-
-Signed-off-by: Fernando Rodrigues <[email protected]>
-
 diff --git a/xen/Makefile b/xen/Makefile
-index 6bf0b0ea9e..907cd89f7e 100644
+index 37ca2e657e..53c897d233 100644
 --- a/xen/Makefile
 +++ b/xen/Makefile
-@@ -527,6 +527,6 @@ _install: $(TARGET)$(CONFIG_XEN_INSTALL_SUFFIX)
+@@ -537,8 +537,8 @@
+ 		if [ -n '$(EFI_MOUNTPOINT)' -a -n '$(EFI_VENDOR)' ]; then \
  			$(if $(efi-strip-opt), \
  			     $(STRIP) $(efi-strip-opt) -p -o $(TARGET).efi.stripped $(TARGET).efi && \
 -			     $(INSTALL_DATA) $(TARGET).efi.stripped $(D)$(EFI_MOUNTPOINT)/efi/$(EFI_VENDOR)/$(T)-$(XEN_FULLVERSION).efi ||) \
@@ -23,13 +12,13 @@ index 6bf0b0ea9e..907cd89f7e 100644
 +			$(INSTALL_DATA) $(TARGET).efi $(D)$(BOOT_DIR)/$(T)-$(XEN_FULLVERSION).efi; \
  		elif [ "$(D)" = "$(patsubst $(shell cd $(XEN_ROOT) && pwd)/%,%,$(D))" ]; then \
  			echo 'EFI installation only partially done (EFI_VENDOR not set)' >&2; \
-@@ -560,5 +560,5 @@ _uninstall:
+ 		fi; \
+@@ -570,7 +570,7 @@
+ 	rm -f $(D)$(EFI_DIR)/$(T)-$(XEN_VERSION).efi
  	rm -f $(D)$(EFI_DIR)/$(T).efi
  	if [ -n '$(EFI_MOUNTPOINT)' -a -n '$(EFI_VENDOR)' ]; then \
 -		rm -f $(D)$(EFI_MOUNTPOINT)/efi/$(EFI_VENDOR)/$(T)-$(XEN_FULLVERSION).efi; \
 +		rm -f $(D)$(BOOT_DIR)/$(T)-$(XEN_FULLVERSION).efi; \
  	fi
-
---
-2.49.0
-
+
+ .PHONY: _debug