diff options
| author | Arseniy Seroka <jagajaga@users.noreply.github.com> | 2016-03-20 21:55:00 +0300 |
|---|---|---|
| committer | Arseniy Seroka <jagajaga@users.noreply.github.com> | 2016-03-20 21:55:00 +0300 |
| commit | 84ba149e7933b8a53ef8e087bda80f9bf55f1417 (patch) | |
| tree | 32db4441cf43e0718f0eccc4e783eb4497523b1e | |
| parent | 2d1893899b0ed22bc430c5bcc6fbaaf6acf7add2 (diff) | |
| parent | d9e60e4d43ae21dbd63b76cf86edcc8f56c4d764 (diff) | |
| download | nixlib-84ba149e7933b8a53ef8e087bda80f9bf55f1417.tar nixlib-84ba149e7933b8a53ef8e087bda80f9bf55f1417.tar.gz nixlib-84ba149e7933b8a53ef8e087bda80f9bf55f1417.tar.bz2 nixlib-84ba149e7933b8a53ef8e087bda80f9bf55f1417.tar.lz nixlib-84ba149e7933b8a53ef8e087bda80f9bf55f1417.tar.xz nixlib-84ba149e7933b8a53ef8e087bda80f9bf55f1417.tar.zst nixlib-84ba149e7933b8a53ef8e087bda80f9bf55f1417.zip | |
Merge pull request #14065 from zimbatm/htop-crossplatform
htop: merge both implementations
| -rw-r--r-- | pkgs/os-specific/darwin/htop/default.nix | 21 | ||||
| -rw-r--r-- | pkgs/tools/system/htop/default.nix (renamed from pkgs/os-specific/linux/htop/default.nix) | 4 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 9 |
3 files changed, 3 insertions, 31 deletions
diff --git a/pkgs/os-specific/darwin/htop/default.nix b/pkgs/os-specific/darwin/htop/default.nix deleted file mode 100644 index 3f076b838d42..000000000000 --- 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 index 946b44346abd..9c05c07c052c 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 6f56c991b35e..9729e2945d31 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10307,14 +10307,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 { |