Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

ocsinventory-agent: 2.10.1 -> 2.10.4 #351733

Merged
merged 1 commit into from
Nov 23, 2024
Merged

ocsinventory-agent: 2.10.1 -> 2.10.4 #351733

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 14 additions & 5 deletions pkgs/by-name/oc/ocsinventory-agent/package.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
, stdenv
, perlPackages
, fetchFromGitHub
, fetchpatch
, makeWrapper
, shortenPerlShebang
, coreutils
Expand All @@ -22,21 +23,31 @@
}:

perlPackages.buildPerlPackage rec {
version = "2.10.1";
pname = "ocsinventory-agent";
version = "2.10.4";

src = fetchFromGitHub {
owner = "OCSInventory-NG";
repo = "UnixAgent";
rev = "refs/tags/v${version}-MAC";
hash = "sha256-aFzBrUsVttUhpYGEYd/yYuXmE90PGCiBmBsVjtHcHLg=";
rev = "refs/tags/v${version}";
hash = "sha256-MKUYf3k47lHc9dTGo1wYd7r4GrX98dU+04mF0Jm5e9U=";
};

patches = [
# Fix Getopt-Long warnings
# See https://github.com/OCSInventory-NG/UnixAgent/pull/490
(fetchpatch {
url = "https://github.com/OCSInventory-NG/UnixAgent/commit/c4899cef6b797df471ddf41c427970de47302f80.patch";
hash = "sha256-HxcWb9jmHiL0r6VWlsvmKUuybnM9W5471FLBBe3Zrfs=";
})
];

nativeBuildInputs = [ makeWrapper ] ++ lib.optional stdenv.hostPlatform.isDarwin shortenPerlShebang;

buildInputs = with perlPackages; [
perl
DataUUID
GetoptLong
IOCompress
IOSocketSSL
LWP
Expand Down Expand Up @@ -81,8 +92,6 @@ perlPackages.buildPerlPackage rec {
version = testers.testVersion {
package = ocsinventory-agent;
command = "ocsinventory-agent --version";
# upstream has not updated version in lib/Ocsinventory/Agent/Config.pm
version = "2.10.0";
};
};
updateScript = nix-update-script { };
Expand Down