diff options
| author | Frederik Rietdijk <freddyrietdijk@fridh.nl> | 2019-01-15 16:59:03 +0100 |
|---|---|---|
| committer | Frederik Rietdijk <freddyrietdijk@fridh.nl> | 2019-01-15 16:59:03 +0100 |
| commit | 42d276c6b8b698dba0aac0bdb770e7a3e5b8d5b4 (patch) | |
| tree | 787093bb48bb6a2b16f0976ac707641a13893b93 /pkgs/tools/system | |
| parent | 1f0467005dd43c3c0f57c87da1c298aed7ea8b46 (diff) | |
| parent | ab8e72b7bb24d73a588d9783240a1d0154a50ff7 (diff) | |
| download | nixlib-42d276c6b8b698dba0aac0bdb770e7a3e5b8d5b4.tar nixlib-42d276c6b8b698dba0aac0bdb770e7a3e5b8d5b4.tar.gz nixlib-42d276c6b8b698dba0aac0bdb770e7a3e5b8d5b4.tar.bz2 nixlib-42d276c6b8b698dba0aac0bdb770e7a3e5b8d5b4.tar.lz nixlib-42d276c6b8b698dba0aac0bdb770e7a3e5b8d5b4.tar.xz nixlib-42d276c6b8b698dba0aac0bdb770e7a3e5b8d5b4.tar.zst nixlib-42d276c6b8b698dba0aac0bdb770e7a3e5b8d5b4.zip | |
Merge staging-next into staging
Diffstat (limited to 'pkgs/tools/system')
| -rw-r--r-- | pkgs/tools/system/inxi/default.nix | 30 | ||||
| -rw-r--r-- | pkgs/tools/system/osquery/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/tools/system/s6/default.nix | 4 |
3 files changed, 36 insertions, 2 deletions
diff --git a/pkgs/tools/system/inxi/default.nix b/pkgs/tools/system/inxi/default.nix new file mode 100644 index 000000000000..02379bcfe5c8 --- /dev/null +++ b/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 ]; + }; +} diff --git a/pkgs/tools/system/osquery/default.nix b/pkgs/tools/system/osquery/default.nix index c7faf4d3889e..32c085e2ec5f 100644 --- a/pkgs/tools/system/osquery/default.nix +++ b/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; diff --git a/pkgs/tools/system/s6/default.nix b/pkgs/tools/system/s6/default.nix index 031439d56d5c..4389755bc4c1 100644 --- a/pkgs/tools/system/s6/default.nix +++ b/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"; |