diff options
author | Frederik Rietdijk <fridh@fridh.nl> | 2020-04-25 07:52:04 +0200 |
---|---|---|
committer | Frederik Rietdijk <fridh@fridh.nl> | 2020-04-25 07:52:04 +0200 |
commit | 5c70040db2dd2123f7728f1bdcd40d5018de0ef9 (patch) | |
tree | aaca4dc14216c2ba38374a2568045213407ac329 /pkgs/tools/system/inxi/default.nix | |
parent | cff0669a4884bd6d0af19964c3589d13b2ea7a2b (diff) | |
parent | e7460e94124757249515c68a36a7ffdc57a8464d (diff) | |
download | nixlib-5c70040db2dd2123f7728f1bdcd40d5018de0ef9.tar nixlib-5c70040db2dd2123f7728f1bdcd40d5018de0ef9.tar.gz nixlib-5c70040db2dd2123f7728f1bdcd40d5018de0ef9.tar.bz2 nixlib-5c70040db2dd2123f7728f1bdcd40d5018de0ef9.tar.lz nixlib-5c70040db2dd2123f7728f1bdcd40d5018de0ef9.tar.xz nixlib-5c70040db2dd2123f7728f1bdcd40d5018de0ef9.tar.zst nixlib-5c70040db2dd2123f7728f1bdcd40d5018de0ef9.zip |
Merge master into staging-next
Diffstat (limited to 'pkgs/tools/system/inxi/default.nix')
-rw-r--r-- | pkgs/tools/system/inxi/default.nix | 38 |
1 files changed, 33 insertions, 5 deletions
diff --git a/pkgs/tools/system/inxi/default.nix b/pkgs/tools/system/inxi/default.nix index f5b5d4ef7a2a..364565016185 100644 --- a/pkgs/tools/system/inxi/default.nix +++ b/pkgs/tools/system/inxi/default.nix @@ -1,14 +1,34 @@ -{ stdenv, fetchFromGitHub, perl, perlPackages, makeWrapper }: +{ lib, stdenv, fetchFromGitHub, perl, perlPackages, makeWrapper +, ps, dnsutils # dig is recommended for multiple categories +, withRecommends ? false # Install (almost) all recommended tools (see --recommends) +, withRecommendedSystemPrograms ? withRecommends, utillinuxMinimal, dmidecode +, file, hddtemp, iproute, ipmitool, usbutils, kmod, lm_sensors, smartmontools +, binutils, tree, upower +, withRecommendedDisplayInformationPrograms ? withRecommends, glxinfo, xorg +}: -stdenv.mkDerivation rec { +let + prefixPath = programs: + "--prefix PATH ':' '${stdenv.lib.makeBinPath programs}'"; + recommendedSystemPrograms = lib.optionals withRecommendedSystemPrograms [ + utillinuxMinimal dmidecode file hddtemp iproute ipmitool usbutils kmod + lm_sensors smartmontools binutils tree upower + ]; + recommendedDisplayInformationPrograms = lib.optionals + withRecommendedDisplayInformationPrograms + ([ glxinfo ] ++ (with xorg; [ xdpyinfo xprop xrandr ])); + programs = [ ps dnsutils ] # Core programs + ++ recommendedSystemPrograms + ++ recommendedDisplayInformationPrograms; +in stdenv.mkDerivation rec { pname = "inxi"; - version = "3.0.38-1"; + version = "3.1.00-1"; src = fetchFromGitHub { owner = "smxi"; repo = "inxi"; rev = version; - sha256 = "1qw3sxgd3ly916bzzl3873s3flngwd3vh57slw0shsj7ivz8bfnm"; + sha256 = "0md6yfd297l8695g0rsbs4mm74dc3k00rfjl4x2n4i33mkylp6qa"; }; buildInputs = [ perl makeWrapper ]; @@ -17,13 +37,21 @@ stdenv.mkDerivation rec { mkdir -p $out/bin cp inxi $out/bin/ wrapProgram $out/bin/inxi \ - --set PERL5LIB "${perlPackages.makePerlPath (with perlPackages; [ CpanelJSONXS ])}" + --set PERL5LIB "${perlPackages.makePerlPath (with perlPackages; [ CpanelJSONXS ])}" \ + ${prefixPath programs} mkdir -p $out/share/man/man1 cp inxi.1 $out/share/man/man1/ ''; meta = with stdenv.lib; { description = "A full featured CLI system information tool"; + longDescription = '' + inxi is a command line system information script built for console and + IRC. It is also used a debugging tool for forum technical support to + quickly ascertain users' system configurations and hardware. inxi shows + system hardware, CPU, drivers, Xorg, Desktop, Kernel, gcc version(s), + Processes, RAM usage, and a wide variety of other useful information. + ''; homepage = "https://smxi.org/docs/inxi.htm"; changelog = "https://github.com/smxi/inxi/blob/${version}/inxi.changelog"; license = licenses.gpl3Plus; |