Merge staging-next into staging

pkgs/tools/system/inxi/default.nix

@@ -0,0 +1,30 @@
+{ stdenv, fetchFromGitHub, perl }:
+
+stdenv.mkDerivation rec {
+  name = "inxi-${version}";
+  version = "3.0.30-1";
+
+  src = fetchFromGitHub {
+    owner = "smxi";
+    repo = "inxi";
+    rev = version;
+    sha256 = "04dkws3716clscl6iq3sy6m822rqzwdg5mn03l0vhcdbqcng46s6";
+  };
+
+  buildInputs = [ perl ];
+
+  installPhase = ''
+    mkdir -p $out/bin
+    cp inxi $out/bin/
+    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";
+    homepage = https://smxi.org/docs/inxi.htm;
+    license = licenses.gpl3Plus;
+    platforms = platforms.unix;
+    maintainers = with maintainers; [ primeos ];
+  };
+}

pkgs/tools/system/osquery/default.nix

@@ -39,6 +39,10 @@ stdenv.mkDerivation rec {
     pkgconfig cmake pythonPackages.python pythonPackages.jinja2 doxygen fpm
   ];
 
+  NIX_LDFLAGS = [
+    "-lcrypto"
+  ];
+
   buildInputs = let
     gflags' = google-gflags.overrideAttrs (old: {
       cmakeFlags = stdenv.lib.filter (f: isNull (builtins.match ".*STATIC.*" f)) old.cmakeFlags;

pkgs/tools/system/s6/default.nix

@@ -4,8 +4,8 @@ with skawarePackages;
 
 buildPackage {
   pname = "s6";
-  version = "2.7.2.0";
-  sha256 = "02canrzmhr66gi16ldyylk378jlmyfl73vn72ayr12h2wyxgqm5g";
+  version = "2.7.2.2";
+  sha256 = "0psjmfidjdciswakw9agzzniqfmhrr21765m0q77kwxg7iisgpsq";
 
   description = "skarnet.org's small & secure supervision software suite";