Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 6e0a7bf4b8cd
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 0677e4efbfa2
Choose a head ref
  • 2 commits
  • 4 files changed
  • 2 contributors

Commits on Nov 25, 2020

  1. check_systemd: init at 2.2.1 

    and remove pynagsystemd, which it replaces.
    @symphorien
    symphorien committed Nov 25, 2020
    Copy the full SHA
    590aa37 View commit details

Commits on Nov 26, 2020

  1. Merge pull request #102271 from symphorien/check-systemd 

    check_systemd: init at 2.2.1
    @SuperSandro2000
    SuperSandro2000 authored Nov 26, 2020
    Copy the full SHA
    0677e4e View commit details
36 changes: 36 additions & 0 deletions pkgs/servers/monitoring/nagios/plugins/check_systemd.nix
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
{ fetchFromGitHub, python3Packages, lib }:

python3Packages.buildPythonApplication rec {
pname = "check_systemd";
version = "2.2.1";

src = fetchFromGitHub {
owner = "Josef-Friedrich";
repo = pname;
rev = "v${version}";
sha256 = "04r14dhqzrdndn235dvr6afy4s4g4asynsgvj99cmyq55nah4asn";
};

propagatedBuildInputs = with python3Packages; [ nagiosplugin ];

postInstall = ''
# check_systemd is only a broken stub calling check_systemd.py
mv $out/bin/check_systemd{.py,}
'';

# the test scripts run ./check_systemd.py and check_systemd. Patch to
# the installed, patchShebanged executable in $out/bin
preCheck = ''
find test -name "*.py" -execdir sed -i "s@./check_systemd.py@$out/bin/check_systemd@" '{}' ";"
export PATH=$PATH:$out/bin
'';
checkInputs = [ python3Packages.pytestCheckHook ];

meta = with lib; {
description = "Nagios / Icinga monitoring plugin to check systemd for failed units";
inherit (src.meta) homepage;
maintainers = with maintainers; [ symphorien ];
license = licenses.lgpl2Only;
platforms = platforms.linux;
};
}
22 changes: 0 additions & 22 deletions pkgs/servers/monitoring/nagios/plugins/pynagsystemd.nix
View file

This file was deleted.

1 change: 1 addition & 0 deletions pkgs/top-level/aliases.nix
View file
Original file line number Diff line number Diff line change
@@ -470,6 +470,7 @@ mapAliases ({
phonon-backend-gstreamer = throw "phonon-backend-gstreamer: Please use libsForQt5.phonon-backend-gstreamer, as Qt4 support in this package has been removed."; # added 2019-11-22
phonon-backend-vlc = throw "phonon-backend-vlc: Please use libsForQt5.phonon-backend-vlc, as Qt4 support in this package has been removed."; # added 2019-11-22
phonon = throw "phonon: Please use libsForQt5.phonon, as Qt4 support in this package has been removed."; # added 2019-11-22
pynagsystemd = throw "pynagsystemd was removed as it was unmaintained and incompatible with recent systemd versions. Instead use its fork check_systemd."; # added 2020-10-24
qca-qt5 = libsForQt5.qca-qt5; # added 2015-12-19
qcsxcad = libsForQt5.qcsxcad; # added 2020-11-05
quake3game = ioquake3; # added 2016-01-14
2 changes: 1 addition & 1 deletion pkgs/top-level/all-packages.nix
View file
Original file line number Diff line number Diff line change
@@ -17302,7 +17302,7 @@ in

checkSSLCert = callPackage ../servers/monitoring/nagios/plugins/check_ssl_cert.nix { };

pynagsystemd = callPackage ../servers/monitoring/nagios/plugins/pynagsystemd.nix { };
check_systemd = callPackage ../servers/monitoring/nagios/plugins/check_systemd.nix { };

neo4j = callPackage ../servers/nosql/neo4j { };