JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
25,432 Commits 2 Branches 0 Tags 12 GiB
07bee4ac0a
Commit Graph

53 Commits

Author SHA1 Message Date
Eelco Dolstra
674c51af3c Merge remote-tracking branch 'origin/master' into stdenv-updates 2013-03-07 19:33:52 +01:00
Mathijs Kwik
91c327fb28 qemu-kvm: string concatenation fix 2013-03-04 22:40:22 +01:00
Vladimír Čunát
d7abc31f5a fix the last master merge, sorry for the problems 
Now I carefully re-merged all the conflicts and tested some builds.
Hopefully it's all OK now.
 2013-03-02 22:34:37 +01: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
Peter Simons
b6d0d176f2 qemu-kvm: enable regression test suite 2013-02-27 14:34:49 +01:00
Peter Simons
2d375c3f5f qemu-kvm: provide a proper path to the python interpreter 2013-02-27 14:34:49 +01:00
Peter Simons
97a2eb24d4 qemu-kvm: re-use 'patchShebangs' function to fix script paths 2013-02-27 14:34:49 +01:00
Peter Simons
d336909d9f qemu-kvm: enable documentation build 
... and rename the 'postPatch' hook to 'patchPhase'.
 2013-02-27 14:34:48 +01:00
Shea Levy
0489661dd1 qemu-kvm/fix-librt-check.patch: Replace with fix from upstream qemu.git 2013-02-15 11:33:59 -05:00
Shea Levy
8d245dc3d9 qemu-kvm: Fix check for librt 2013-02-15 11:07:27 -05:00
Eelco Dolstra
2a8e532e0a qemu-kvm: Update to 1.2.0 
This time it will work for sure!
 2012-09-25 17:30:43 -04:00
Eelco Dolstra
696206c405 Rename spiceProtocol -> spice_protocol 2012-09-13 11:36:34 -04:00
Mathijs Kwik
fadaad6f89 qemu-kvm: add (optional) spice support 2012-08-29 22:27:39 +02:00
Lluís Batlle i Rossell
9b1c34f8f2 qemu-kvm: Revert the qemu update to 1.1.1 
This reverts commit 607c28ea38
and c43f385e67.

Some builds hang, as they did with 1.1.0.
http://hydra.nixos.org/build/2963125
 2012-08-23 00:07:51 +02:00
Lluís Batlle i Rossell
607c28ea38 qemu-kvm: I missed a change present in a previous reverted update 
Eelco pointed it out.
 2012-08-22 23:27:58 +02:00
Lluís Batlle i Rossell
c43f385e67 qemu-kvm: update to 1.1.1 2012-08-22 23:20:57 +02:00
Eelco Dolstra
9abd2194ce Revert "qemu-kvm: update to 1.1.0" 
This reverts commit df645c22cc.

KVM 1.1.0 breaks several VM builds.  The NixOS installer tests hang:

  http://hydra.nixos.org/build/2763935

but worse, some builds give random failures indicating corruption:

  http://hydra.nixos.org/build/2776221
  http://hydra.nixos.org/build/2776180
  http://hydra.nixos.org/build/2769347
  http://hydra.nixos.org/build/2769337
 2012-07-08 18:42:55 -04:00
Eelco Dolstra
df645c22cc qemu-kvm: update to 1.1.0 2012-07-05 12:55:50 -04:00
Lluís Batlle i Rossell
472808c5f9 Adding mesa and libaio to qemu-kvm. As for libaio, I think it runs much better for IO for me. 
svn path=/nixpkgs/trunk/; revision=34254
 2012-05-28 09:13:30 +00:00
Eelco Dolstra
d0300a2776 * Switch to QEMU/KVM 1.0.1. 
svn path=/nixpkgs/trunk/; revision=33878
 2012-04-22 16:30:27 +00:00
Eelco Dolstra
f92ee1a13d * QEMU/KVM 1.0.1. Will make this the default if it looks stable. 
svn path=/nixpkgs/trunk/; revision=33847
 2012-04-19 18:39:58 +00:00
Ludovic Courtès
c67edd454c QEMU-KVM 1.0 (tentative). 
svn path=/nixpkgs/trunk/; revision=32637
 2012-02-27 23:25:54 +00:00
