Merge branch 'master' into staging-next

Hydra nixpkgs: ?compare=1504357

pkgs/tools/system/cron/default.nix

@@ -1,4 +1,4 @@
-{stdenv, fetchurl, sendmailPath ? "/usr/sbin/sendmail"}:
+{stdenv, fetchurl, vim, sendmailPath ? "/usr/sbin/sendmail"}:
 
 stdenv.mkDerivation {
   name = "cron-4.1";
@@ -25,6 +25,9 @@ stdenv.mkDerivation {
     #undef _PATH_SENDMAIL
     #define _PATH_SENDMAIL "${sendmailPath}"
 
+    #undef _PATH_VI
+    #define _PATH_VI "${vim}/bin/vim"
+
     #undef _PATH_DEFPATH
     #define _PATH_DEFPATH "/run/wrappers/bin:/nix/var/nix/profiles/default/bin:/run/current-system/sw/bin:/usr/bin:/bin"
     __EOT__

pkgs/tools/system/inxi/default.nix

@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   name = "inxi-${version}";
-  version = "3.0.30-1";
+  version = "3.0.32-1";
 
   src = fetchFromGitHub {
     owner = "smxi";
     repo = "inxi";
     rev = version;
-    sha256 = "04dkws3716clscl6iq3sy6m822rqzwdg5mn03l0vhcdbqcng46s6";
+    sha256 = "171xdip2alkp3g0k0sanaavvdcz6d0wlldj9lgj11xsdbhaaknnv";
   };
 
   buildInputs = [ perl ];