diff options
author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2008-08-08 11:49:06 +0000 |
---|---|---|
committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2008-08-08 11:49:06 +0000 |
commit | d4f7a93f31638e50261262285bcb6efa1e98ace2 (patch) | |
tree | 8a77a2b5fd9bc58e6c183fd62eb007cd7de7598b /pkgs/os-specific/linux/kvm | |
parent | aaba3d24404866042e04723e4f4d18e768957d38 (diff) |
* KVM 72, plus stable 2.6.26 kernel headers (needed for KVM).
svn path=/nixpkgs/trunk/; revision=12541
Diffstat (limited to 'pkgs/os-specific/linux/kvm')
-rw-r--r-- | pkgs/os-specific/linux/kvm/70.nix | 38 | ||||
-rw-r--r-- | pkgs/os-specific/linux/kvm/72.nix (renamed from pkgs/os-specific/linux/kvm/69.nix) | 6 |
2 files changed, 3 insertions, 41 deletions
diff --git a/pkgs/os-specific/linux/kvm/70.nix b/pkgs/os-specific/linux/kvm/70.nix deleted file mode 100644 index ae7a1823596b7..0000000000000 --- a/pkgs/os-specific/linux/kvm/70.nix +++ /dev/null @@ -1,38 +0,0 @@ -{stdenv, fetchurl, kernelHeaders, zlib, e2fsprogs, SDL, alsaLib, pkgconfig, rsync}: - -assert stdenv.isLinux; - -stdenv.mkDerivation { - name = "kvm-70"; - - src = fetchurl { - url = mirror://sourceforge/kvm/kvm-70.tar.gz; - sha256 = "16953f6z9f8hlvpmikwwn1n9k96zywq2wfj36xighwqkbvbdrlx0"; - }; - - patches = [ - # Allow setting the path to Samba through $QEMU_SMBD_COMMAND. - ./smbd-path.patch - # The makefile copies stuff from the kernel directory and then - # tries to modify the copy, but it must be made writable first. - ./readonly-kernel.patch - ]; - - configureFlags = "--with-patched-kernel --kerneldir=${kernelHeaders}"; - - # e2fsprogs is needed for libuuid. - # rsync is a weird dependency used for copying kernel header files. - buildInputs = [zlib e2fsprogs SDL alsaLib pkgconfig rsync]; - - preConfigure = '' - for i in configure user/configure; do - substituteInPlace $i --replace /bin/bash $shell - done - substituteInPlace libkvm/Makefile --replace kvm_para.h kvm.h # !!! quick hack - ''; - - meta = { - homepage = http://kvm.qumranet.com/; - description = "A full virtualization solution for Linux on x86 hardware containing virtualization extensions"; - }; -} diff --git a/pkgs/os-specific/linux/kvm/69.nix b/pkgs/os-specific/linux/kvm/72.nix index b8a6989458796..324bc24fc430e 100644 --- a/pkgs/os-specific/linux/kvm/69.nix +++ b/pkgs/os-specific/linux/kvm/72.nix @@ -3,11 +3,11 @@ assert stdenv.isLinux; stdenv.mkDerivation { - name = "kvm-69"; + name = "kvm-72"; src = fetchurl { - url = mirror://sourceforge/kvm/kvm-69.tar.gz; - sha256 = "05zkzw81lk5ap99vi0jqs6lyp13gapyi1046zgjmjm19q4xzsjz4"; + url = mirror://sourceforge/kvm/kvm-72.tar.gz; + sha256 = "1f28nbb7bkyq0h3a9ph4aha5qibs2p1ll61ydcf95c71blqdfh2h"; }; patches = [ |