Commit graph

186 commits

Author SHA1 Message Date
Shea Levy 4fa4ab3a6e Partially revert my recent kernelPackages changes
First, pass in `self' again so that overriding works properly (thanks
for pointing that out, @edolstra)

Second, instead of having linuxPackages*.kernel mean something different
inside the set and out, add a new attribute linuxPackages*.kernelDev,
which for the generic kernel is simply linuxPackages*.kernel but for the
manual-config kernel is the `dev' output (which has the build tree,
source tree, etc.)

The second change required trivial modifications in a bunch of
expressions, I verified that all of the linuxPackages* sets defined in
all-packages.nix have the same drv paths before and after the change.

Signed-off-by: Shea Levy <shea@shealevy.com>
2013-03-24 07:45:00 -04:00
Vladimír Čunát 26af997d41 Merge branch 'master' into stdenv-updates
Conflicts (simple):
	pkgs/applications/networking/browsers/chromium/default.nix
	pkgs/development/libraries/libsoup/default.nix
	pkgs/os-specific/linux/kernel/manual-config.nix
	pkgs/os-specific/linux/qemu-kvm/default.nix
2013-03-02 10:41:53 +01:00
aszlig 113b15f3a8
virtualbox: Update tarball sha256sum of v4.2.8.
Outrageous! They fixed the tarball by including the missing file.
Well, at least we now don't have that much cruft laying around and can remove
that rather long patch.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2013-03-01 10:14:44 +01:00
aszlig fc088ae732 virtualbox: Fix build with kernel 3.9.0.
This patch is cherry-picked from VirtualBox Subversion, revision 44867.

It's rather small and only is in effect if kernel version is >= 3.9.0, so it
won't break existing kernels, so I'm adding it here despite we usually only care
about the latest stable upstream (kernel) versions.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2013-03-01 09:42:38 +01:00
aszlig 1029ca5767 virtualbox: Support UIDGID_STRICT_TYPE_CHECKS.
This adds a patch to support CONFIG_UIDGID_STRICT_TYPE_CHECKS being activated in
the kernel config (selected by CONFIG_USER_NS for example).

When this kernel option is enabled, current->cred->uid is a structure rather
than a simple integer type (uid_t and gid_t), so we need to check for that and
also pass the current user namespace where needed.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2013-03-01 09:42:38 +01:00
aszlig f26b5fb730 virtualbox+guest: Update to version 4.2.8.
The tarball for this version is missing the file VRDEVideoIn.h, which is added
through the missing_files_4.2.8.patch and extracted from Subversion, revision
44528.

Upstream changelog(s) can be found at the usual place:

https://www.virtualbox.org/wiki/Changelog

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2013-03-01 09:42:38 +01:00
Eelco Dolstra 2aa6f262cb Merge remote-tracking branch 'origin/master' into stdenv-updates 2013-02-15 13:36:34 +01:00
aszlig 59d79e97e8
virtualbox: Fix unpacking of extension pack.
This fixes a typo introduced by 5a3f9c08b0.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2013-02-08 07:03:36 +01:00
Shea Levy 8f51038a13 qemu-1.3.1
Also, old qemu is unreferenced in nixos and nixpkgs tree, so remove it absent explicit need.
2013-02-07 20:44:02 -05:00
Aristid Breitkreuz 07c64a7a6c virtinst: could not find python modules, add python wrapper 2013-02-05 18:16:50 +01:00
Peter Simons b33ad366a1 Merge branch 'master' into stdenv-updates. 2013-01-11 15:46:10 +01:00
aszlig 691bd7b9dd
Merge pull request #239: VirtualBox guest update.
So, a VirtualBox update is best accompanied by the corresponding update of the
guest additions.

Thanks @dysinger for the contribution.
2013-01-10 03:29:44 +01:00
aszlig acb6290eed
virtualbox: Update to new upstream version 4.2.6.
Fortunately this time the upstream package was packaged correctly and we no
longer need the patch to remove the reference to the fa_IR locale.

In addition we need to add lvm2 to dependencies because VirtualBox now requires
libdevmapper with its default configuration. We could disable it but in order to
gain DM support I think it's necessary and at least could avoid some confusion
from users if it's not working "out of the box" :-)

