diff options
Diffstat (limited to 'nixpkgs/pkgs/servers/monitoring/fusion-inventory')
| -rw-r--r-- | nixpkgs/pkgs/servers/monitoring/fusion-inventory/default.nix | 93 | ||||
| -rw-r--r-- | nixpkgs/pkgs/servers/monitoring/fusion-inventory/remove_software_test.patch | 67 |
2 files changed, 160 insertions, 0 deletions
diff --git a/nixpkgs/pkgs/servers/monitoring/fusion-inventory/default.nix b/nixpkgs/pkgs/servers/monitoring/fusion-inventory/default.nix new file mode 100644 index 000000000000..33725cb62839 --- /dev/null +++ b/nixpkgs/pkgs/servers/monitoring/fusion-inventory/default.nix @@ -0,0 +1,93 @@ +{ stdenv, lib, fetchurl, perlPackages, nix, dmidecode, pciutils, usbutils, iproute, nettools +, fetchFromGitHub, makeWrapper +}: + +perlPackages.buildPerlPackage rec { + name = "FusionInventory-Agent-${version}"; + version = "2.3.21"; + + src = fetchFromGitHub { + owner = "fusioninventory"; + repo = "fusioninventory-agent"; + rev = version; + sha256 = "034clffcn0agx85macjgml4lyhvvck7idn94pqd2c77pk6crvw2y"; + }; + + patches = [ + ./remove_software_test.patch + # support for os-release file + (fetchurl { + url = https://github.com/fusioninventory/fusioninventory-agent/pull/396.diff; + sha256 = "0bxrjmff80ab01n23xggci32ajsah6zvcmz5x4hj6ayy6dzwi6jb"; + }) + # support for Nix software inventory + (fetchurl { + url = https://github.com/fusioninventory/fusioninventory-agent/pull/397.diff; + sha256 = "0pyf7mp0zsb3zcqb6yysr1zfp54p9ciwjn1pzayw6s9flmcgrmbw"; + }) + ]; + + postPatch = '' + + patchShebangs bin + + substituteInPlace "lib/FusionInventory/Agent/Tools/Linux.pm" \ + --replace /sbin/ip ${iproute}/sbin/ip + substituteInPlace "lib/FusionInventory/Agent/Task/Inventory/Linux/Networks.pm" \ + --replace /sbin/ip ${iproute}/sbin/ip + ''; + + buildTools = []; + buildInputs = [ makeWrapper ] ++ (with perlPackages; [ + CGI + DataStructureUtil + FileCopyRecursive + HTTPProxy + HTTPServerSimple + HTTPServerSimpleAuthen + IOCapture + IOSocketSSL + IPCRun + JSON + LWPProtocolHttps + ModuleInstall + NetSNMP + TestCompile + TestDeep + TestException + TestMockModule + TestMockObject + TestNoWarnings + ]); + propagatedBuildInputs = with perlPackages; [ + FileWhich + LWP + NetIP + TextTemplate + UNIVERSALrequire + XMLTreePP + ]; + + installPhase = '' + mkdir -p $out + + cp -r bin $out + cp -r lib $out + + for cur in $out/bin/*; do + if [ -x "$cur" ]; then + sed -e "s|./lib|$out/lib|" -i "$cur" + wrapProgram "$cur" --prefix PATH : ${lib.makeBinPath [nix dmidecode pciutils usbutils nettools iproute]} + fi + done + ''; + + outputs = [ "out" ]; + + meta = with stdenv.lib; { + homepage = http://www.fusioninventory.org; + description = "FusionInventory unified Agent for UNIX, Linux, Windows and MacOSX"; + license = stdenv.lib.licenses.gpl2; + maintainers = [ maintainers.phile314 ]; + }; +} diff --git a/nixpkgs/pkgs/servers/monitoring/fusion-inventory/remove_software_test.patch b/nixpkgs/pkgs/servers/monitoring/fusion-inventory/remove_software_test.patch new file mode 100644 index 000000000000..b360f418aa0b --- /dev/null +++ b/nixpkgs/pkgs/servers/monitoring/fusion-inventory/remove_software_test.patch @@ -0,0 +1,67 @@ +diff --git a/t/agent/snmp/live.t b/t/agent/snmp/live.t +index 8ee7ff02c..bd5551ab3 100755 +--- a/t/agent/snmp/live.t ++++ b/t/agent/snmp/live.t +@@ -11,7 +11,7 @@ use Test::More; + use FusionInventory::Agent::XML::Response; + use FusionInventory::Agent::SNMP::Live; + +-plan tests => 12; ++plan tests => 11; + + my $snmp; + throws_ok { +@@ -52,15 +52,6 @@ throws_ok { + } qr/^Unable to resolve the UDP\/IPv4 address "none"/, + 'instanciation: unresolvable host'; + +-throws_ok { +- $snmp = FusionInventory::Agent::SNMP::Live->new( +- version => 1, +- community => 'public', +- hostname => '1.1.1.1' +- ); +-} qr/no response from host 1.1.1.1/, +-'instanciation: unresponding host'; +- + SKIP: { + skip 'live SNMP test disabled', 6 unless $ENV{TEST_LIVE_SNMP}; + +diff --git a/t/apps/agent.t b/t/apps/agent.t +index c0f6fc52f..c83837d70 100755 +--- a/t/apps/agent.t ++++ b/t/apps/agent.t +@@ -12,7 +12,7 @@ use XML::TreePP; + use FusionInventory::Agent::Tools; + use FusionInventory::Test::Utils; + +-plan tests => 34; ++plan tests => 33; + + my ($content, $out, $err, $rc); + +@@ -71,11 +71,6 @@ subtest "first inventory execution and content" => sub { + check_content_ok($out); + }; + +-ok( +- exists $content->{REQUEST}->{CONTENT}->{SOFTWARES}, +- 'inventory has software' +-); +- + ok( + exists $content->{REQUEST}->{CONTENT}->{ENVS}, + 'inventory has environment variables' +diff --git a/t/tasks/inventory/linux/softwares.t b/t/tasks/inventory/linux/softwares.t +index 72a0e578c..13944f34f 100755 +--- a/t/tasks/inventory/linux/softwares.t ++++ b/t/tasks/inventory/linux/softwares.t +@@ -89,7 +89,7 @@ my $rpm_packages = [ + PUBLISHER => 'Mageia.Org', + NAME => 'xfsprogs', + COMMENTS => 'Utilities for managing the XFS filesystem', +- INSTALLDATE => '25/03/2012', ++ INSTALLDATE => '24/03/2012', + FILESIZE => '3628382', + FROM => 'rpm', + ARCH => 'x86_64', |