Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

nixos/qemu-vm: add virtualisation.memorySize < 2048 assertion on 32bit #234266

Merged
merged 1 commit into from
May 27, 2023

Conversation

emilylange
Copy link
Member

Description of changes

See #230871 and https://matrix.to/#/!aGqRytqbCECitOFhbt:nixos.org/$06Z4JhUEJ8RYmnq-QOvFQvieQMrgwk7uy17VmWKr7KE?via=nixos.org&via=matrix.org

cc @RaitoBezarius

Things done
  • Built on platform(s)
    • x86_64-linux
    • i686-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandbox = true set in nix.conf? (See Nix manual)
  • Tested, as applicable:
  • Tested compilation of all packages that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage
  • Tested basic functionality of all binary files (usually in ./result/bin/)
  • 23.05 Release Notes (or backporting 22.11 Release notes)
    • (Package updates) Added a release notes entry if the change is major or breaking
    • (Module updates) Added a release notes entry if the change is significant
    • (Module addition) Added a release notes entry if adding a new NixOS module
  • Fits CONTRIBUTING.md.

@github-actions
Copy link
Contributor

@emilylange emilylange deleted the qemu-vm-2047mb branch May 27, 2023 13:47
@risicle
Copy link
Contributor

risicle commented May 27, 2023

This appears to be breaking nixos tests for me on nixos x86_64 #234399 (comment)

@@ -863,7 +863,13 @@ in
The address must be in the default VLAN (10.0.2.0/24).
'';
}
]));
])) ++ [
{ assertion = pkgs.stdenv.hostPlatform.is32bit && cfg.memorySize < 2047;
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think this should be pkgs.stdenv.hostPlatform.is32bit -> cfg.memorySize < 2047

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Argh, right.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Fix in #234455.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants