diff --git a/pkgs/applications/graphics/ufraw/default.nix b/pkgs/applications/graphics/ufraw/default.nix
index 21d5c3ada86..09dd51743fc 100644
--- a/pkgs/applications/graphics/ufraw/default.nix
+++ b/pkgs/applications/graphics/ufraw/default.nix
@@ -2,12 +2,12 @@
 , libjpeg, libtiff, cfitsio, exiv2, lcms, gtkimageview }:
 
 stdenv.mkDerivation rec {
-  name = "ufraw-0.16";
+  name = "ufraw-0.18";
 
   src = fetchurl {
     # XXX: These guys appear to mutate uploaded tarballs!
     url = "mirror://sourceforge/ufraw/${name}.tar.gz";
-    sha256 = "06fzyd7wyv5ixbmhbsz80pphhbic18d1w8ji0gz38aq1vdmgxw9n";
+    sha256 = "01cjdc748vamjpaw2sbm8a9kwmb2hry4f200j3hlvqg9c6f77zi4";
   };
 
   buildInputs =
diff --git a/pkgs/applications/networking/linphone/default.nix b/pkgs/applications/networking/linphone/default.nix
index c98a8ae4fd9..04e119afdb1 100644
--- a/pkgs/applications/networking/linphone/default.nix
+++ b/pkgs/applications/networking/linphone/default.nix
@@ -1,5 +1,5 @@
-{ stdenv, fetchurl, intltool, pkgconfig, gtk, libglade, libosip, libexosip, speex,
-  readline, ffmpeg, alsaLib, SDL, libv4l, libtheora, libXv }:
+{ stdenv, fetchurl, intltool, pkgconfig, gtk, libglade, libosip, libexosip
+, speex, readline, mediastreamer }:
         
 stdenv.mkDerivation rec {
   name = "linphone-3.5.0";
@@ -9,14 +9,16 @@ stdenv.mkDerivation rec {
     sha256 = "1jrgsyx2mn6y50hjfx79fzqhp42r78cjr63w3bfjdl258zy2f6ix";
   };
 
-  buildInputs = [ intltool gtk libglade libosip libexosip speex readline
-    ffmpeg alsaLib SDL libv4l libtheora libXv ];
+  buildInputs = [ gtk libglade libosip libexosip readline mediastreamer speex ];
 
-  buildNativeInputs = [ pkgconfig ];
+  buildNativeInputs = [ intltool pkgconfig ];
+
+  configureFlags = "--enable-external-ortp --enable-external-mediastreamer";
 
   meta = {
     homepage = http://www.linphone.org/;
     description = "Open Source video SIP softphone";
     license = "GPLv2+";
+    platforms = stdenv.lib.platforms.gnu;
   };
 }
diff --git a/pkgs/desktops/kde-4.7/kdegraphics/libkdcraw.nix b/pkgs/desktops/kde-4.7/kdegraphics/libkdcraw.nix
index 9d31cc763f2..9810a98551e 100644
--- a/pkgs/desktops/kde-4.7/kdegraphics/libkdcraw.nix
+++ b/pkgs/desktops/kde-4.7/kdegraphics/libkdcraw.nix
@@ -1,7 +1,7 @@
-{ kde, kdelibs }:
+{ kde, kdelibs, libjpeg, lcms1 }:
 
 kde {
-  buildInputs = [ kdelibs ];
+  buildInputs = [ kdelibs libjpeg lcms1 ];
 
   meta = {
     description = "Library for decoding RAW images";
diff --git a/pkgs/development/libraries/haskell/happstack/happstack-hamlet.nix b/pkgs/development/libraries/haskell/happstack/happstack-hamlet.nix
index a0ec12802a0..7ebab5feb21 100644
--- a/pkgs/development/libraries/haskell/happstack/happstack-hamlet.nix
+++ b/pkgs/development/libraries/haskell/happstack/happstack-hamlet.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "happstack-hamlet";
-  version = "6.2.3";
-  sha256 = "0k8g0rx9ikfklsrry2hxmm4hxwn31ra004qllpn6aldg6dr2w5n1";
+  version = "6.2.4";
+  sha256 = "1m03r1wk34lx9b2bmcrakcaaq701vcdkw2shxmqwk6fsbgh7qjp0";
   buildDepends = [ hamlet happstackServer text ];
   meta = {
     homepage = "http://www.happstack.com/";
diff --git a/pkgs/development/libraries/mediastreamer/default.nix b/pkgs/development/libraries/mediastreamer/default.nix
index bef82e5085c..3d5dff53ff4 100644
--- a/pkgs/development/libraries/mediastreamer/default.nix
+++ b/pkgs/development/libraries/mediastreamer/default.nix
@@ -1,19 +1,19 @@
 { stdenv, fetchurl, pkgconfig, alsaLib, ffmpeg, speex, ortp, pulseaudio, xorg,
-  libv4l, libtheora }:
+  libv4l, libtheora, intltool, libvpx, gsm }:
 
 stdenv.mkDerivation rec {
-  name = "mediastreamer-2.7.2";
+  name = "mediastreamer-2.8.0";
 
   src = fetchurl {
     url = "mirror://savannah/linphone/mediastreamer/${name}.tar.gz";
-    sha256 = "1w5j5shzd5f7q3l2gm4cl82f3vnrdzp78lcyjbjb416c4vzw2nr2";
+    sha256 = "0h1qda2mjc76xirldlvpmzf57vcbgr113a9b0kw1xm5i58s0w34f";
   };
 
 # TODO: make it load plugins from *_PLUGIN_PATH
-  buildNativeInputs = [pkgconfig];
+  buildNativeInputs = [pkgconfig intltool];
 
   propagatedBuildInputs = [alsaLib ffmpeg speex ortp pulseaudio xorg.libX11
-    xorg.libXv xorg.libXext libv4l libtheora];
+    xorg.libXv xorg.libXext libv4l libtheora libvpx gsm ];
 
 #patches = [ ./h264.patch ./plugins.patch ];
 
diff --git a/pkgs/development/libraries/vigra/default.nix b/pkgs/development/libraries/vigra/default.nix
index 5b3b119cb1d..93ed2869d0e 100644
--- a/pkgs/development/libraries/vigra/default.nix
+++ b/pkgs/development/libraries/vigra/default.nix
@@ -1,13 +1,15 @@
-{ stdenv, fetchurl, cmake, libtiff, libpng, libjpeg, doxygen, python, fftw }:
-stdenv.mkDerivation {
-  name = "vigra-1.7.0";
+{ stdenv, fetchurl, cmake, libtiff, libpng, libjpeg, doxygen, python,
+  fftw, fftwSinglePrec, hdf5, boost, numpy }:
+stdenv.mkDerivation rec {
+  name = "vigra-1.8.0";
 
   src = fetchurl {
-    url = http://hci.iwr.uni-heidelberg.de/vigra/vigra-1.7.0-src.tar.gz;
-    sha256 = "1laf9p0h35xpzs98yd13alm17gh40sn9b7z01ylcja4g7p3a3hs4";
+    url = "${meta.homepage}/${name}-src.tar.gz";
+    sha256 = "0542qy1bqaq73l7i8aqdhwdbhd6m1wldsn1w2sfyf8yf4398ffpw";
   };
 
-  buildInputs = [ cmake fftw libtiff libpng libjpeg doxygen python ];
+  buildInputs = [ cmake fftw fftwSinglePrec libtiff libpng libjpeg python boost
+    numpy hdf5 ];
 
   cmakeFlags = if (stdenv.system == "x86_64-linux") then
       "-DCMAKE_CXX_FLAGS=-fPIC -DCMAKE_C_FLAGS=-fPIC"
diff --git a/pkgs/development/tools/haskell/cabal2nix/default.nix b/pkgs/development/tools/haskell/cabal2nix/default.nix
index 52f39939530..a81b8fd7891 100644
--- a/pkgs/development/tools/haskell/cabal2nix/default.nix
+++ b/pkgs/development/tools/haskell/cabal2nix/default.nix
@@ -2,13 +2,13 @@
 
 cabal.mkDerivation (self: {
   pname = "cabal2nix";
-  version = "1.26";
-  sha256 = "18gl75y1grhzyhlaz32800gxxfrcl01r7cpx1c63lzpwmdxvk01d";
+  version = "1.27";
+  sha256 = "1s9gbnzx2wcrp9gg0vdpcv61jmv44hmilb5rj4ighnbfv7kv365z";
   isLibrary = false;
   isExecutable = true;
   buildDepends = [ Cabal filepath hackageDb HTTP mtl regexPosix ];
   meta = {
-    homepage = "http://github.com/haskell4nix/cabal2nix";
+    homepage = "http://github.com/NixOS/cabal2nix";
     description = "Convert Cabal files into Nix build instructions";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
diff --git a/pkgs/development/tools/misc/coccinelle/default.nix b/pkgs/development/tools/misc/coccinelle/default.nix
index 276c3bd1ed0..ce3eb9cf5ec 100644
--- a/pkgs/development/tools/misc/coccinelle/default.nix
+++ b/pkgs/development/tools/misc/coccinelle/default.nix
@@ -34,6 +34,10 @@ stdenv.mkDerivation rec {
          --prefix "LD_LIBRARY_PATH" ":" "$out/lib"                      \
          --prefix "PYTHONPATH" ":" "$out/share/coccinelle/python"
 
+       wrapProgram "$out/bin/spatch.opt"                                \
+         --prefix "LD_LIBRARY_PATH" ":" "$out/lib"                      \
+         --prefix "PYTHONPATH" ":" "$out/share/coccinelle/python"
+
        yes | make test
     '';
 
diff --git a/pkgs/games/warmux/default.nix b/pkgs/games/warmux/default.nix
index 40072ca7dfc..ff2ce6bb819 100644
--- a/pkgs/games/warmux/default.nix
+++ b/pkgs/games/warmux/default.nix
@@ -1,4 +1,5 @@
 x@{builderDefsPackage
+  , zlib
   , curl, gnutls, fribidi, libpng, SDL, SDL_gfx, SDL_image, SDL_mixer
   , SDL_net, SDL_ttf, libunwind, libX11, xproto, libxml2, pkgconfig
   , gettext, intltool, libtool, perl
@@ -13,10 +14,10 @@ let
     (builtins.attrNames (builtins.removeAttrs x helperArgNames));
   sourceInfo = rec {
     baseName="warmux";
-    version="11.01";
+    version="11.04.1";
     name="${baseName}-${version}";
     url="http://download.gna.org/${baseName}/${name}.tar.bz2";
-    hash="1f063yaab08gflh4hnd8clb4as41ayfphi4q0cmi8syjiaap2qgh";
+    hash="1vp44wdpnb1g6cddmn3nphc543pxsdhjis52mfif0p2c7qslz73q";
   };
 in
 rec {
@@ -30,7 +31,9 @@ rec {
 
   /* doConfigure should be removed if not needed */
   phaseNames = ["doConfigure" "doMakeInstall"];
-      
+
+  configureFlags = "CFLAGS=\"-include ${zlib}/include/zlib.h\"";
+
   meta = {
     description = "Ballistics turn-based battle game between teams";
     maintainers = with a.lib.maintainers;
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 be6e3d9ce3a..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
-
-mkdir -p $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/networking/dnsmasq/default.nix b/pkgs/tools/networking/dnsmasq/default.nix
index 0390c847acb..89c15b91a1a 100644
--- a/pkgs/tools/networking/dnsmasq/default.nix
+++ b/pkgs/tools/networking/dnsmasq/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "dnsmasq-2.57";
+  name = "dnsmasq-2.59";
 
   src = fetchurl {
     url = "http://www.thekelleys.org.uk/dnsmasq/${name}.tar.gz";
-    sha256 = "1bpq1wsc7cs1nqs7abhn96nxmdncdf7c58987f9kdmi246wcgq62";
+    sha256 = "02s1y5320aiqhcrgzc7c2zs292vidijc156k5w7apzzsk5hfdhdx";
   };
 
   makeFlags = "DESTDIR= BINDIR=$(out)/bin MANDIR=$(out)/man LOCALEDIR=$(out)/share/locale";
diff --git a/pkgs/tools/networking/openresolv/default.nix b/pkgs/tools/networking/openresolv/default.nix
new file mode 100644
index 00000000000..b2831fd4d7b
--- /dev/null
+++ b/pkgs/tools/networking/openresolv/default.nix
@@ -0,0 +1,31 @@
+{ stdenv, fetchurl }:
+
+stdenv.mkDerivation rec {
+  name = "openresolv-3.4.6";
+
+  src = fetchurl {
+    url = "http://roy.marples.name/downloads/openresolv/${name}.tar.bz2";
+    sha256 = "026z4973b0vqp5acr6mn5fyxyc84y4ahg1f8fddh8dph86jcnhba";
+  };
+
+  configurePhase =
+    ''
+      cat > config.mk <<EOF
+      PREFIX=$out
+      SYSCONFDIR=/etc
+      SBINDIR=$out/sbin
+      LIBEXECDIR=$out/libexec/resolvconf
+      VARDIR=/var/run/resolvconf
+      MANDIR=$out/share/man
+      RESTARTCMD="initctl restart \1"
+      EOF
+    '';
+
+  installFlags = "SYSCONFDIR=$(out)/etc";
+
+  meta = { 
+    description = "A program to manage /etc/resolv.conf";
+    homepage = http://roy.marples.name/projects/openresolv;
+    license = "bsd";
+  };
+}
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/tools/text/kdiff3/adjust-docbook-xml-version-to-4.2.patch b/pkgs/tools/text/kdiff3/adjust-docbook-xml-version-to-4.2.patch
deleted file mode 100644
index fdb96176abd..00000000000
--- a/pkgs/tools/text/kdiff3/adjust-docbook-xml-version-to-4.2.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-The DocBook DTD must be 4.2 to validate with KDE 4.5.2.  In the upstream release 0.9.95
-of kdiff3 some languages have index.docbook with the 4.1.2 DTD.  This patch changes
-the version number in the DOCTYPE to 4.2 for these languages.
-
-
-diff -Naur kdiff3-upstream-0.9.95/doc/de/index.docbook kdiff3-0.9.95/doc/de/index.docbook
---- kdiff3-upstream-0.9.95/doc/de/index.docbook	2010-10-18 22:38:40.043252907 -0430
-+++ kdiff3-0.9.95/doc/de/index.docbook	2010-10-18 22:41:05.954329524 -0430
-@@ -1,5 +1,5 @@
- <?xml version="1.0" ?>
--<!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.1.2-Based Variant V1.1//EN" "dtd/kdex.dtd" [
-+<!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN" "dtd/kdex.dtd" [
-   <!ENTITY kdiff3 "<application
- >KDiff3</application
- >">
-diff -Naur kdiff3-upstream-0.9.95/doc/fr/index.docbook kdiff3-0.9.95/doc/fr/index.docbook
---- kdiff3-upstream-0.9.95/doc/fr/index.docbook	2010-10-18 22:38:40.043252907 -0430
-+++ kdiff3-0.9.95/doc/fr/index.docbook	2010-10-18 22:41:05.965408604 -0430
-@@ -1,5 +1,5 @@
- <?xml version="1.0" ?>
--<!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.1.2-Based Variant V1.1//EN" "dtd/kdex.dtd" [
-+<!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN" "dtd/kdex.dtd" [
-   <!ENTITY kdiff3 "<application
- >KDiff3</application
- >">
-diff -Naur kdiff3-upstream-0.9.95/doc/it/index.docbook kdiff3-0.9.95/doc/it/index.docbook
---- kdiff3-upstream-0.9.95/doc/it/index.docbook	2010-10-18 22:38:40.044252773 -0430
-+++ kdiff3-0.9.95/doc/it/index.docbook	2010-10-18 22:41:05.976408528 -0430
-@@ -1,5 +1,5 @@
- <?xml version="1.0" ?>
--<!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.1.2-Based Variant V1.1//EN" "dtd/kdex.dtd" [
-+<!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN" "dtd/kdex.dtd" [
-   <!ENTITY kdiff3 "<application
- >KDiff3</application
- >">
-diff -Naur kdiff3-upstream-0.9.95/doc/nl/index.docbook kdiff3-0.9.95/doc/nl/index.docbook
---- kdiff3-upstream-0.9.95/doc/nl/index.docbook	2010-10-18 22:38:40.043252907 -0430
-+++ kdiff3-0.9.95/doc/nl/index.docbook	2010-10-18 22:41:05.986408860 -0430
-@@ -1,5 +1,5 @@
- <?xml version="1.0" ?>
--<!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.1.2-Based Variant V1.1//EN" "dtd/kdex.dtd" [
-+<!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN" "dtd/kdex.dtd" [
-   <!ENTITY kdiff3 "<application
- >KDiff3</application
- >">
diff --git a/pkgs/tools/text/kdiff3/default.nix b/pkgs/tools/text/kdiff3/default.nix
index a474a036661..d8807bda08b 100644
--- a/pkgs/tools/text/kdiff3/default.nix
+++ b/pkgs/tools/text/kdiff3/default.nix
@@ -1,23 +1,20 @@
-{ stdenv, fetchurl, cmake, qt4, perl, kdelibs, automoc4, phonon, gettext, kde_baseapps }:
+{ stdenv, fetchurl, cmake, kdelibs, gettext }:
 
 stdenv.mkDerivation rec {
-  name = "kdiff3-0.9.95";
+  name = "kdiff3-0.9.96";
   src = fetchurl {
     url = "mirror://sourceforge/kdiff3/${name}.tar.gz";
-    sha256 = "03rg41vdi44wh7kygv46nkzyrirl6qyar901hnlmdwjpi6ycwwh3";
+    sha256 = "14fnflp5ansi7b59h8vn81mb8pdqpbanz0qzyw9sxk2pgp24xrqh";
   };
 
-  # kdebase allows having a konqueror plugin built
-  buildInputs = [ cmake qt4 perl kdelibs automoc4 phonon gettext kde_baseapps ];
-
-  # Adjust the version of the DocBook XML to 4.2 ( so that it validates ).
-  patches = [ ./adjust-docbook-xml-version-to-4.2.patch ];
+  buildInputs = [ kdelibs ];
+  buildNativeInputs = [ cmake gettext ];
 
   meta = {
     homepage = http://kdiff3.sourceforge.net/;
     license = "GPLv2+";
     description = "Compares and merges 2 or 3 files or directories";
-    maintainers = with stdenv.lib.maintainers; [viric];
+    maintainers = with stdenv.lib.maintainers; [viric urkud];
     platforms = with stdenv.lib.platforms; linux;
   };
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 59bb8850c96..9a1cff9f1a9 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -583,9 +583,7 @@ let
     stdenv = overrideInStdenv stdenv [gnumake381];
   };
 
-  dnsmasq = callPackage ../tools/networking/dnsmasq {
-    # TODO i18n can be installed as well, implement it?
-  };
+  dnsmasq = callPackage ../tools/networking/dnsmasq { };
 
   dnstop = callPackage ../tools/networking/dnstop { };
 
@@ -1132,6 +1130,8 @@ let
 
   openobex = callPackage ../tools/bluetooth/openobex { };
 
+  openresolv = callPackage ../tools/networking/openresolv { };
+
   opensc_0_11_7 = callPackage ../tools/security/opensc/0.11.7.nix { };
 
   opensc = opensc_0_11_7;
@@ -4714,7 +4714,9 @@ let
 
   vcdimager = callPackage ../development/libraries/vcdimager { };
 
-  vigra = callPackage ../development/libraries/vigra { };
+  vigra = callPackage ../development/libraries/vigra {
+    inherit (pkgs.pythonPackages) numpy;
+  };
 
   vmime = callPackage ../development/libraries/vmime { };
 
@@ -5890,10 +5892,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..
     */
@@ -5905,15 +5903,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;
     };