Merge from trunk

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

2 files changed, 92 insertions, 0 deletions

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/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
+