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

virtualbox: restore ability to build with Open Watcom (off by default) #352914

Merged
merged 3 commits into from
Nov 1, 2024

Conversation

blitz
Copy link
Contributor

@blitz blitz commented Nov 1, 2024

Revert #352610 and replace it with a simpler mechanism that doesn't remove the ability to build the BIOS sources with Open Watcom. Being able to build the BIOS sources is important, because otherwise there is no sane of patching them. But I agree that we don't need to pull in Open Watcom for the default build.

While I was here I also fixed the virtualboxKvm build for 7.0.22.

Things done

  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandboxing enabled in nix.conf? (See Nix manual)
    • sandbox = relaxed
    • sandbox = true
  • 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/)
  • 24.11 Release Notes (or backporting 23.11 and 24.05 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.

Add a 👍 reaction to pull requests you find important.

blitz added 2 commits November 1, 2024 17:20
... to avoid depending on open-watcom-bin which has a habit of
breaking.
@blitz blitz force-pushed the open-watcom-repair branch from 8604b68 to 78ebb34 Compare November 1, 2024 16:58
Copy link
Member

@emilazy emilazy left a comment

Choose a reason for hiding this comment

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

Sure, why not. I’m curious, do you actually patch these BIOS files?

@blitz
Copy link
Contributor Author

blitz commented Nov 1, 2024

Result of nixpkgs-review pr 352914 run on x86_64-linux 1

1 package marked as broken and skipped:
  • linuxKernel.packages.linux_5_4_hardened.virtualbox
25 packages built:
  • linuxKernel.packages.linux_5_10.virtualbox
  • linuxKernel.packages.linux_5_10_hardened.virtualbox
  • linuxKernel.packages.linux_5_15.virtualbox
  • linuxKernel.packages.linux_5_15_hardened.virtualbox
  • linuxKernel.packages.linux_5_4.virtualbox
  • linuxKernel.packages.linux_6_1.virtualbox
  • linuxKernel.packages.linux_6_11.virtualbox
  • linuxKernel.packages.linux_6_1_hardened.virtualbox
  • linuxKernel.packages.linux_6_6.virtualbox
  • linuxKernel.packages.linux_hardened.virtualbox (linuxKernel.packages.linux_6_6_hardened.virtualbox)
  • linuxKernel.packages.linux_latest_libre.virtualbox
  • linuxKernel.packages.linux_libre.virtualbox
  • linuxKernel.packages.linux_lqx.virtualbox
  • linuxKernel.packages.linux_xanmod.virtualbox
  • linuxKernel.packages.linux_xanmod_latest.virtualbox (linuxKernel.packages.linux_xanmod_stable.virtualbox)
  • linuxKernel.packages.linux_zen.virtualbox
  • virtualbox
  • virtualbox.modsrc
  • virtualboxHardened
  • virtualboxHardened.modsrc
  • virtualboxHeadless
  • virtualboxHeadless.modsrc
  • virtualboxKvm
  • virtualboxWithExtpack
  • virtualboxWithExtpack.modsrc

@blitz
Copy link
Contributor Author

blitz commented Nov 1, 2024

Sure, why not. I’m curious, do you actually patch these BIOS files?

We had to do this in the past, yes. It's also interesting for people who want to build everything from source, because the "alternative BIOS sources" are pre-compiled C code which feels a bit like shipping binaries. :)

@wegank wegank added the 12.approvals: 1 This PR was reviewed and approved by one reputable person label Nov 1, 2024
@emilazy
Copy link
Member

emilazy commented Nov 1, 2024

Well… yeah, but the compiler we’re using to build them is itself sourced from binaries, hence the package name, so I don’t think it’s really any better from a bootstrapping perspective :) Still, fine to have this if it’s useful.

@emilazy emilazy merged commit 567b260 into NixOS:master Nov 1, 2024
26 of 27 checks passed
@blitz blitz deleted the open-watcom-repair branch November 1, 2024 23:13
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
12.approvals: 1 This PR was reviewed and approved by one reputable person
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants