Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 0ccb965e4d94
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: a16ccacb918f
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on Feb 5, 2018

  1. htop: 2.02 -> 2.1.0

    @magnetophon
    magnetophon committed Feb 5, 2018
    Copy the full SHA
    8a72d2a View commit details

  2. Merge pull request #34625 from magnetophon/htop 

    htop: 2.02 -> 2.1.0
    @adisbladis
    adisbladis authored Feb 5, 2018
    Copy the full SHA
    a16ccac View commit details
Showing with 8 additions and 3 deletions.
  1. +8 −3 pkgs/tools/system/htop/default.nix
11 changes: 8 additions & 3 deletions pkgs/tools/system/htop/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,19 +1,24 @@
{ lib, fetchurl, stdenv, ncurses,
IOKit }:
IOKit, python }:

stdenv.mkDerivation rec {
name = "htop-${version}";
version = "2.0.2";
version = "2.1.0";

src = fetchurl {
sha256 = "11zlwadm6dpkrlfvf3z3xll26yyffa7qrxd1w72y1kl0rgffk6qp";
url = "http://hisham.hm/htop/releases/${version}/${name}.tar.gz";
sha256 = "0j07z0xm2gj1vzvbgh4323k4db9mr7drd7gw95mmpqi61ncvwq1j";
};

nativeBuildInputs = [ python ];
buildInputs =
[ ncurses ] ++
lib.optionals stdenv.isDarwin [ IOKit ];

prePatch = ''
patchShebangs scripts/MakeHeader.py
'';

meta = with stdenv.lib; {
description = "An interactive process viewer for Linux";
homepage = https://hisham.hm/htop/;