diff --git a/pkgs/tools/misc/bmon/default.nix b/pkgs/tools/misc/bmon/default.nix new file mode 100644 index 00000000000..29a6db4e6d2 --- /dev/null +++ b/pkgs/tools/misc/bmon/default.nix @@ -0,0 +1,25 @@ +{ stdenv, fetchurl, pkgconfig, ncurses, confuse, libnl }: + +stdenv.mkDerivation { + name = "bmon-3.1"; + + src = fetchurl { + url = http://www.carisma.slowglass.com/~tgr/bmon/files/bmon-3.1.tar.gz; + sha256 = "005ib7c3g3cva0rdwsgl6hfakxd5yp88sf4bjxb6iarcm3ax18ky"; + }; + + buildInputs = [ pkgconfig ncurses confuse libnl ]; + + meta = with stdenv.lib; { + description = "Network bandwidth monitor"; + homepage = http://www.carisma.slowglass.com/~tgr/bmon/; + # Neither the homepage nor the source archive has license info, but in the + # latest git version there is a LICENSE file that is the 2-clause BSD + # license. + # - https://github.com/tgraf/bmon/blob/master/LICENSE + # - http://opensource.org/licenses/BSD-2-Clause + license = licenses.bsd2; + platforms = platforms.linux; + maintainers = [ maintainers.bjornfor ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 343b394ffe4..6678b0abc23 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -503,6 +503,8 @@ let bfr = callPackage ../tools/misc/bfr { }; + bmon = callPackage ../tools/misc/bmon { }; + boomerang = callPackage ../development/tools/boomerang { }; bootchart = callPackage ../tools/system/bootchart { }; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 3444045b147..1cd743e5122 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -3473,6 +3473,17 @@ pythonPackages = python.modules // rec { }; }; + plumbum = buildPythonPackage rec { + name = "plumbum-1.2.0"; + + buildInputs = [ pythonPackages.six ]; + + src = fetchurl { + url = "https://pypi.python.org/packages/source/p/plumbum/plumbum-1.2.0.tar.gz"; + md5 = "18b7f888dfaf62a48df937abffe07897"; + }; + }; + polib = buildPythonPackage rec { name = "polib-${version}";