This is a bugfix release, upstream changes are:

 * VMM: don't inject stale VT-x events to prevent crashes after VM reset
 * VMM: workaround for buggy BIOSes which enable MONITOR only for certain CPUs
 * GUI: fixed trimming of anti-aliased text in details-view element headers
 * GUI: fixed create-settings-file-alias functionality on Mac hosts
 * GUI: fixed take-guest-screenshot functionality on Windows hosts
 * GUI: several minor fixes, including palette fixes
 * GUI: fixed Windows 2012 OS type
 * GUI: allow to terminate the VM even if VBoxSVC crashed
 * API: fixed cancelling of snapshots, previously this could lead to
        inconsistent VM configs
 * API: fixed identifying disk images by UUID
 * 3D Support: several fixes
 * VRDP: fixed occasional crash with external authentication
 * VGA: fix for double scan text modes
 * USB: fixed invalid pending request count at the time of service of DEVICE
        POWER requests (Windows hosts only)
 * USB keyboard: Korean keyboard workaround
 * Storage: fixed hang with QCOW images and asynchronous I/O enabled
 * Storage: fixed hang with newer VHD images
 * Storage: actually write the non-rotational flag to the VM settings (4.2.0
            regression)
 * Virtio-net: fixed the problem with network statistics counters in Session
               Information dialog (GUI)
 * Metrics: introduced network rate and disk usage metrics
 * Metrics: fixed a crash under certain conditions on Solaris hosts
 * BIOS: fix for El Torito
 * Shared Folders: if the host folder of a shared folder mapping does not exist,
                   keep it active but mark it as invalid to prevent inconsistent
                   saved states
 * VBoxManage: fixed converting disks from raw images
 * VBoxManage: show snapshot description in the VM or snapshot information
 * VBoxManage: make implicit opening of media consistent in all places dealing
               with media
 * VBoxManage: the iSCSI initiator name was not stored in the settings file when
               doing storageattach
 * VBoxManage: metrics collect now properly handles 'CPU/MHz' and
               'Net/*/LinkSpeed' metrics
 * VBoxManage: changing the image UUID or parent UUID as part of storageattach
               works now in all safe cases
 * VBoxManage: introduced storageattach --medium additions as a shortcut to
               mount the additions image
 * OVF: fixed importing OVF files cerated by recent VMware products
 * Linux hosts / Bridged Networking: fixed the problem with leaking connections
                                     in conntrack
 * Linux Additions: added support for ConsoleKit sessions in the vminfo service
                    of VBoxService
 * Linux Additions: don't crash during remount under certain conditions
 * Linux/Solaris Additions: fixed guest memory metrics collection
 * Solaris hosts: added a dependency to ensure that the user directories are
                  reachable when starting VBox services
 * Windows host installer: integrated user-contributed translations, thanks to
                           all contributors!
 * Windows Additions: fixed auto-logon installation for Windows 8
 * Windows Additions: don't fail if the shared folders host service is not
                      available
 * Windows Additions: fixed Guest Additions startup on Windows 2000 guests
 * Windows Additions: auto-resize fixes for Windows 8 guests

Upstream changelist with bug ids can be found here:

https://www.virtualbox.org/wiki/Changelog

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2013-01-10 03:29:43 +01:00
Tim Dysinger 3300607176 Upgrade VirtualBox Guest Additions to 4.2.6 2013-01-08 18:58:56 -10:00
Peter Simons 9e9cd7b529 Merge branch 'master' into stdenv-updates. 2013-01-04 21:00:53 +01:00
Tim Dysinger 58a57efc8a Add mount.vboxsf back to the expression, add dbus & patchelf everything so it works 2012-12-30 16:04:48 -10:00
Eelco Dolstra ab3eeabfed Rename buildNativeInputs -> nativeBuildInputs
Likewise for propagatedBuildNativeInputs, etc.  "buildNativeInputs"
sounds like an imperative rather than a noun phrase.
2012-12-28 19:20:09 +01:00
aszlig 5a3f9c08b0
virtualbox: Allow building with extension pack.
The extension pack is needed in order to have USB 2.0, RDP and PXE boot support
and is _not_ part of the free version, so please read their conditions before
using it:

https://www.virtualbox.org/wiki/VirtualBox_PUEL

Further information and details about the extension pack is available here:

https://www.virtualbox.org/manual/ch01.html#intro-installing

