Skip to content

Commit

Permalink
treewide: purge remaining xen-slim calls and add alias
Browse files Browse the repository at this point in the history
Signed-off-by: Fernando Rodrigues <[email protected]>
  • Loading branch information
SigmaSquadron committed Oct 5, 2024
1 parent 18b03fa commit 709f2d6
Show file tree
Hide file tree
Showing 4 changed files with 10 additions and 9 deletions.
6 changes: 3 additions & 3 deletions pkgs/by-name/li/libvmi/package.nix
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
libkvmi,

xenSupport ? true,
xen-slim,
xen,
}:

let
Expand Down Expand Up @@ -58,7 +58,7 @@ stdenv.mkDerivation {
json_c
libvirt
]
++ lib.optionals xenSupport [ xen-slim ]
++ lib.optionals xenSupport [ xen ]
++ lib.optionals (!legacyKVM) [ libkvmi ]
++ lib.optionals withVMIFS [ fuse ];

Expand All @@ -71,7 +71,7 @@ stdenv.mkDerivation {
postFixup = lib.optionalString xenSupport ''
libvmi="$lib/lib/libvmi.so.${libVersion}"
oldrpath=$(patchelf --print-rpath "$libvmi")
patchelf --set-rpath "$oldrpath:${lib.makeLibraryPath [ xen-slim ]}" "$libvmi"
patchelf --set-rpath "$oldrpath:${lib.makeLibraryPath [ xen ]}" "$libvmi"
'';

passthru = {
Expand Down
6 changes: 3 additions & 3 deletions pkgs/by-name/xe/xen-guest-agent/package.nix
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
rustPlatform,
llvmPackages,
pkg-config,
xen-slim,
xen,
}:
rustPlatform.buildRustPackage rec {
pname = "xen-guest-agent";
Expand All @@ -25,7 +25,7 @@ rustPlatform.buildRustPackage rec {
pkg-config
];

buildInputs = [ xen-slim ];
buildInputs = [ xen ];

postInstall =
# Install the sample systemd service.
Expand All @@ -38,7 +38,7 @@ rustPlatform.buildRustPackage rec {

postFixup =
# Add the Xen libraries in the runpath so the guest agent can find libxenstore.
"patchelf $out/bin/xen-guest-agent --add-rpath ${xen-slim.out}/lib";
"patchelf $out/bin/xen-guest-agent --add-rpath ${xen}/lib";

meta = {
description = "Xen agent running in Linux/BSDs (POSIX) VMs";
Expand Down
5 changes: 3 additions & 2 deletions pkgs/top-level/aliases.nix
Original file line number Diff line number Diff line change
Expand Up @@ -1703,8 +1703,9 @@ mapAliases {
xcodebuild6 = throw "'xcodebuild6' has been renamed to/replaced by 'xcodebuild'"; # Added 2023-12-10
xdg_utils = xdg-utils; # Added 2021-02-01
xen-light = throw "'xen-light' has been renamed to/replaced by 'xen-slim'"; # Added 2024-06-30
xen_4_16 = throw "While Xen 4.16 was still security-supported when it was removed from Nixpkgs, it would have reached its End of Life a couple of days after NixOS 24.11 released. To avoid shipping an insecure version of Xen, the Xen Project Hypervisor Maintenance Team decided to delete the derivation entirely."; # Added 2024-09-29
xen_4_17 = throw "Due to technical challenges involving building older versions of Xen with newer dependencies, the Xen Project Hypervisor Maintenance Team decided to switch to a 'n+n-1' support cycle. As Xen 4.17 would have been the 'n-2' version, it was removed."; # Added 2024-09-29
xen-slim = throw "'xen-slim' has been renamed to 'xen'. The old Xen package with built-in components no longer exists"; # Added 2024-06-30
xen_4_16 = throw "While Xen 4.16 was still security-supported when it was removed from Nixpkgs, it would have reached its End of Life a couple of days after NixOS 24.11 released. To avoid shipping an insecure version of Xen, the Xen Project Hypervisor Maintenance Team decided to delete the derivation entirely"; # Added 2024-09-29
xen_4_17 = throw "Due to technical challenges involving building older versions of Xen with newer dependencies, the Xen Project Hypervisor Maintenance Team decided to switch to a 'n+n-1' support cycle. As Xen 4.17 would have been the 'n-2' version, it was removed"; # Added 2024-09-29
xenPackages = throw "The attributes in the xenPackages set have been promoted to the top-level. (xenPackages.xen_4_19 -> xen_4_19)";
xineLib = xine-lib; # Added 2021-04-27
xineUI = xine-ui; # Added 2021-04-27
Expand Down
2 changes: 1 addition & 1 deletion pkgs/top-level/python-packages.nix
Original file line number Diff line number Diff line change
Expand Up @@ -17582,7 +17582,7 @@ self: super: with self; {
inherit (pkgs) graphviz;
};

xen = toPythonModule (pkgs.xen-slim.override {
xen = toPythonModule (pkgs.xen.override {
python3Packages = self;
});

Expand Down

0 comments on commit 709f2d6

Please sign in to comment.