Skip to content

open-watcom-bin: do an unattended instead of a scripted install#352609

Merged
emilazy merged 1 commit intoNixOS:masterfrom
skeuchel:open-watcom-bin-unattended
Oct 31, 2024
Merged

open-watcom-bin: do an unattended instead of a scripted install#352609
emilazy merged 1 commit intoNixOS:masterfrom
skeuchel:open-watcom-bin-unattended

Conversation

@skeuchel
Copy link
Copy Markdown

The open-watcom-bin package is installed via the original command line installer. So far an expect script interacts with the installer to make the appropriate choices. This PR replaces this with an unattended install that provides the settings on the command line instead.

Fixes #351413.

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.

@emilazy
Copy link
Copy Markdown
Member

emilazy commented Oct 31, 2024

Thanks. We would like to stop using Open Watcom in this package as it has a flaky QEMU‐based build and a problematic licence. Will this work together with #352610 to use the pre‐generated assembly sources or will they need work to combine?

Edit: Sorry, I misread this PR as applying to the VirtualBox package… These changes LGTM.

Copy link
Copy Markdown
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.

Built successfully on x86_64-linux, and seems a lot simpler than using expect.

@emilazy emilazy merged commit b59b333 into NixOS:master Oct 31, 2024
@blitz
Copy link
Copy Markdown
Contributor

blitz commented Nov 1, 2024

@skeuchel Thanks for fixing this! Btw, we can probably do unzip instead of running the installer, because it's just a self-extracting ZIP. The only thing needed would be to fix the file permissions afterwards. Binaries are not executable otherwise.

@skeuchel skeuchel deleted the open-watcom-bin-unattended branch November 9, 2024 10:11
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Build failure on staging-next: virtualboxHardened

3 participants