I'm wimping out here and use requireFile to ask the user to fetch the extension
pack manually, simply because I'm not a lawyer. I've seen other distributions
that fetch the extension packs directly from upstream, but I'm not sure if that
is according to Oracle's PUEL.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2012-12-12 12:36:19 +01:00
aszlig e95bda9caf
virtualbox: Update to upstream version 4.2.4.
This updates both virtualbox and guest additions.

Upstream changes in this release:

 * GUI: fixed validation warning on global settings / proxy page (4.2.2
        regression)
 * GUI: fixed crash with multiple guest screens on certain conditions (OS X
        hosts only)
 * VBoxBalloonCtrl: fixed command line argument handling of ballooning module
 * VRDP: fixed occasional crash during a video playback in the guest
 * BIOS: fixed broken DMI information (4.2 regression)
 * BIOS: workaround for booting from Windows 2000 floppy disks
 * EFI: fixed video mode selection loss on VM reboot
 * Parallel: fixed parallel port printing failure/ paper queue empty error
             (Windows hosts only)
 * NAT: fixed crash on alias-less DNS responses when host-resolver is used
 * Storage: fixed hang under rare circumstances

With bug IDs: https://www.virtualbox.org/wiki/Changelog

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2012-12-03 11:10:17 +01:00
Eelco Dolstra 79725bb5bc Mark some packages as low priority and disambiguate some others 2012-11-29 15:26:13 +01:00
Eelco Dolstra 5553546c21 Remove a bunch of unreferenced files
Plus a small number of obsolete packages (like old versions of qemu).
2012-11-29 13:43:37 +01:00
Peter Simons e5a68f8a67 Merge pull request #157 from ecarreras/virtualbox-icons
Make virtualbox icons available
2012-10-23 10:42:28 -07:00
aszlig 78342bde93
virtualbox-guest: Update to version 4.2.2.
This should fix a few issues with charon and VMs crashing starting at an amount
of at least 4 running VMs in parallel.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2012-10-22 19:57:36 +02:00
aszlig 19bffad329
virtualbox: Update to version 4.2.2.
This time, we need to patch, because the upstream tarball got messed up
somehow[TM]. You can find some details about the issue here:

https://www.virtualbox.org/pipermail/vbox-dev/2012-October/005408.html

Our patch is removing the language file, as it seems that even in SVN trunk it
isn't available anymore. So, let's hope we can remove this patch in the next
upstream release.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2012-10-22 19:57:35 +02:00
Peter Simons 094cbf9b4d Move lxc from "applications/virtualization" to "os-specific/linux". 2012-10-20 12:36:44 +02:00
Peter Simons 04d13e193e lxc: fix documentation build and make version 0.8.0-rc2 the default 2012-10-20 12:11:09 +02:00
Michael Raskin 2867563496 Adding a RC version of LinuX Containers 2012-10-17 23:16:42 +04:00
Eduard Carreras febe086bba Changing copy files to symbolic links to them 2012-10-17 14:11:08 +02:00
Eduard Carreras 28181c15e8 Make virtualbox icons available 2012-10-16 19:35:59 +02:00
Eelco Dolstra 0b056a06a0 VirtualBox-GuestAdditions: Install drivers for X.org server 1.12 2012-10-09 12:42:10 -04:00
aszlig 240cd87eda
virtualbox-guest-additions: Update to 4.2.0.
Tested with a bunch of charon VirtualBox machines.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2012-10-02 03:46:41 +02:00
aszlig 91b26c0e42
virtualbox: Update to 4.2.0.
New major upstream version, changes can be found here:

https://www.virtualbox.org/wiki/Changelog

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2012-10-02 03:46:40 +02:00
aszlig fc87209691
virtualbox/guest-additions: Update to 4.1.22.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2012-09-10 21:37:37 +02:00
aszlig d891fc6f3b
virtualbox: Update to version 4.1.22.
Upstream changes are:

 * VMM: fixed a potential host crash triggered by shutting down a VM when
        another VM was running (only affected 32-bit hosts and 64-bit OS X
        hosts, 4.1 regression)
 * VMM: fixed a potential host crash under a high guest memory pressure (seen
        with Windows 8 guests)
 * VMM: respect RAM preallocation while restoring saved state.
 * VMM: fixed handling of task gates if VT-x/AMD-V is disabled
 * Storage: fixed audio CD passthrough for certain media players
 * USB: don't crash if a USB device is plugged or unplugged when saving or
        loading the VM state (SMP guests only)
 * RTC: fixed a potential corruption of CMOS bank 1
 * Mac OS X hosts: installer fixes for Leopard (4.1.20 regression)
 * Windows Additions: fixed memory leak in VBoxTray

