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

htop 2.0+ is now cross-platform
---
 pkgs/os-specific/darwin/htop/default.nix      | 21 -------------------
 .../linux => tools/system}/htop/default.nix   |  4 ++--
 pkgs/top-level/all-packages.nix               |  9 +-------
 3 files changed, 3 insertions(+), 31 deletions(-)
 delete mode 100644 pkgs/os-specific/darwin/htop/default.nix
 rename pkgs/{os-specific/linux => tools/system}/htop/default.nix (86%)

diff --git a/pkgs/os-specific/darwin/htop/default.nix b/pkgs/os-specific/darwin/htop/default.nix
deleted file mode 100644
index 3f076b838d4..00000000000
--- a/pkgs/os-specific/darwin/htop/default.nix
+++ /dev/null
@@ -1,21 +0,0 @@
-{ fetchurl, stdenv, ncurses, autoconf, automake, IOKit }:
-
-stdenv.mkDerivation rec {
-  name = "htop-0.8.2.2";
-
-  src = fetchurl {
-    url = "https://github.com/max-horvath/htop-osx/archive/0.8.2.2.tar.gz";
-    sha256 = "0qxibadn2lfqn10a5jmkv8r5ljfs0vaaa4j6psd7ppxa2w6bx5li";
-  };
-
-  buildInputs = [ autoconf automake ncurses IOKit ];
-
-  preConfigure = "./autogen.sh";
-
-  meta = {
-    description = "An interactive process viewer for Mac OS X";
-    homepage = "https://github.com/max-horvath/htop-osx";
-    platforms = stdenv.lib.platforms.darwin;
-    maintainers = with stdenv.lib.maintainers; [ joelteon ];
-  };
-}
diff --git a/pkgs/os-specific/linux/htop/default.nix b/pkgs/tools/system/htop/default.nix
similarity index 86%
rename from pkgs/os-specific/linux/htop/default.nix
rename to pkgs/tools/system/htop/default.nix
index 946b44346ab..9c05c07c052 100644
--- a/pkgs/os-specific/linux/htop/default.nix
+++ b/pkgs/tools/system/htop/default.nix
@@ -13,9 +13,9 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "An interactive process viewer for Linux";
-    homepage = http://htop.sourceforge.net;
+    homepage = https://hisham.hm/htop/;
     license = licenses.gpl2Plus;
-    platforms = platforms.linux;
+    platforms = platforms.all;
     maintainers = with maintainers; [ rob simons relrod nckx ];
   };
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 3ac55c8f817..cbb41322f89 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -10311,14 +10311,7 @@ let
 
   hostapd = callPackage ../os-specific/linux/hostapd { };
 
-  htop =
-    if stdenv.isLinux then
-      callPackage ../os-specific/linux/htop { }
-    else if stdenv.isDarwin then
-      callPackage ../os-specific/darwin/htop {
-        inherit (darwin.apple_sdk.frameworks) IOKit;
-      }
-    else null;
+  htop = callPackage ../tools/system/htop { };
 
   # GNU/Hurd core packages.
   gnu = recurseIntoAttrs (callPackage ../os-specific/gnu {