qubes-vmm-xen: init at 4.19.0-5, qubes-seabios: init at 4.0.2#341429
qubes-vmm-xen: init at 4.19.0-5, qubes-seabios: init at 4.0.2#341429SigmaSquadron wants to merge 3 commits intoNixOS:masterfrom
Conversation
TODO:
|
1c8d990 to
a2374ef
Compare
9acc181 to
af27cd3
Compare
|
Changing it to I'm not sure if that's qubes changes, or system seabios flag is broken in xen derivation itself. Interestingly, in qubes, this directory is populated with EDIT: Nvm, I think current behavior is correct, I'll provide fixes and qubes-seabios package in my PR. |
|
In qubes-packages PR I fix that by using --- a/pkgs/by-name/qu/qubes-vmm-xen/package.nix
+++ b/pkgs/by-name/qu/qubes-vmm-xen/package.nix
@@ -11,7 +11,9 @@
let
pname = "qubes-vmm-xen";
branch = "4.19";
- version = "4.19.0-3";
+ versionPatches = "4.19.0";
+ versionSuffix = "3";
+ version = "${versionPatches}-${versionSuffix}";
latest = true;
xenPatches = import ../../../applications/virtualization/xen/generic/patches.nix {
@@ -43,7 +45,7 @@ let
python = python311;
in
-callPackage
+(callPackage
(import ../../../applications/virtualization/xen/generic/default.nix {
inherit
pname
@@ -108,3 +110,8 @@ callPackage
}
// genericDefinition
)
+).overrideAttrs (oldAttrs: {
+ passthru = oldAttrs.passthru // {
+ efi = "boot/xen-${versionPatches}.efi"
+ };
+}) |
oops. fixed. |
06d5bea to
40ce3b9
Compare
|
I believe seabios comment is relevant after all. In my qubes branch, I was only able to use Xen with this argument specified: |
This comment was marked as spam.
This comment was marked as spam.
This comment was marked as spam.
This comment was marked as spam.
|
The label works! |
2eb7eb1 to
3741474
Compare
|
@CertainLach make the necessary changes to the generic builder in your branch; doing them here before #342692 is merged would break Xen's eval. |
There was a problem hiding this comment.
For Qubes, I also add overrideAttrs with installPhase to copy qubes-vmm-stubdom binaries here, any idea on how to perform this operation in a cleaner maner?
Maybe an extra postInstall builder argument?
There was a problem hiding this comment.
qubes-vmm-xen also needs a corresponding python module
There was a problem hiding this comment.
Feel free to pick CertainLach@9f6e6ce for python module.
Co-authored-by: Fernando Rodrigues <alpha@sigmasquadron.net>
3741474 to
4cccf4e
Compare
The first (and hopefully the last) custom Xen to be built based on the generic Xen builder. It's just a standard build of Xen with a lot of patches. Signed-off-by: Fernando Rodrigues <alpha@sigmasquadron.net>
4cccf4e to
41c70df
Compare
Signed-off-by: Fernando Rodrigues <alpha@sigmasquadron.net>
41c70df to
b2f63b4
Compare
b2f63b4 to
49093fe
Compare
|
yeeeeah, nope. stubdom-bin it is. i get it why you decided to just unpack the RPM, not to mention that the kernel team will be very unhappy if we sneak in another Linux build here. |
|
Stubdom also depends on some qubes packages, and I have found a nasty dependency loop here too. |
|
For quicker iteration on qubes, I have split its packages into its own flake for now, and updated qubes-vmm-xen to 4.19.1 here: https://github.com/CertainLach/nixos-qubes |
Description of changes
The first (and hopefully the last) custom Xen to be built based on the generic Xen builder. It's just a standard build of Xen with a lot of patches.
Compliments #341215.
Depends on #345192, #345324 and #342692.
Fixes #340544.
Things done
nix-shell -p nixpkgs-review --run "nixpkgs-review pr 341429". Note: all changes have to be committed, also see nixpkgs-review usage./result/bin/)cc @CertainLach
Add a 👍 reaction to pull requests you find important.