5 files changed, 99 insertions, 7 deletions
diff --git a/pkgs/os-specific/linux/ati-drivers/default.nix b/pkgs/os-specific/linux/ati-drivers/default.nix
index db25bebb06c91..248e24c90bdb1 100644
--- a/pkgs/os-specific/linux/ati-drivers/default.nix
+++ b/pkgs/os-specific/linux/ati-drivers/default.nix
@@ -21,7 +21,7 @@ in
 
 stdenv.mkDerivation rec {
   name = "ati-drivers-${version}";
-  version = "10-10-x86";
+  version = "10-11-x86";
 
   builder = ./builder.sh;
 
@@ -30,8 +30,8 @@ stdenv.mkDerivation rec {
   src =
     assert stdenv.system == "x86_64-linux";
   fetchurl {
-    url = https://a248.e.akamai.net/f/674/9206/0/www2.ati.com/drivers/linux/ati-driver-installer-10-10-x86.x86_64.run;
-    sha256 = "1g71sj8qbarshw3hfds2v6y9q7lma3d36d0x79c7vvgllcd5c76x";
+    url = https://a248.e.akamai.net/f/674/9206/0/www2.ati.com/drivers/linux/ati-driver-installer-10-11-x86.x86_64.run;
+    sha256 = "1z33w831ayx1j5lm9d1xv6whkmzsz9v8li3s8c96hwnwki6zpimr";
   };
 
   buildInputs = [xlibs.libXext xlibs.libX11
diff --git a/pkgs/os-specific/linux/iotop/default.nix b/pkgs/os-specific/linux/iotop/default.nix
new file mode 100644
index 0000000000000..54a6cf8e457b0
--- /dev/null
+++ b/pkgs/os-specific/linux/iotop/default.nix
@@ -0,0 +1,46 @@
+x@{builderDefsPackage
+  , python, makeWrapper
+  , ...}:
+builderDefsPackage
+(a :  
+let 
+  helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++ 
+    [];
+
+  buildInputs = map (n: builtins.getAttr n x)
+    (builtins.attrNames (builtins.removeAttrs x helperArgNames));
+  sourceInfo = rec {
+    baseName="iotop";
+    version="0.4.1";
+    name="${baseName}-${version}";
+    url="http://guichaz.free.fr/${baseName}/files/${name}.tar.bz2";
+    hash="1dfvw3khr2rvqllvs9wad9ca3ld4i7szqf0ibq87rn36ickrf3ll";
+  };
+in
+rec {
+  src = a.fetchurl {
+    url = sourceInfo.url;
+    sha256 = sourceInfo.hash;
+  };
+
+  inherit (sourceInfo) name version;
+  inherit buildInputs;
+
+  phaseNames = ["installPythonPackage" "wrapBinContentsPython"];
+      
+  meta = {
+    description = "A tool to find out the processes doing the most IO";
+    maintainers = with a.lib.maintainers;
+    [
+      raskin
+    ];
+    platforms = with a.lib.platforms;
+      linux;
+  };
+  passthru = {
+    updateInfo = {
+      downloadPage = "http://guichaz.free.fr/iotop/";
+    };
+  };
+}) x
+
diff --git a/pkgs/os-specific/linux/kernel/linux-2.6.32.nix b/pkgs/os-specific/linux/kernel/linux-2.6.32.nix
index 3466b39972243..a81085fd5e2ef 100644
--- a/pkgs/os-specific/linux/kernel/linux-2.6.32.nix
+++ b/pkgs/os-specific/linux/kernel/linux-2.6.32.nix
@@ -198,11 +198,11 @@ in
 import ./generic.nix (
 
   rec {
-    version = "2.6.32.25";
+    version = "2.6.32.26";
   
     src = fetchurl {
       url = "mirror://kernel/linux/kernel/v2.6/linux-${version}.tar.bz2";
-      sha256 = "1ycri78c335qqmfqxg8c4m03f6gy0q1y35yv7yg2f2m6aqhylh2z";
+      sha256 = "1kpkl5ps8xrwddmn90rzynra49am9rdm37smplhf3w3ifvpc1mf3";
     };
 
     config = configWithPlatform stdenv.platform;
diff --git a/pkgs/os-specific/linux/nfs-utils/default.nix b/pkgs/os-specific/linux/nfs-utils/default.nix
index b651d39b8887d..996965b958038 100644
--- a/pkgs/os-specific/linux/nfs-utils/default.nix
+++ b/pkgs/os-specific/linux/nfs-utils/default.nix
@@ -1,11 +1,11 @@
 { fetchurl, stdenv, tcpWrapper, utillinuxng, libcap }:
 
 stdenv.mkDerivation rec {
-  name = "nfs-utils-1.2.2";
+  name = "nfs-utils-1.2.3";
 
   src = fetchurl {
     url = "mirror://sourceforge/nfs/${name}.tar.bz2";
-    sha256 = "07nhr7ds5ic4x81l9qphrlmi4ifxl28xzr1zpzvg334ncrv2fizx";
+    sha256 = "06gzb4idg6rkr4wpj7lrdmg3zdqiz86j43dygykbyz0987lyqxam";
   };
 
   # Needs `libblkid' and `libcomerr' from `e2fsprogs' or `util-linux-ng'.
diff --git a/pkgs/os-specific/linux/untie/default.nix b/pkgs/os-specific/linux/untie/default.nix
new file mode 100644
index 0000000000000..441f041e6bec9
--- /dev/null
+++ b/pkgs/os-specific/linux/untie/default.nix
@@ -0,0 +1,46 @@
+x@{builderDefsPackage
+  , ...}:
+builderDefsPackage
+(a :  
+let 
+  helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++ 
+    [];
+
+  buildInputs = map (n: builtins.getAttr n x)
+    (builtins.attrNames (builtins.removeAttrs x helperArgNames));
+  sourceInfo = rec {
+    baseName="untie";
+    version="0.3";
+    name="${baseName}-${version}";
+    url="http://guichaz.free.fr/${baseName}/files/${name}.tar.bz2";
+    hash="154c3550af3d3513022a15381bbc2693f5dd7789bf0a4320635991b8f6b3648c";
+  };
+in
+rec {
+  src = a.fetchurl {
+    url = sourceInfo.url;
+    sha256 = sourceInfo.hash;
+  };
+
+  inherit (sourceInfo) name version;
+  inherit buildInputs;
+
+  phaseNames = ["doMakeInstall"];
+  makeFlags=["PREFIX=$out"];
+      
+  meta = {
+    description = "A tool to run processes untied from some of the namespaces";
+    maintainers = with a.lib.maintainers;
+    [
+      raskin
+    ];
+    platforms = with a.lib.platforms;
+      linux;
+  };
+  passthru = {
+    updateInfo = {
+      downloadPage = "http://guichaz.free.fr/untie";
+    };
+  };
+}) x
+