Merge branch 'master' into closure-size

Beware that stdenv doesn't build. It seems something more will be needed
than just resolution of merge conflicts.

1 files changed, 24 insertions, 0 deletions

diff --git a/pkgs/tools/system/htop/default.nix b/pkgs/tools/system/htop/default.nix
new file mode 100644
index 0000000000000..9301107d2db99
--- /dev/null
+++ b/pkgs/tools/system/htop/default.nix
@@ -0,0 +1,24 @@
+{ lib, fetchurl, stdenv, ncurses,
+IOKit }:
+
+stdenv.mkDerivation rec {
+  name = "htop-${version}";
+  version = "2.0.1";
+
+  src = fetchurl {
+    sha256 = "0rjn9ybqx5sav7z4gn18f1q6k23nmqyb6yydfgghzdznz9nn447l";
+    url = "http://hisham.hm/htop/releases/${version}/${name}.tar.gz";
+  };
+
+  buildInputs =
+    [ ncurses ] ++
+    lib.optionals stdenv.isDarwin [ IOKit ];
+
+  meta = with stdenv.lib; {
+    description = "An interactive process viewer for Linux";
+    homepage = https://hisham.hm/htop/;
+    license = licenses.gpl2Plus;
+    platforms = with platforms; linux ++ freebsd ++ openbsd ++ darwin;
+    maintainers = with maintainers; [ rob simons relrod nckx ];
+  };
+}