Fix the cleanup-induced problems

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

pkgs/development/python-modules/flup/default.nix

@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, python, setuptools }:
+{ stdenv, fetchurl, python, setuptools, ... }:
 
 stdenv.mkDerivation rec {
   name = "flup-r2311";
@@ -10,6 +10,8 @@ stdenv.mkDerivation rec {
 
   buildInputs = [ python setuptools ];
 
+  phaseNames = ["addInputs" "createPythonInstallationTarget" "installPythonPackage"];
+
   meta = {
     description = "FastCGI Python module set";
   };

pkgs/os-specific/linux/kqemu/1.4.0pre1.nix

@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, kernel, perl }:
+{ stdenv, fetchurl, kernel, perl, fullDepEntry, ... }:
 
 stdenv.mkDerivation rec {
   name = "kqemu-1.4.0pre1";
@@ -10,17 +10,19 @@ stdenv.mkDerivation rec {
 
   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 = '' 
+  preConfigure = fullDepEntry ('' 
     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/kern        
+    sed -e 's/memset/mymemset/g; s/memcpy/mymemcpy/g; s/void [*]my/static void *my/g' -i common/kernel.c
     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
-  ''; # */
+  '') ["minInit" "doUnpack"]; 
+
+  phaseNames = ["preConfigure" "doConfigure" "doMakeInstall"];
   
   meta = {
     description = "Kernel module for Qemu acceleration";

pkgs/tools/networking/socat/2.0.0-b3.nix

@@ -1,4 +1,8 @@
 args : with args; 
+let 
+  version = "2.0.0-b3"; 
+  patches = [];
+in
 rec {
   src = /* Here a fetchurl expression goes */
         fetchurl {

pkgs/tools/security/bmrsa/11.nix

@@ -4,7 +4,7 @@ let
   fetchurl = args.fetchurl;
   fullDepEntry = args.fullDepEntry;
 
-  version = lib.attrByPath ["version"] "" args; 
+  version = "11"; 
   buildInputs = with args; [
     unzip
   ];

pkgs/top-level/all-packages.nix

@@ -1375,6 +1375,10 @@ let
     inherit fetchurl stdenv openssl;
   };
 
+  socat2pre = builderDefsPackage ../tools/networking/socat/2.0.0-b3.nix {
+    inherit fetchurl stdenv openssl;
+  };
+
   sudo = import ../tools/security/sudo {
     inherit fetchurl stdenv coreutils pam groff;
   };
@@ -4710,7 +4714,7 @@ let
     inherit fetchurl stdenv python db4;
   };
 
-  flup = import ../development/python-modules/flup {
+  flup = builderDefsPackage ../development/python-modules/flup {
     inherit fetchurl stdenv;
     python = python25;
     setuptools = setuptools.passthru.function {python = python25;};
@@ -5518,8 +5522,8 @@ let
       inherit fetchurl stdenv kernel ncurses fxload;
     };
 
-    kqemu = import ../os-specific/linux/kqemu/1.4.0pre1.nix {
-      inherit fetchurl stdenv kernel perl;
+    kqemu = builderDefsPackage ../os-specific/linux/kqemu/1.4.0pre1.nix {
+      inherit kernel perl;
     };
 
     splashutils =