Skip to content

htop: 3.3.0 -> 3.4.0 #389164

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Mar 12, 2025
Merged

htop: 3.3.0 -> 3.4.0 #389164

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 14 additions & 12 deletions pkgs/tools/system/htop/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
{
lib,
fetchFromGitHub,
fetchpatch2,
stdenv,
autoreconfHook,
pkg-config,
Expand All @@ -19,24 +18,27 @@ assert systemdSupport -> stdenv.hostPlatform.isLinux;

stdenv.mkDerivation rec {
pname = "htop";
version = "3.3.0";
version = "3.4.0";

src = fetchFromGitHub {
owner = "htop-dev";
repo = pname;
rev = version;
hash = "sha256-qDhQkzY2zj2yxbgFUXwE0MGEgAFOsAhnapUuetO9WTw=";
hash = "sha256-4M2Kzy/tTpIZzpyubnXWywQh7Np5InT4sYkVG2v6wWs=";
};

patches = [
# See https://github.com/htop-dev/htop/pull/1412
# Remove when updating to 3.4.0
(fetchpatch2 {
name = "htop-resolve-configuration-path.patch";
url = "https://github.com/htop-dev/htop/commit/0dac8e7d38ec3aeae901a987717b5177986197e4.patch";
hash = "sha256-Er1d/yV1fioYfEmXNlLO5ayAyXkyy+IaGSx1KWXvlv0=";
})
];
# upstream removed pkg-config support and uses dlopen now
postPatch =
let
libnlPath = lib.getLib libnl;
in
''
substituteInPlace configure.ac \
--replace-fail /usr/include/libnl3 ${lib.getDev libnl}/include/libnl3
substituteInPlace linux/LibNl.c \
--replace-fail libnl-3.so ${libnlPath}/lib/libnl-3.so \
--replace-fail libnl-genl-3.so ${libnlPath}/lib/libnl-genl-3.so
'';

nativeBuildInputs = [ autoreconfHook ] ++ lib.optional stdenv.hostPlatform.isLinux pkg-config;

Expand Down