diff options
author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2024-05-19 00:02:23 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2024-05-19 00:02:23 +0000 |
commit | 5f79ea769bf5a459eab106cd68efd06556857521 (patch) | |
tree | 9600bc410b01c4fbd72af822948e2b911b0d7e20 /pkgs/servers | |
parent | 10b5ff04c95464c2ed23057cd2db565f729419df (diff) | |
parent | 60cc8055ebd1bda46ccc5e177bce5f5af3bc2f3e (diff) |
Merge master into staging-next
Diffstat (limited to 'pkgs/servers')
-rw-r--r-- | pkgs/servers/monitoring/nagios/default.nix | 21 | ||||
-rw-r--r-- | pkgs/servers/sickbeard/sickgear.nix | 4 |
2 files changed, 15 insertions, 10 deletions
diff --git a/pkgs/servers/monitoring/nagios/default.nix b/pkgs/servers/monitoring/nagios/default.nix index 14e60891c08d9..4f39239bfe08f 100644 --- a/pkgs/servers/monitoring/nagios/default.nix +++ b/pkgs/servers/monitoring/nagios/default.nix @@ -10,17 +10,18 @@ , unzip , nixosTests , nix-update-script +, testers }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "nagios"; - version = "4.5.1"; + version = "4.5.2"; src = fetchFromGitHub { owner = "NagiosEnterprises"; repo = "nagioscore"; - rev = "refs/tags/nagios-${version}"; - hash = "sha256-+U2k3w3Yr0qZjHwjRpKZVucB3a35PSZr1Sqa8k0ssq8="; + rev = "refs/tags/nagios-${finalAttrs.version}"; + hash = "sha256-LD572aR6g67pH3QllnLD3g0bnck+vlC/YTN83WamHRs="; }; patches = [ ./nagios.patch ]; @@ -46,7 +47,7 @@ stdenv.mkDerivation rec { # Do not create /var directories preInstall = '' - substituteInPlace Makefile --replace '$(MAKE) install-basic' "" + substituteInPlace Makefile --replace-fail '$(MAKE) install-basic' "" ''; installTargets = "install install-config"; postInstall = '' @@ -59,6 +60,10 @@ stdenv.mkDerivation rec { passthru = { tests = { inherit (nixosTests) nagios; + version = testers.testVersion { + package = finalAttrs.finalPackage; + command = "nagios --version"; + }; }; updateScript = nix-update-script { extraArgs = [ "--version-regex" "nagios-(.*)" ]; @@ -68,10 +73,10 @@ stdenv.mkDerivation rec { meta = { description = "A host, service and network monitoring program"; homepage = "https://www.nagios.org/"; - changelog = "https://github.com/NagiosEnterprises/nagioscore/blob/nagios-${version}/Changelog"; + changelog = "https://github.com/NagiosEnterprises/nagioscore/blob/nagios-${finalAttrs.version}/Changelog"; license = lib.licenses.gpl2; - platforms = lib.platforms.linux; + platforms = lib.platforms.unix; mainProgram = "nagios"; maintainers = with lib.maintainers; [ immae thoughtpolice relrod anthonyroussel ]; }; -} +}) diff --git a/pkgs/servers/sickbeard/sickgear.nix b/pkgs/servers/sickbeard/sickgear.nix index fd405b598e92a..1ad5c7c26effa 100644 --- a/pkgs/servers/sickbeard/sickgear.nix +++ b/pkgs/servers/sickbeard/sickgear.nix @@ -4,13 +4,13 @@ let pythonEnv = python3.withPackages(ps: with ps; [ cheetah3 lxml ]); in stdenv.mkDerivation rec { pname = "sickgear"; - version = "3.30.18"; + version = "3.30.19"; src = fetchFromGitHub { owner = "SickGear"; repo = "SickGear"; rev = "release_${version}"; - hash = "sha256-Xt4/bAK48A57n2Kl3LQICem8IR3pgsdgMjlP9qEVvBM="; + hash = "sha256-OC/BJ0wG6as1dt2dO9gUFD+FG85Vt2ehCoTcmh6iT7w="; }; patches = [ |