FusionInventory: 3.18 -> 3.21
This commit is contained in:
parent
df5600d440
commit
5f59913c74
|
@ -55,9 +55,6 @@ in {
|
|||
description = "Fusion Inventory Agent";
|
||||
wantedBy = [ "multi-user.target" ];
|
||||
|
||||
environment = {
|
||||
OPTIONS = "--no-category=software";
|
||||
};
|
||||
serviceConfig = {
|
||||
ExecStart = "${pkgs.fusionInventory}/bin/fusioninventory-agent --conf-file=${configFile} --daemon --no-fork";
|
||||
};
|
||||
|
|
|
@ -1,22 +1,28 @@
|
|||
{ stdenv, fetchurl, buildPerlPackage, perlPackages
|
||||
{ stdenv, lib, fetchurl, buildPerlPackage, perlPackages, gnused, nix, dmidecode, pciutils, usbutils, iproute, nettools
|
||||
, fetchFromGitHub, makeWrapper
|
||||
}:
|
||||
|
||||
buildPerlPackage rec {
|
||||
version = "2.3.18";
|
||||
name = "FusionInventory-Agent-${version}";
|
||||
version = "2.3.21";
|
||||
src = fetchurl {
|
||||
url = "mirror://cpan/authors/id/G/GR/GROUSSE/${name}.tar.gz";
|
||||
sha256 = "543d96fa61b8f2a2bc599fe9f694f19d1f2094dc5506bc514d00b8a445bc5401";
|
||||
url = "mirror://cpan/authors/id/G/GB/GBOUGARD/${name}.tar.gz";
|
||||
sha256 = "0c2ijild03bfw125h2gyaip2mg1jxk72dcanrlx9n6pjh2ay90zh";
|
||||
};
|
||||
|
||||
patches = [ ./remove_software_test.patch ];
|
||||
|
||||
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 = with perlPackages; [
|
||||
buildInputs = [ makeWrapper ] ++ (with perlPackages; [
|
||||
CGI
|
||||
DataStructureUtil
|
||||
FileCopyRecursive
|
||||
|
@ -28,6 +34,7 @@ buildPerlPackage rec {
|
|||
IPCRun
|
||||
JSON
|
||||
LWPProtocolhttps
|
||||
ModuleInstall
|
||||
NetSNMP
|
||||
TestCompile
|
||||
TestDeep
|
||||
|
@ -35,7 +42,7 @@ buildPerlPackage rec {
|
|||
TestMockModule
|
||||
TestMockObject
|
||||
TestNoWarnings
|
||||
];
|
||||
]);
|
||||
propagatedBuildInputs = with perlPackages; [
|
||||
FileWhich
|
||||
LWP
|
||||
|
@ -52,7 +59,10 @@ buildPerlPackage rec {
|
|||
cp -r lib $out
|
||||
|
||||
for cur in $out/bin/*; do
|
||||
sed -e "s|./lib|$out/lib|" -i "$cur"
|
||||
if [ -x "$cur" ]; then
|
||||
sed -e "s|./lib|$out/lib|" -i "$cur"
|
||||
wrapProgram "$cur" --prefix PATH : ${lib.makeBinPath [nix dmidecode pciutils usbutils nettools]}
|
||||
fi
|
||||
done
|
||||
'';
|
||||
|
||||
|
|
|
@ -28,7 +28,7 @@ index 8ee7ff02c..bd5551ab3 100755
|
|||
skip 'live SNMP test disabled', 6 unless $ENV{TEST_LIVE_SNMP};
|
||||
|
||||
diff --git a/t/apps/agent.t b/t/apps/agent.t
|
||||
index f417b4106..12207f192 100755
|
||||
index c0f6fc52f..c83837d70 100755
|
||||
--- a/t/apps/agent.t
|
||||
+++ b/t/apps/agent.t
|
||||
@@ -12,7 +12,7 @@ use XML::TreePP;
|
||||
|
@ -40,15 +40,28 @@ index f417b4106..12207f192 100755
|
|||
|
||||
my ($content, $out, $err, $rc);
|
||||
|
||||
@@ -73,11 +73,6 @@ subtest "first inventory execution and content" => sub {
|
||||
@@ -71,11 +71,6 @@ subtest "first inventory execution and content" => sub {
|
||||
check_content_ok($out);
|
||||
};
|
||||
|
||||
ok(
|
||||
-ok(
|
||||
- exists $content->{REQUEST}->{CONTENT}->{SOFTWARES},
|
||||
- 'inventory has software'
|
||||
-);
|
||||
-
|
||||
-ok(
|
||||
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',
|
||||
|
|
Loading…
Reference in a new issue