public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* iotop: don't use pythonFull.

Browse Source 
svn path=/nixpkgs/branches/modular-python/; revision=26567
This commit is contained in:
Eelco Dolstra 2011-03-28 13:23:52 +00:00
parent f119c267de
commit 60c787522f
2 changed files with 17 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
pkgs/os-specific/linux/iotop/default.nix
View File

@ -1,46 +1,23 @@
x@{builderDefsPackage { stdenv, fetchurl, buildPythonPackage, pythonPackages }:
, python, makeWrapper
, ...}:
builderDefsPackage
(a :
let
helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++
[];
buildInputs = map (n: builtins.getAttr n x) buildPythonPackage rec {
(builtins.attrNames (builtins.removeAttrs x helperArgNames)); name = "iotop-0.4.1";
sourceInfo = rec { namePrefix = "";
baseName="iotop";
version="0.4.1"; src = fetchurl {
name="${baseName}-${version}"; url = "http://guichaz.free.fr/iotop/files/${name}.tar.bz2";
url="http://guichaz.free.fr/${baseName}/files/${name}.tar.bz2"; sha256 = "1dfvw3khr2rvqllvs9wad9ca3ld4i7szqf0ibq87rn36ickrf3ll";
hash="1dfvw3khr2rvqllvs9wad9ca3ld4i7szqf0ibq87rn36ickrf3ll";
};
in
rec {
src = a.fetchurl {
url = sourceInfo.url;
sha256 = sourceInfo.hash;
}; };
inherit (sourceInfo) name version; propagatedBuildInputs = [ pythonPackages.curses ];
inherit buildInputs;
phaseNames = ["installPythonPackage" "wrapBinContentsPython"]; doCheck = false;
#installCommand = "python setup.py install --prefix=\"\$prefix\"";
meta = { meta = {
description = "A tool to find out the processes doing the most IO"; description = "A tool to find out the processes doing the most IO";
maintainers = with a.lib.maintainers; maintainers = [ stdenv.lib.maintainers.raskin ];
[ platforms = stdenv.lib.platforms.linux;
raskin
];
platforms = with a.lib.platforms;
linux;
}; };
passthru = { }
updateInfo = {
downloadPage = "http://guichaz.free.fr/iotop/";
};
};
}) x

4
pkgs/top-level/all-packages.nix
View File

@ -4692,9 +4692,7 @@ let
ifplugd = callPackage ../os-specific/linux/ifplugd { }; ifplugd = callPackage ../os-specific/linux/ifplugd { };
iotop = callPackage ../os-specific/linux/iotop { iotop = callPackage ../os-specific/linux/iotop { };
python = pythonFull;
};
iproute = callPackage ../os-specific/linux/iproute { }; iproute = callPackage ../os-specific/linux/iproute { };