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

Commits on Oct 9, 2019

  1. inxi: enable json output 

    Before this patch:
$ inxi --output json --output-file output.json $additional_args
Error 80: The required json Perl module is not installed:
Cpanel::JSON::XS OR JSON::XS
See --recommends for more information.

With this patch, it works as expected:
$ inxi --output json --output-file output.json $additional_args
Writing JSON data to: output.json
Data written successfully.
    @dguibert
    dguibert authored and Jon committed Oct 9, 2019

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    callahad Dan Callahan
    GPG key ID: 8D6DD713E9EBA7FD
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    18b5ca2 View commit details
Showing with 4 additions and 2 deletions.
  1. +4 −2 pkgs/tools/system/inxi/default.nix
6 changes: 4 additions & 2 deletions pkgs/tools/system/inxi/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{ stdenv, fetchFromGitHub, perl }:
{ stdenv, fetchFromGitHub, perl, perlPackages, makeWrapper }:

stdenv.mkDerivation rec {
pname = "inxi";
@@ -11,11 +11,13 @@ stdenv.mkDerivation rec {
sha256 = "04134l323vwd0g2bffj11rnpw2jgs9la6aqrmv8vh7w9mq5nd57y";
};

buildInputs = [ perl ];
buildInputs = [ perl makeWrapper ];

installPhase = ''
mkdir -p $out/bin
cp inxi $out/bin/
wrapProgram $out/bin/inxi \
--set PERL5LIB "${perlPackages.makePerlPath (with perlPackages; [ CpanelJSONXS ])}"
mkdir -p $out/share/man/man1
cp inxi.1 $out/share/man/man1/
'';