Ludovic Courtès
e3a27acfdb QEMU-KVM: Use `smbd' from $PATH. 
svn path=/nixpkgs/trunk/; revision=32634
 2012-02-27 21:54:33 +00:00
Eelco Dolstra
f0197c653e * Backport a fix to qemu-kvm to prevent "qemu-img convert" from 
creating corrupt VirtualBox images.
  (https://bugs.launchpad.net/qemu/+bug/919242)

svn path=/nixpkgs/trunk/; revision=32560
 2012-02-25 17:34:21 +00:00
Eelco Dolstra
54951e3994 * QEMU/KVM updated to 0.15.1. 
svn path=/nixpkgs/trunk/; revision=29918
 2011-10-19 20:41:15 +00:00
Cillian de Roiste
4c3642403c Adding attr as a buildInput to enable support for VirtFS (Plan 9 folder sharing over Virtio - I/O virtualization framework) 
svn path=/nixpkgs/trunk/; revision=29551
 2011-10-01 14:15:47 +00:00
Eelco Dolstra
41f39c4a22 * qemu-kvm updated to 0.15.0. 
svn path=/nixpkgs/trunk/; revision=28876
 2011-08-29 13:39:25 +00:00
Eelco Dolstra
49d38b9b99 * qemu-kvm: use ALSA instead of OSS. 
svn path=/nixpkgs/branches/kde-4.7/; revision=27828
 2011-07-18 15:28:51 +00:00
Ludovic Courtès
0c0f4d5eac QEMU-KVM: Add ncurses support. 
svn path=/nixpkgs/trunk/; revision=27491
 2011-06-17 21:23:12 +00:00
Eelco Dolstra
52f40b180d * qemu-kvm updated to 0.14.1. 
svn path=/nixpkgs/trunk/; revision=27394
 2011-06-08 10:33:26 +00:00
Eelco Dolstra
f0295b4771 * Enable JPEG and PNG support in qemu-kvm's VNC implementation. 
svn path=/nixpkgs/trunk/; revision=27243
 2011-05-13 12:10:33 +00:00
Eelco Dolstra
5b1ee7a0da * qemu-kvm: install a symlink "qemu-kvm" to "qemu-system-x86_64". 
Libvirt (and Nova) expects this.

svn path=/nixpkgs/branches/modular-python/; revision=26625
 2011-03-31 11:57:02 +00:00
Eelco Dolstra
df45fa18bb * qemu-kvm updated to 0.14.0. 
svn path=/nixpkgs/trunk/; revision=26101
 2011-02-24 16:25:10 +00:00
Eelco Dolstra
ac677a524b * Build QEMU/KVM with VDE support. 
svn path=/nixpkgs/trunk/; revision=25528
 2011-01-12 19:06:30 +00:00
Eelco Dolstra
adce9ff2d1 * qemu-kvm updated to 0.13.0. Removed the Unix domain socket patch 
because we don't need it anymore.

svn path=/nixpkgs/trunk/; revision=24351
 2010-10-18 18:47:05 +00:00
Eelco Dolstra
370f15acf3 * qemu-kvm 0.12.5. 
svn path=/nixpkgs/trunk/; revision=22804
 2010-07-29 08:41:25 +00:00
Eelco Dolstra
1d4fb3340e * qemu-kvm updated to 0.12.4. 
svn path=/nixpkgs/trunk/; revision=21913
 2010-05-20 11:18:52 +00:00
Eelco Dolstra
d2f598122c * qemu-kvm updated to 0.12.3. 
svn path=/nixpkgs/trunk/; revision=20489
 2010-03-09 12:53:42 +00:00
Eelco Dolstra
41e5edb0b3 * qemu-kvm: link against libuuid. 
svn path=/nixpkgs/trunk/; revision=19757
 2010-02-01 18:44:08 +00:00
Eelco Dolstra
b22880b12d * qemu-kvm: increase the size of the buffer used to build the smbd 
command line.

svn path=/nixpkgs/trunk/; revision=19756
 2010-02-01 18:11:53 +00:00
Eelco Dolstra
f719b5268e * qemu-kvm: honour $TMPDIR for the qemu-smb temporary directory. This 
ensures that Nix cleans up the qemu-smb directory after a VM test
  run (which prevents failures like this one:
  http://hydra.nixos.org/build/275355/nixlog/31/raw).

svn path=/nixpkgs/trunk/; revision=19747
 2010-02-01 15:12:49 +00:00
Eelco Dolstra
bd14a5d297 * qemu-kvm 0.12.2. 
svn path=/nixpkgs/trunk/; revision=19705
 2010-01-27 10:51:23 +00:00
Eelco Dolstra
3f255b35cd * qemu-kvm updated to 0.12.1.2. 
svn path=/nixpkgs/trunk/; revision=19192
 2010-01-03 19:36:32 +00:00
Eelco Dolstra
a6d31beba7 * qemu-kvm updated to 0.11.1. 
svn path=/nixpkgs/branches/kernel-config/; revision=18943
 2009-12-14 18:30:36 +00:00
Eelco Dolstra
9bc85fda47 * qemu-kvm 0.11.0. 
svn path=/nixpkgs/trunk/; revision=17468
 2009-09-28 14:28:20 +00:00
Eelco Dolstra
daceb23a25 * qemu-kvm 0.11.0rc2. 
svn path=/nixpkgs/trunk/; revision=16995
 2009-09-09 15:44:14 +00:00
Eelco Dolstra
b67e9a0415 * qemu-kvm unix domain patch: when accepting a connection, initialise 
the remote address / port to something sensible.  Otherwise
  simultaneous connections to the same guest port don't work properly.

svn path=/nixpkgs/trunk/; revision=16805
 2009-08-21 15:40:32 +00:00
Eelco Dolstra
c7eb810826 * haddr -> hport. 
svn path=/nixpkgs/trunk/; revision=16804
 2009-08-21 14:26:46 +00:00
Eelco Dolstra
098626dc86 * hport is in network order, so it needs to be converted back to host 
order...
* Remove the socket file automatically.

svn path=/nixpkgs/trunk/; revision=16602
 2009-08-07 09:54:03 +00:00
Eelco Dolstra
2ae0060bde * qemu-kvm: a quick hack to support connecting a Unix domain socket on 
the host to a TCP port on the guest.  This will be useful for
  automated testing using QEMU virtual machines.  Using TCP ports on
  the host is insecure and hard to manage (since you need to pick an
  available host port).

  For example:

    $ qemu-system-x86_64 ... -redir tcp:65535::514

  creates a Unix domain socket `./65535.socket' on the host.  (There
  is no proper syntax yet, so as a hack all host "ports" above 0xff00
  are treated in this way.)  Connections to that socket are then
  forwarded to TCP port 514 on the guest.  So the guest can do

    $ nc -l -p 514 -e /bin/sh

  to execute a shell for incoming connections on port 514, and then
  the host can do

    $ socat stdio ./65535.socket

  to run a shell on the guest.

svn path=/nixpkgs/trunk/; revision=16593
 2009-08-05 17:26:39 +00:00