* Include the kernel version in kernel-specific packages so that they

  can be distinguished in nix-env -qa output.

svn path=/nixpkgs/trunk/; revision=32352

2 files changed, 7 insertions, 47 deletions

diff --git a/pkgs/os-specific/linux/kqemu/1.3.0pre11.nix b/pkgs/os-specific/linux/kqemu/1.3.0pre11.nix
deleted file mode 100644
index d9dc076d92f3..000000000000
--- a/pkgs/os-specific/linux/kqemu/1.3.0pre11.nix
+++ /dev/null
@@ -1,38 +0,0 @@
-args : with args;
-rec {
-  name = "kqemu-"+version;
-  src = fetchurl {
-    url = http://www.nongnu.org/qemu/kqemu-1.3.0pre11.tar.gz;
-    sha256 = "03svg2x52ziglf9r9irf6ziiz8iwa731fk1mdskwdip5jxbyy6jl";
-  };
-
-  buildInputs = [];
-  configureFlags = [''--PREFIx=$out'' ''--kernel-path=$(ls -d ${kernel}/lib/modules/*/build)''];
-  debugStep = fullDepEntry (''
-  	cat config-host.mak
-  '') ["minInit"];
-  preConfigure = fullDepEntry ('' 
-    sed -e 's/`uname -r`/'"$(basename ${kernel}/lib/modules/*)"'/' -i install.sh
-    sed -e '/kernel_path=/akernel_path=$out$kernel_path' -i install.sh
-    sed -e '/depmod/d' -i install.sh
-    cat install.sh
-    sed -e '/linux\/ioctl.h/a#include <linux\/sched.h>' -i kqemu-linux.c
-  '') ["minInit" "doUnpack"];
-  fixInc = {
-    text = ''
-      sed -e '/#include/i#include <linux/sched.h>' -i kqemu-linux.c
-    '';
-    deps = ["minInit" "doUnpack"];
-  };
-  fixMemFunc = {
-    text=''
-      sed -e 's/memset/mymemset/g; s/memcpy/mymemcpy/g; s/void [*]my/static void *my/g' -i common/kernel.c
-    '';
-    deps = ["minInit" "doUnpack"];
-  };
-  phaseNames = ["fixInc" "fixMemFunc" "preConfigure" "doConfigure" "debugStep" "doMakeInstall"];
-
-  meta = {
-    description = "Kernel module for Qemu acceleration";
-  }; 
-}
diff --git a/pkgs/os-specific/linux/kqemu/1.4.0pre1.nix b/pkgs/os-specific/linux/kqemu/default.nix
index a24e65b378f3..c703ca4e4a43 100644
--- a/pkgs/os-specific/linux/kqemu/1.4.0pre1.nix
+++ b/pkgs/os-specific/linux/kqemu/default.nix
@@ -1,18 +1,18 @@
-{ stdenv, fetchurl, kernel, perl, fullDepEntry, ... }:
+{ stdenv, fetchurl, kernel, perl }:
 
 stdenv.mkDerivation rec {
-  name = "kqemu-1.4.0pre1";
+  name = "kqemu-1.4.0pre1-${kernel.version}";
   
   src = fetchurl {
     url = "http://www.nongnu.org/qemu/${name}.tar.gz";
     sha256 = "14dlmawn3gia1j401ag5si5k1a1vav7jpv86rl37p1hwmr7fihxs";
   };
 
-  buildInputs = [perl];
+  buildInputs = [ perl ];
   
-  configureFlags = [''--PREFIX=$out'' ''--kernel-path=$(ls -d ${kernel}/lib/modules/*/build)''];
+  configureFlags = [ ''--PREFIX=$out'' ''--kernel-path=$(ls -d ${kernel}/lib/modules/*/build)'' ];
   
-  preConfigure = fullDepEntry ('' 
+  preConfigure = '' 
     sed -e '/#include/i#include <linux/sched.h>' -i kqemu-linux.c
 
     sed -e 's/memset/mymemset/g; s/memcpy/mymemcpy/g; s/void [*]my/static void *my/g' -i common/kernel.c
@@ -20,11 +20,9 @@ stdenv.mkDerivation rec {
     sed -e '/kernel_path=/akernel_path=$out$kernel_path' -i install.sh
     sed -e '/depmod/d' -i install.sh
     cat install.sh
-  '') ["minInit" "doUnpack"]; 
+  '';
 
-  phaseNames = ["preConfigure" "doConfigure" "doMakeInstall"];
-  
   meta = {
-    description = "Kernel module for Qemu acceleration";
+    description = "Kernel module for QEMU acceleration";
   }; 
 }