diff options
author | Jan Malakhovski <oxij@oxij.org> | 2018-05-26 00:20:17 +0000 |
---|---|---|
committer | Jan Malakhovski <oxij@oxij.org> | 2018-05-26 00:20:17 +0000 |
commit | ad35019501e6b263e08ecb4c66f1ee6e3eee80f1 (patch) | |
tree | 492149cd4a5da50945a5bc7d5fa62de432590dea /pkgs/tools/system | |
parent | 98f2f08b4b9b204912c1c097a08cd26151fae0bb (diff) | |
parent | 97e376bf9cafa2d6c812221677f2e38163d0acb8 (diff) |
Merge branch 'master' into staging
Fixed conflicts: - lib/systems/for-meta.nix: in favor of staging - pkgs/os-specific/darwin/xcode/default.nix: in favor of master
Diffstat (limited to 'pkgs/tools/system')
-rw-r--r-- | pkgs/tools/system/efivar/default.nix | 6 | ||||
-rw-r--r-- | pkgs/tools/system/gohai/default.nix | 32 | ||||
-rw-r--r-- | pkgs/tools/system/gohai/deps.nix | 30 |
3 files changed, 68 insertions, 0 deletions
diff --git a/pkgs/tools/system/efivar/default.nix b/pkgs/tools/system/efivar/default.nix index 4588204409474..6c0bcb406218a 100644 --- a/pkgs/tools/system/efivar/default.nix +++ b/pkgs/tools/system/efivar/default.nix @@ -4,6 +4,8 @@ stdenv.mkDerivation rec { name = "efivar-${version}"; version = "35"; + outputs = [ "bin" "out" "dev" "man" ]; + src = fetchFromGitHub { owner = "rhinstaller"; repo = "efivar"; @@ -17,6 +19,10 @@ stdenv.mkDerivation rec { makeFlags = [ "prefix=$(out)" "libdir=$(out)/lib" + "bindir=$(bin)/bin" + "mandir=$(man)/share/man" + "includedir=$(dev)/include" + "PCDIR=$(dev)/lib/pkgconfig" ]; meta = with stdenv.lib; { diff --git a/pkgs/tools/system/gohai/default.nix b/pkgs/tools/system/gohai/default.nix new file mode 100644 index 0000000000000..77f65de9a8d0a --- /dev/null +++ b/pkgs/tools/system/gohai/default.nix @@ -0,0 +1,32 @@ +{ lib, stdenv, buildGoPackage, fetchgit, fetchhg, fetchbzr, fetchsvn }: + +buildGoPackage rec { + name = "gohai-${version}"; + version = "2018-05-23"; + rev = "60e13eaed98afa238ad6dfc98224c04fbb7b19b1"; + + goPackagePath = "github.com/DataDog/gohai"; + + src = fetchgit { + inherit rev; + url = "https://github.com/DataDog/gohai"; + sha256 = "15hdw195f6ayrmj1nbyfpfswdai1r1z3qjw927mbma7rwql24dkr"; + }; + + goDeps = ./deps.nix; + + meta = with lib; { + description = "System information collector"; + homepage = "https://github.com/DataDog/gohai"; + license = licenses.mit; + maintainers = [ maintainers.tazjin ]; + platforms = platforms.unix; + repositories.git = git://github.com/DataDog/gohai.git; + + longDescription = '' + Gohai is a tool which collects an inventory of system + information. It is used by the Datadog agent to provide detailed + system metrics. + ''; + }; +} diff --git a/pkgs/tools/system/gohai/deps.nix b/pkgs/tools/system/gohai/deps.nix new file mode 100644 index 0000000000000..f6d63e460246d --- /dev/null +++ b/pkgs/tools/system/gohai/deps.nix @@ -0,0 +1,30 @@ +# This file was generated by https://github.com/kamilchm/go2nix v1.2.1 +[ + { + goPackagePath = "github.com/cihub/seelog"; + fetch = { + type = "git"; + url = "https://github.com/cihub/seelog"; + rev = "f561c5e57575bb1e0a2167028b7339b3a8d16fb4"; + sha256 = "0r3228hvgljgpaggj6b9mvxfsizfw25q2c1761wsvcif8gz49cvl"; + }; + } + { + goPackagePath = "github.com/shirou/gopsutil"; + fetch = { + type = "git"; + url = "https://github.com/shirou/gopsutil"; + rev = "eeb1d38d69593f121e060d24d17f7b1f0936b203"; + sha256 = "01qsznk599225gf4pld7p2m30p61y77mvzhrs6raxpk6wf7icp4w"; + }; + } + { + goPackagePath = "golang.org/x/sys"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/sys"; + rev = "77b0e4315053a57ed2962443614bdb28db152054"; + sha256 = "1024gcv1b40i2rgvpgyw2hgy1k5g7473pn29yavwysj37m1rrplp"; + }; + } +] |