From 403837b6a8ef48cd2573bd6d3e703a6e42561523 Mon Sep 17 00:00:00 2001 From: Fernando Rodrigues Date: Sun, 11 Aug 2024 16:28:36 +0000 Subject: [PATCH] xen: deduplicate pkgs.xen and pkgs.xenPackages.xen There is no point in having both. The top-level package now points directly to the latest version. Signed-off-by: Fernando Rodrigues --- pkgs/applications/virtualization/xen/README.md | 3 ++- pkgs/applications/virtualization/xen/packages.nix | 3 --- pkgs/top-level/all-packages.nix | 4 ++-- 3 files changed, 4 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/virtualization/xen/README.md b/pkgs/applications/virtualization/xen/README.md index 5f16607b25cb..d5e22318d610 100644 --- a/pkgs/applications/virtualization/xen/README.md +++ b/pkgs/applications/virtualization/xen/README.md @@ -88,7 +88,8 @@ open a PR fixing the script, and update Xen manually: ### For Both Update Methods -1. Update `packages.nix` with the new versions. Don't forget the `slim` packages! +1. Update `packages.nix` and `../../../top-level/all-packages.nix` with the new + versions. Don't forget the `slim` packages! 1. Make sure all branches build. (Both the `standard` and `slim` versions) 1. Use the NixOS module to test if dom0 boots successfully on all new versions. 1. Make sure the `meta` attributes evaluate to something that makes sense. The diff --git a/pkgs/applications/virtualization/xen/packages.nix b/pkgs/applications/virtualization/xen/packages.nix index 96bd42e05201..5f0f50ecd736 100644 --- a/pkgs/applications/virtualization/xen/packages.nix +++ b/pkgs/applications/virtualization/xen/packages.nix @@ -62,7 +62,4 @@ rec { withInternalIPXE = false; inherit (slim) meta; }; - - xen = xen_4_19; - xen-slim = xen_4_19-slim; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6c2d43976886..d940b1597150 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -34771,8 +34771,8 @@ with pkgs; xenPackages = recurseIntoAttrs (callPackage ../applications/virtualization/xen/packages.nix {}); - xen = xenPackages.xen; - xen-slim = xenPackages.xen-slim; + xen = xenPackages.xen_4_19; + xen-slim = xenPackages.xen_4_19-slim; xkbset = callPackage ../tools/X11/xkbset { };