From d9e60e4d43ae21dbd63b76cf86edcc8f56c4d764 Mon Sep 17 00:00:00 2001
From: zimbatm <zimbatm@zimbatm.com>
Date: Sat, 19 Mar 2016 22:18:53 +0000
Subject: htop: merge both implementations

htop 2.0+ is now cross-platform
---
 pkgs/tools/system/htop/default.nix | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)
 create mode 100644 pkgs/tools/system/htop/default.nix

(limited to 'pkgs/tools/system/htop/default.nix')

diff --git a/pkgs/tools/system/htop/default.nix b/pkgs/tools/system/htop/default.nix
new file mode 100644
index 0000000000000..9c05c07c052cd
--- /dev/null
+++ b/pkgs/tools/system/htop/default.nix
@@ -0,0 +1,21 @@
+{ fetchurl, stdenv, ncurses }:
+
+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 ];
+
+  meta = with stdenv.lib; {
+    description = "An interactive process viewer for Linux";
+    homepage = https://hisham.hm/htop/;
+    license = licenses.gpl2Plus;
+    platforms = platforms.all;
+    maintainers = with maintainers; [ rob simons relrod nckx ];
+  };
+}
-- 
cgit 1.4.1


From 57dd725e853b54c578e3b73f520756be3ff2359c Mon Sep 17 00:00:00 2001
From: zimbatm <zimbatm@zimbatm.com>
Date: Sun, 20 Mar 2016 19:35:59 +0000
Subject: htop: fix supported platforms list

---
 pkgs/tools/system/htop/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'pkgs/tools/system/htop/default.nix')

diff --git a/pkgs/tools/system/htop/default.nix b/pkgs/tools/system/htop/default.nix
index 9c05c07c052cd..a9d15b317f98c 100644
--- a/pkgs/tools/system/htop/default.nix
+++ b/pkgs/tools/system/htop/default.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
     description = "An interactive process viewer for Linux";
     homepage = https://hisham.hm/htop/;
     license = licenses.gpl2Plus;
-    platforms = platforms.all;
+    platforms = with platforms; [ linux freebsd openbsd darwin ];
     maintainers = with maintainers; [ rob simons relrod nckx ];
   };
 }
-- 
cgit 1.4.1


From 16ed322928b30b39942054abb3b5d026ec1a3ec0 Mon Sep 17 00:00:00 2001
From: Aneesh Agrawal <aneeshusa@gmail.com>
Date: Sun, 20 Mar 2016 17:26:09 -0400
Subject: htop: fix platforms attribute

See comments at
https://github.com/NixOS/nixpkgs/commit/57dd725e853b54c578e3b73f520756be3ff2359c.

These values are already lists and need to be concatenated together
instead of placed in another list.
---
 pkgs/tools/system/htop/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'pkgs/tools/system/htop/default.nix')

diff --git a/pkgs/tools/system/htop/default.nix b/pkgs/tools/system/htop/default.nix
index a9d15b317f98c..46547aa45fd9d 100644
--- a/pkgs/tools/system/htop/default.nix
+++ b/pkgs/tools/system/htop/default.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
     description = "An interactive process viewer for Linux";
     homepage = https://hisham.hm/htop/;
     license = licenses.gpl2Plus;
-    platforms = with platforms; [ linux freebsd openbsd darwin ];
+    platforms = with platforms; linux ++ freebsd ++ openbsd ++ darwin;
     maintainers = with maintainers; [ rob simons relrod nckx ];
   };
 }
-- 
cgit 1.4.1


From db6dff75bd8905e7f7c7c679d5dc6680f65e5ae0 Mon Sep 17 00:00:00 2001
From: Mitch Tishmack <mitch.tishmack@gmail.com>
Date: Mon, 21 Mar 2016 14:05:01 -0500
Subject: htop: fix build on darwin

---
 pkgs/tools/system/htop/default.nix | 7 +++++--
 pkgs/top-level/all-packages.nix    | 4 +++-
 2 files changed, 8 insertions(+), 3 deletions(-)

(limited to 'pkgs/tools/system/htop/default.nix')

diff --git a/pkgs/tools/system/htop/default.nix b/pkgs/tools/system/htop/default.nix
index 46547aa45fd9d..9301107d2db99 100644
--- a/pkgs/tools/system/htop/default.nix
+++ b/pkgs/tools/system/htop/default.nix
@@ -1,4 +1,5 @@
-{ fetchurl, stdenv, ncurses }:
+{ lib, fetchurl, stdenv, ncurses,
+IOKit }:
 
 stdenv.mkDerivation rec {
   name = "htop-${version}";
@@ -9,7 +10,9 @@ stdenv.mkDerivation rec {
     url = "http://hisham.hm/htop/releases/${version}/${name}.tar.gz";
   };
 
-  buildInputs = [ ncurses ];
+  buildInputs =
+    [ ncurses ] ++
+    lib.optionals stdenv.isDarwin [ IOKit ];
 
   meta = with stdenv.lib; {
     description = "An interactive process viewer for Linux";
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index da6fca3a81a4c..10800fbb2a718 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -10309,7 +10309,9 @@ let
 
   hostapd = callPackage ../os-specific/linux/hostapd { };
 
-  htop = callPackage ../tools/system/htop { };
+  htop = callPackage ../tools/system/htop {
+    inherit (darwin) IOKit;
+  };
 
   # GNU/Hurd core packages.
   gnu = recurseIntoAttrs (callPackage ../os-specific/gnu {
-- 
cgit 1.4.1