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: 06a34e69ad4f
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 18504037c5f0
Choose a head ref
  • 1 commit
  • 1 file changed
  • 1 contributor

Commits on Apr 23, 2020

  1. inxi: Add a flag to install all recommended tools

    @primeos
    primeos committed Apr 23, 2020
    Copy the full SHA
    1850403 View commit details
Showing with 24 additions and 3 deletions.
  1. +24 −3 pkgs/tools/system/inxi/default.nix
27 changes: 24 additions & 3 deletions pkgs/tools/system/inxi/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,26 @@
{ 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.1.00-1";

@@ -17,7 +37,8 @@ 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/
'';