diff options
Diffstat (limited to 'users/multi/pkgs/htop/default.nix')
-rw-r--r-- | users/multi/pkgs/htop/default.nix | 34 |
1 files changed, 10 insertions, 24 deletions
diff --git a/users/multi/pkgs/htop/default.nix b/users/multi/pkgs/htop/default.nix index 09fc1cd9928f..f023410bd2a3 100644 --- a/users/multi/pkgs/htop/default.nix +++ b/users/multi/pkgs/htop/default.nix @@ -1,33 +1,19 @@ { pkgs, ... }: let - arcStats = [ - ./zfs-arc-stats/0001-Specify-correct-MIB-length.patch - ./zfs-arc-stats/0002-Support-ZFS-ARC-stats-on-FreeBSD.patch - ./zfs-arc-stats/0003-ZFS-arcstats-for-Linux.patch - ./zfs-arc-stats/0004-ZFS-arcstats-for-Darwin-macOS-OS-X.patch - ./zfs-arc-stats/0005-Refactor-common-OpenZFS-sysctl-access.patch - ./zfs-arc-stats/0006-ZFS-arcstats-for-Solaris.patch - ./zfs-arc-stats/0007-Refactor-openzfs_sysctl_init-and-ZfsArcMeter.patch - ./zfs-arc-stats/0008-Support-for-ZFS-Compressed-ARC-statistics.patch - ./zfs-arc-stats/0009-Linux-fixes.patch - ]; + newVer = "3.0.2"; - arcCache = [ - ./zfs-arc-cache/0001-Linux-consider-ZFS-ARC-to-be-cache.patch - ]; - - removeMousing = [ - ./remove-mousing/0001-Tear-out-ncurses-mouse-mode.patch - ]; - - octoMeter = [ - ./octo-meter/0001-Add-quad-and-octo-meter-display-meters.patch - ]; + newSrc = pkgs.fetchFromGitHub { + owner = "htop-dev"; + repo = "htop"; + rev = "59ef15b2ad6037f40d7fe4207b2b59dd11b14b8b"; + sha256 = "0sirwfvqwwq2x2k25vd4k4cf9d5qv17yjizidxq4y5xfh2v0djmd"; + }; in with pkgs; htop.overrideAttrs - ({ patches ? [], nativeBuildInputs ? [], ... }: + ({ nativeBuildInputs ? [], ... }: { - patches = patches ++ arcStats ++ arcCache ++ removeMousing ++ octoMeter; nativeBuildInputs = nativeBuildInputs ++ [ autoreconfHook ]; + src = newSrc; + version = newVer; }) |