From bcf24b66834755c989941b412a62a5a13ec73c9e Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Thu, 9 Oct 2008 13:33:29 +0000 Subject: [PATCH] * KVM 76. svn path=/nixpkgs/trunk/; revision=13023 --- pkgs/build-support/vm/test.nix | 4 ++-- pkgs/os-specific/linux/kvm/{74.nix => 76.nix} | 6 +++--- pkgs/top-level/all-packages.nix | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) rename pkgs/os-specific/linux/kvm/{74.nix => 76.nix} (88%) diff --git a/pkgs/build-support/vm/test.nix b/pkgs/build-support/vm/test.nix index 2dce01195b78..86357264423c 100644 --- a/pkgs/build-support/vm/test.nix +++ b/pkgs/build-support/vm/test.nix @@ -14,7 +14,7 @@ rec { buildPatchelfRPM = buildRPM { name = "patchelf-rpm"; src = patchelf.src; - diskImage = diskImages.fedora5i386; + diskImage = diskImages.fedora8i386; }; @@ -24,7 +24,7 @@ rec { buildInDebian = runInLinuxImage (stdenv.mkDerivation { name = "deb-compile"; src = nixUnstable.src; - diskImage = diskImages.debian40r3i386; + diskImage = diskImages.debian40i386; memSize = 512; phases = "sysInfoPhase unpackPhase patchPhase configurePhase buildPhase checkPhase installPhase fixupPhase distPhase"; sysInfoPhase = '' diff --git a/pkgs/os-specific/linux/kvm/74.nix b/pkgs/os-specific/linux/kvm/76.nix similarity index 88% rename from pkgs/os-specific/linux/kvm/74.nix rename to pkgs/os-specific/linux/kvm/76.nix index 6d1a15baef81..e438f044c593 100644 --- a/pkgs/os-specific/linux/kvm/74.nix +++ b/pkgs/os-specific/linux/kvm/76.nix @@ -3,11 +3,11 @@ assert stdenv.isLinux; stdenv.mkDerivation { - name = "kvm-74"; + name = "kvm-76"; src = fetchurl { - url = mirror://sourceforge/kvm/kvm-74.tar.gz; - sha256 = "0gnd5r9wb8mar3jh8gv46vdm3qkbgiwzkim5ki67kx3ca71g0m24"; + url = mirror://sourceforge/kvm/kvm-76.tar.gz; + sha256 = "06gf2aic6n0b3fnd9vi0llyydr2w6qnx1k8imm710862xhncpssk"; }; patches = [ diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index fefabfdad4db..943d5db67863 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5418,7 +5418,7 @@ let kernelHeaders = kernelHeaders_2_6_23; }; - kvm74 = import ../os-specific/linux/kvm/74.nix { + kvm76 = import ../os-specific/linux/kvm/76.nix { inherit fetchurl stdenv zlib e2fsprogs SDL alsaLib pkgconfig rsync; kernelHeaders = kernelHeaders_2_6_26; };