diff --git a/pkgs/tools/system/htop/default.nix b/pkgs/tools/system/htop/default.nix index 26d10d1278da..47ebee52fe16 100644 --- a/pkgs/tools/system/htop/default.nix +++ b/pkgs/tools/system/htop/default.nix @@ -5,48 +5,46 @@ , systemdSupport ? stdenv.isLinux, systemd }: -with lib; - assert systemdSupport -> stdenv.isLinux; stdenv.mkDerivation rec { pname = "htop"; - version = "3.1.2"; + version = "3.2.0"; src = fetchFromGitHub { owner = "htop-dev"; repo = pname; rev = version; - sha256 = "sha256-RKYS8UYZTVKMR/3DG31eqkG4knPRl8WXsZU/XGmGmAg="; + sha256 = "sha256-p/lc7G/XFllulXrM47mPE6W5vVuoi4uXB8To36PIgZo="; }; nativeBuildInputs = [ autoreconfHook ]; buildInputs = [ ncurses ] - ++ optional stdenv.isDarwin IOKit - ++ optional sensorsSupport lm_sensors - ++ optional systemdSupport systemd + ++ lib.optional stdenv.isDarwin IOKit + ++ lib.optional sensorsSupport lm_sensors + ++ lib.optional systemdSupport systemd ; configureFlags = [ "--enable-unicode" "--sysconfdir=/etc" ] - ++ optional sensorsSupport "--with-sensors" + ++ lib.optional sensorsSupport "--with-sensors" ; postFixup = let - optionalPatch = pred: so: optionalString pred "patchelf --add-needed ${so} $out/bin/htop"; + optionalPatch = pred: so: lib.optionalString pred "patchelf --add-needed ${so} $out/bin/htop"; in '' ${optionalPatch sensorsSupport "${lm_sensors}/lib/libsensors.so"} ${optionalPatch systemdSupport "${systemd}/lib/libsystemd.so"} ''; - meta = { - description = "An interactive process viewer for Linux"; + meta = with lib; { + description = "An interactive process viewer"; homepage = "https://htop.dev"; license = licenses.gpl2Only; platforms = platforms.all; - maintainers = with maintainers; [ rob relrod ]; - changelog = "https://github.com/htop-dev/${pname}/blob/${version}/ChangeLog"; + maintainers = with maintainers; [ rob relrod SuperSandro2000 ]; + changelog = "https://github.com/htop-dev/htop/blob/${version}/ChangeLog"; }; }