nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-22 06:53:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

xen: do not assume version reflects the actual package version

Browse Source 
Signed-off-by: Fernando Rodrigues <alpha@sigmasquadron.net>
This commit is contained in:
Fernando Rodrigues 2024-11-13 17:07:52 +00:00
parent a92df8c9b6
commit a793b4db06
No known key found for this signature in database
GPG Key ID: CC3AE2EA00000000
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
pkgs/build-support/xen/default.nix
View File

@ -60,6 +60,7 @@
branch ? lib.versions.majorMinor version, branch ? lib.versions.majorMinor version,
version, version,
vendor ? "nixos", vendor ? "nixos",
upstreamVersion,
withFlask ? false, withFlask ? false,
withSeaBIOS ? true, withSeaBIOS ? true,
withOVMF ? true, withOVMF ? true,
@ -291,10 +292,10 @@ stdenv.mkDerivation (finalAttrs: {
''; '';
passthru = { passthru = {
efi = "boot/xen-${version}.efi"; efi = "boot/xen-${upstreamVersion}.efi";
flaskPolicy = flaskPolicy =
if withFlask then if withFlask then
"boot/xenpolicy-${version}" warn "This Xen was compiled with FLASK support, but the FLASK file does not match the Xen version number. Please hardcode the path to the FLASK file instead." "boot/xenpolicy-${version}"
else else
throw "This Xen was compiled without FLASK support."; throw "This Xen was compiled without FLASK support.";
# This test suite is very simple, as Xen's userspace # This test suite is very simple, as Xen's userspace
@ -339,7 +340,7 @@ stdenv.mkDerivation (finalAttrs: {
Use with the `qemu_xen` package. Use with the `qemu_xen` package.
'' ''
+ "\nIncludes:\n* `xen.efi`: The Xen Project's [EFI binary](https://xenbits.xenproject.org/docs/${branch}-testing/misc/efi.html), available on the `boot` output of this package." + "\nIncludes:\n* `xen.efi`: The Xen Project's [EFI binary](https://xenbits.xenproject.org/docs/${branch}-testing/misc/efi.html), available on the `boot` output of this package."
+ optionalString withFlask "\n* `xsm-flask`: The [FLASK Xen Security Module](https://wiki.xenproject.org/wiki/Xen_Security_Modules_:_XSM-FLASK). The `xenpolicy-${version}` file is available on the `boot` output of this package." + optionalString withFlask "\n* `xsm-flask`: The [FLASK Xen Security Module](https://wiki.xenproject.org/wiki/Xen_Security_Modules_:_XSM-FLASK). The `xenpolicy-${upstreamVersion}` file is available on the `boot` output of this package."
+ optionalString withSeaBIOS "\n* `seabios`: Support for the SeaBIOS boot firmware on HVM domains." + optionalString withSeaBIOS "\n* `seabios`: Support for the SeaBIOS boot firmware on HVM domains."
+ optionalString withOVMF "\n* `ovmf`: Support for the OVMF UEFI boot firmware on HVM domains." + optionalString withOVMF "\n* `ovmf`: Support for the OVMF UEFI boot firmware on HVM domains."
+ optionalString withIPXE "\n* `ipxe`: Support for the iPXE boot firmware on HVM domains."; + optionalString withIPXE "\n* `ipxe`: Support for the iPXE boot firmware on HVM domains.";

1
pkgs/by-name/xe/xen/package.nix
View File

@ -6,6 +6,7 @@
buildXenPackage.override { inherit python3Packages; } { buildXenPackage.override { inherit python3Packages; } {
pname = "xen"; pname = "xen";
version = "4.19.0-unstable-2024-11-12"; version = "4.19.0-unstable-2024-11-12";
upstreamVersion = "4.19.1-pre"; # We track the stable branches. Despite the version number, this is actually 4.19.0, not 4.19.1.
rev = "251a9496485a86f302980a3f8d3c656831b5a62f"; rev = "251a9496485a86f302980a3f8d3c656831b5a62f";
hash = "sha256-kHuB6kagH3AU+Wsx4oD7HnNsZpxCu7x3v/m4/1xi6lY="; hash = "sha256-kHuB6kagH3AU+Wsx4oD7HnNsZpxCu7x3v/m4/1xi6lY=";
} }