about summary refs log tree commit diff
path: root/pkgs/os-specific/linux/qemu-kvm/default.nix
diff options
context:
space:
mode:
authorLluís Batlle i Rossell <viric@vicerveza.homeunix.net>2010-10-23 14:52:21 +0000
committerLluís Batlle i Rossell <viric@vicerveza.homeunix.net>2010-10-23 14:52:21 +0000
commit6dc839d3445e66b259361f08838a8c05b1912e68 (patch)
tree5ef88f8fe4cb6f75cf0a1c1e821945c7186491c7 /pkgs/os-specific/linux/qemu-kvm/default.nix
parent4309788df022c89765cd7f6b178f4ce7a08db600 (diff)
parent327a2eae30b48277bd453842d03a144f618822b2 (diff)
downloadnixlib-6dc839d3445e66b259361f08838a8c05b1912e68.tar
nixlib-6dc839d3445e66b259361f08838a8c05b1912e68.tar.gz
nixlib-6dc839d3445e66b259361f08838a8c05b1912e68.tar.bz2
nixlib-6dc839d3445e66b259361f08838a8c05b1912e68.tar.lz
nixlib-6dc839d3445e66b259361f08838a8c05b1912e68.tar.xz
nixlib-6dc839d3445e66b259361f08838a8c05b1912e68.tar.zst
nixlib-6dc839d3445e66b259361f08838a8c05b1912e68.zip
Merging from trunk. I resolved some conflicts; I hope that well.
svn path=/nixpkgs/branches/stdenv-updates/; revision=24429
Diffstat (limited to 'pkgs/os-specific/linux/qemu-kvm/default.nix')
-rw-r--r--pkgs/os-specific/linux/qemu-kvm/default.nix6
1 files changed, 3 insertions, 3 deletions
diff --git a/pkgs/os-specific/linux/qemu-kvm/default.nix b/pkgs/os-specific/linux/qemu-kvm/default.nix
index 69222d5a24d0..ef7153871fd2 100644
--- a/pkgs/os-specific/linux/qemu-kvm/default.nix
+++ b/pkgs/os-specific/linux/qemu-kvm/default.nix
@@ -3,14 +3,14 @@
 assert stdenv.isLinux;
    
 stdenv.mkDerivation rec {
-  name = "qemu-kvm-0.12.5";
+  name = "qemu-kvm-0.13.0";
    
   src = fetchurl {
     url = "mirror://sourceforge/kvm/${name}.tar.gz";
-    sha256 = "0gsqmws24s96g1h0z2m8r28pyv08wnzh5jip925ym167rfp8bh14";
+    sha256 = "0lxym4p2bvqcb37h3wbjd81w4jrj4dn5kivdxcpx27iwgq6n1ckd";
   };
 
-  patches = [ ./unix-domain.patch ./smb-tmpdir.patch ];
+  patches = [ ./smb-tmpdir.patch ];
 
   buildInputs = [ zlib SDL alsaLib pkgconfig pciutils libuuid ];