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

[Backport release-24.05] virtualbox & virtualboxGuestAdditions: cleanup #318311

Merged
merged 17 commits into from
Jul 9, 2024

Conversation

lelgenio
Copy link
Contributor

@lelgenio lelgenio commented Jun 8, 2024

Description of changes

Needed for #318330 which fixes #312336

Backported PRs: #303790 + #317756

Replaces: #316400

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.

@lelgenio
Copy link
Contributor Author

lelgenio commented Jun 8, 2024

image

Tested by cherry picking #311362

Copy link
Member

@poelzi poelzi left a comment

Choose a reason for hiding this comment

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

LGTM

@nixos-discourse
Copy link

This pull request has been mentioned on NixOS Discourse. There might be relevant details there:

https://discourse.nixos.org/t/prs-ready-for-review/3032/4097

@lelgenio lelgenio force-pushed the backport-cleanup-virtualbox branch from 9105f37 to a703430 Compare June 17, 2024 22:12
@ofborg ofborg bot requested a review from blitz June 17, 2024 22:45
@nixos-discourse
Copy link

This pull request has been mentioned on NixOS Discourse. There might be relevant details there:

https://discourse.nixos.org/t/prs-already-reviewed/2617/1789

@dasJ dasJ merged commit aa01c35 into NixOS:release-24.05 Jul 9, 2024
25 checks passed
presto8 pushed a commit to presto8/nixpkgs that referenced this pull request Jul 11, 2024
…up (NixOS#318311)

* virtualbox: remove with lib

* virtualboxGuestAdditions: remove with lib

* virtualboxGuestAdditions: move more buildInputs to nativeBuildInputs

* virtualbox: introduce finalAttrs

* virtualbox: remove old patch

* virtualboxGuestAdditions: Add dragAndDrop service

* fixup! virtualboxGuestAdditions: Add dragAndDrop service

* virtualbox: disable VBOX_WITH_UPDATE_AGENT

* virtualboxGuestAdditions: disable VBOX_WITH_UPDATE_AGENT

* virtualboxGuestAdditions: disable more includes

* virtualboxGuestAdditions: ignore more includes when building

* virtualboxGuestAdditions: cleanup

* virtualboxGuestAdditions: remove alsa & pulse deps

* virtualboxGuestAdditions: remove makeWrapper dep

* virtualboxGuestAdditions: use nix packaged lzma

* virtualbox: remove nasm

* Update nixos/modules/virtualisation/virtualbox-guest.nix

---------

Co-authored-by: Friedrich Altheide <11352905+FriedrichAltheide@users.noreply.github.com>
Co-authored-by: Sandro <sandro.jaeckel@gmail.com>
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.

None yet

8 participants