Full changelogs with bug ids and links to it can be found at:

https://www.virtualbox.org/wiki/Changelog

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2012-09-10 21:37:36 +02:00
Rob Vermaas 7ea0160fee Merge pull request #93 from oxij/master
Support PCI passthrough in Xen. Add enca package.

Revert of Xen version from 4.1.2 to 4.0.3.
2012-09-02 04:09:25 -07:00
Eelco Dolstra e188f8ec66 virtualbox: Update to 4.1.20 2012-08-22 16:48:03 -04:00
Eelco Dolstra 964880ec8f virtualbox: Drop accidental JDK dependency 2012-08-22 15:55:46 -04:00
aszlig 347e8c32a3 virtualbox: Remove unused variable $srcroot.
Thanks to @shlevy for mentioning this.
2012-08-19 09:02:16 +02:00
aszlig 0f9a5eb027 virtualbox: Add symbol versions to all modules.
Copy all symbol versions from the ones generated in the vboxdrv build.
2012-08-19 09:02:16 +02:00
aszlig 1b8ec2eeec virtualbox: Don't build modules for guests.
We're the host so we don't need the kernel modules for the guest additions, as
they're build with in a separate derivation anyway.
2012-08-19 09:02:15 +02:00
aszlig 9fb1d2e6fc virtualbox: Remove redundant NIX_CFLAGS_COMPILE.
The "include/generated" stuff is already added to the search path by the kernel
modules build system, so no need to hack it in like this.
2012-08-19 09:02:15 +02:00
aszlig 3e62a02b17 virtualbox: Separate modules build and install.
First of all, modules won't install when there is no "make modules" prior to it,
so we're doing this now with a new function called forEachModule, so we can
avoid duplication as much as possible.

In addition this sets $sourcedir to the current directory of the configurePhase,
so we're able to find the source tree later on, after several chdir()s.
2012-08-19 09:02:15 +02:00
aszlig e32d7843da virtualbox: Set depmod path to /do_not_use_depmod.
The scripts/depmod.sh checks whether the path in $DEPMOD is executable and only
executes it if that's the case. So, by setting DEPMOD to "/do_not_use_depmod"
the destination path doesn't exist _and_ thus isn't executable aswell.
2012-08-19 09:02:15 +02:00
aszlig 31d8a9a1f4 virtualbox: Fix wrong path when recursing modules.
The for loop didn't find $curdir, because it was set _after_ the directory has
been changed. The variable is now called $srcroot and is set before the
installPhase is changing directories.
2012-08-19 09:02:15 +02:00
aszlig 830e9db5dd virtualbox: Use Linux's kbuild to build modules.
Don't rely on VirtualBox's in-tree build scripts to set include paths correctly
and use the official way of the Linux kernel to build the modules. That way we
don't need to make ugly symlinks in the kernel tree or heavily patch VirtualBox.
2012-08-19 09:02:14 +02:00
Eelco Dolstra c67c397c11 VirtualBox-GuestAdditions: Add to the channel 2012-08-14 13:43:37 -04:00
Jan Malakhovski da7408e105 xen: Support PCI passthrough.
Previous commit reverted Xen back to 4.0.3 because xend from 4.1.* and newer
hangs for unknown reasons.
The new "xl" toolstack from 4.1.* and unstable works, yet PCI passthrough is not
supported by xl in 4.1.* and is broken in the unstable.

With this patch I was able to passthrough ATI Radeon HD 6950 without 3D
acceleration, though, to both Linux and Windows guests. Which is the best
archived result with Xen PCI passthrough on NixOS after trying out all possible
Xen versions.
Same VGA card works fine if passed through into a guest with KVM (acceleration,
GPGPU, everything works). I should have tried KVM from the start.
2012-08-08 03:16:57 +04:00
Jan Malakhovski bff9f2720f Revert "xen: update to version 4.1.2"
This reverts commit af32fd6ce3.
2012-08-08 02:30:25 +04:00
Joachim Schiele 538b17a791 fixed most virt-manager issues! 2012-07-20 23:27:24 +00:00
Peter Simons fd749dd9bf Merge pull request #32 from peti/xen-update
Xen for Linux 3.2
2012-07-16 02:27:23 -07:00