svn merge ^/nixpkgs/trunk

svn path=/nixpkgs/branches/stdenv-updates/; revision=32350

pkgs/os-specific/linux/ext3cow-tools/builder.sh

@@ -1,19 +0,0 @@
-source $stdenv/setup
-
-tar -zxvf $src
-cd ext3cow-tools/
-
-echo "Using: $kernel"
-
-kernerlext3cowheader=$(ls $kernel/lib/modules/*/build/include/linux/ext3cow_fs.h)
-
-kernerlext3cowheader_slashed=$(echo $kernerlext3cowheader | sed 's/\//\\\//g')
-
-sed -i "s/linux\/ext3cow_fs.h/$kernerlext3cowheader_slashed/" ext3cow_tools.h		#ugh dirty header rewrite....
-
-make
-
-mkdir -p $out/bin/
-cp ss $out/bin/snapshot
-cp tt $out/bin/
-cp e2d $out/bin/

pkgs/os-specific/linux/ext3cow-tools/default.nix

@@ -1,16 +0,0 @@
-{stdenv, fetchurl, kernel_ext3cowpatched }:
-
-stdenv.mkDerivation {
-  name = "ext3cow-tools";
-  builder = ./builder.sh;
-
-  src = fetchurl {
-    url = http://ext3cow.com/tools/ext3cow-tools.tgz;
-    sha256 = "78f55b19c8eeaa7b8abde63c7d6547b1ac0421a46d826a8d41c049719a3081f2";
-  };
-
-  kernel = kernel_ext3cowpatched;
-}
-
-
-#note that ext3cow requires the ext3cow kernel patch !!!!