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

Jump to bottom

virtualbox: 5.2.14 -> 5.2.22 #51669

Merged
merged 2 commits into from Dec 8, 2018
Merged

virtualbox: 5.2.14 -> 5.2.22 #51669

merged 2 commits into from Dec 8, 2018

Conversation

alyssais
Copy link
Member

@alyssais alyssais commented Dec 7, 2018

I had to drop xorriso because it didn't seem to want to compile with it any more, and had to add libopus as a build input because it wouldn't compile without that.

Motivation for this change
Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS)
  • Built on platform(s)
    • NixOS
    • macOS
    • other Linux distributions
  • Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
  • Tested compilation of all pkgs that depend on this change using nix-shell -p nox --run "nox-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Determined the impact on package closure size (by running nix path-info -S before and after)
  • Assured whether relevant documentation is up to date
  • Fits CONTRIBUTING.md.

@alyssais
virtualbox: 5.2.14 -> 5.2.22
d41661c 
I had to drop xorriso because it didn't seem to want to compile with it
any more, and had to add libopus as a build input because it wouldn't
compile without that.
@alyssais
virtualboxExtpack: 5.2.14 -> 5.2.22
698b613 
Looks like the URL format has changed. Or maybe this is just the first
version and doesn't have a revision? I don't know.
@alyssais
Copy link
Member Author

alyssais commented Dec 7, 2018

@GrahamcOfBorg test virtualbox

@markuskowa
Copy link
Member

@GrahamcOfBorg build nixosTests.virtualbox

@markuskowa
Copy link
Member

markuskowa commented Dec 8, 2018 •
edited

What was xorriso used for? Never mind. The configure script does not offer the option anymore.

@alyssais alyssais merged commit bef8c13 into NixOS:master Dec 8, 2018
@alyssais alyssais deleted the vbox branch December 8, 2018 15:22
@hedning
Copy link
Contributor

hedning commented Dec 9, 2018

I think this broke VirtualBox-GuestAdditions unfortunately.

The last upgrade fixed up the patches apparently: dd53d0f. cc @NeQuissimus authored that last upgrade.

@alyssais
Copy link
Member Author

alyssais commented Dec 9, 2018

Eep. Maybe should just revert then until somebody who is much smarter than me can fix the patches?

@hedning
Copy link
Contributor

hedning commented Dec 9, 2018 •
edited

Maybe. The failure is a bit weird, I'm not sure why it the whole patchPhase isn't logged. But I'm guessing this must (edit: it isn't) be the failing line:

nixpkgs/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix

Line 76 in 66829ce

cd vboxguest-${version}

So it could be that we just need to change the directory name?

@hedning
Copy link
Contributor

hedning commented Dec 9, 2018

Scratch that, failure does seem to happen in the patchPhase 😕 (can't get any output after).

@hedning
Copy link
Contributor

hedning commented Dec 9, 2018

Ah, just need to update the src hash. It used the source from 5.2.20 since it was cached.

@markuskowa
Copy link
Member

That fixes the problem:

diff --git a/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix b/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix
index fc957f6f461..dd645339807 100644
--- a/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix
+++ b/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation {
 
   src = fetchurl {
     url = "http://download.virtualbox.org/virtualbox/${version}/VBoxGuestAdditions_${version}.iso";
-    sha256 = "e149ff0876242204fe924763f9272f691242d6a6ad4538a128fb7dba770781de";
+    sha256 = "00q6m86hx2n7wbfy5cgw7m981y4d40r3vl5jgcnmqnr6198367p5";
   };
 
   KERN_DIR = "${kernel.dev}/lib/modules/${kernel.modDirVersion}/build";

@hedning hedning mentioned this pull request Dec 9, 2018
Merged
10 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@markuskowa markuskowa markuskowa approved these changes

Assignees
No one assigned
Labels
10.rebuild-darwin: 0 10.rebuild-linux: 11-100
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
4 participants
@alyssais @markuskowa @hedning @GrahamcOfBorg