diff --git a/pkgs/os-specific/linux/ext3cow-tools/builder.sh b/pkgs/os-specific/linux/ext3cow-tools/builder.sh deleted file mode 100755 index 560b8d6723a..00000000000 --- a/pkgs/os-specific/linux/ext3cow-tools/builder.sh +++ /dev/null @@ -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 - -ensureDir $out/bin/ -cp ss $out/bin/snapshot -cp tt $out/bin/ -cp e2d $out/bin/ diff --git a/pkgs/os-specific/linux/ext3cow-tools/default.nix b/pkgs/os-specific/linux/ext3cow-tools/default.nix deleted file mode 100644 index 9b776de86ce..00000000000 --- a/pkgs/os-specific/linux/ext3cow-tools/default.nix +++ /dev/null @@ -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 !!!! diff --git a/pkgs/tools/package-management/snix/default.nix b/pkgs/tools/package-management/snix/default.nix deleted file mode 100644 index c8a13944d5b..00000000000 --- a/pkgs/tools/package-management/snix/default.nix +++ /dev/null @@ -1,44 +0,0 @@ -{ stdenv, fetchurl, aterm, db4, perl, curl, bzip2, openssl ? null - -, ext3cowtools, e3cfsprogs, rsync -, libtool, automake, autoconf -, flex, bison - -, docbook5, docbook5_xsl, libxslt, docbook_xml_dtd_43, w3m - -, ext3cow_kernel - -, storeDir ? "/nix/store" -, stateDir ? "/nix/var" -, nixStoreStateDir ? "/nix/state" -}: - -stdenv.mkDerivation { - name = "snix-0.12rev10946"; - - src = fetchurl { - url = http://www.denbreejen.net/public/nix/snix-20080304-rev10948.tar.gz; - sha256 = "6973f080be8a32f1fc9b109f7f180b2bbd4e9e246721de9247378e49c6a70ef4"; - }; - - buildInputs = [perl curl openssl rsync libtool automake autoconf flex bison - docbook5 docbook5_xsl libxslt docbook_xml_dtd_43 w3m ]; - - preConfigure = " - ./bootstrap.sh - "; - - configureFlags = " - --with-store-dir=${storeDir} --localstatedir=${stateDir} - --with-aterm=${aterm} --with-bdb=${db4} --with-bzip2=${bzip2} - --disable-init-state - --with-store-state-dir=${nixStoreStateDir} - --with-ext3cow-header=${ext3cow_kernel}/lib/modules/2.*/build/include/linux/ext3cow_fs.h - --with-rsync=${rsync}/bin/rsync"; - - meta = { - description = "The SNix Deployment System (Nix extended to handle state)"; - homepage = http://nixos.org/; - license = "LGPL"; - }; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 77556a2a8c1..4b6d9a3dee7 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5891,7 +5891,7 @@ let wis_go7007 = callPackage ../os-specific/linux/wis-go7007 { }; - kqemu = builderDefsPackage ../os-specific/linux/kqemu/1.4.0pre1.nix { + kqemu = builderDefsPackage ../os-specific/linux/kqemu { inherit kernel perl; }; @@ -5902,10 +5902,6 @@ let splashutils = if kernel.features ? fbConDecor then pkgs.splashutils else null; - ext3cowtools = callPackage ../os-specific/linux/ext3cow-tools { - kernel_ext3cowpatched = kernel; - }; - /* compiles but has to be integrated into the kernel somehow Let's have it uncommented and finish it.. */ @@ -5917,15 +5913,6 @@ let perf = callPackage ../os-specific/linux/kernel/perf.nix { }; - # State Nix - snix = callPackage ../tools/package-management/snix { - - aterm = aterm25; - db4 = db45; - - flex = flex2533; - ext3cow_kernel = kernel; }; - sysprof = callPackage ../development/tools/profiling/sysprof { inherit (gnome) gtk glib pango libglade; };