diff options
| author | ajs124 <ajs124@users.noreply.github.com> | 2021-11-17 23:17:34 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-11-17 23:17:34 +0100 |
| commit | 2d9a53ab49af14b54d25ae7f7b0955f7afce769d (patch) | |
| tree | 81731c059ac67498187cf457fc3b1701a665c7b4 /pkgs/servers/monitoring | |
| parent | 9ea84eabd8c43b6f1d8094110fa17e3c246d7d29 (diff) | |
| parent | e0661862ff2098bd018e6eb6d7b3662a5dc02d05 (diff) | |
| download | nixlib-2d9a53ab49af14b54d25ae7f7b0955f7afce769d.tar nixlib-2d9a53ab49af14b54d25ae7f7b0955f7afce769d.tar.gz nixlib-2d9a53ab49af14b54d25ae7f7b0955f7afce769d.tar.bz2 nixlib-2d9a53ab49af14b54d25ae7f7b0955f7afce769d.tar.lz nixlib-2d9a53ab49af14b54d25ae7f7b0955f7afce769d.tar.xz nixlib-2d9a53ab49af14b54d25ae7f7b0955f7afce769d.tar.zst nixlib-2d9a53ab49af14b54d25ae7f7b0955f7afce769d.zip | |
Merge pull request #146379 from helsinki-systems/upd/icinga2
icinga2: 2.13.1 -> 2.13.2
Diffstat (limited to 'pkgs/servers/monitoring')
| -rw-r--r-- | pkgs/servers/monitoring/icinga2/default.nix | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/pkgs/servers/monitoring/icinga2/default.nix b/pkgs/servers/monitoring/icinga2/default.nix index 7079ae4ff8db..0b039bf21a79 100644 --- a/pkgs/servers/monitoring/icinga2/default.nix +++ b/pkgs/servers/monitoring/icinga2/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub, cmake, flex, bison, systemd +{ stdenv, lib, fetchFromGitHub, fetchpatch, cmake, flex, bison, systemd , boost, openssl, patchelf, mariadb-connector-c, postgresql, zlib # Databases , withMysql ? true, withPostgresql ? false @@ -9,19 +9,24 @@ stdenv.mkDerivation rec { pname = "icinga2${nameSuffix}"; - version = "2.13.1"; + version = "2.13.2"; src = fetchFromGitHub { owner = "icinga"; repo = "icinga2"; rev = "v${version}"; - sha256 = "sha256-cGVUNO3p00bkPd4tPbipevuixHz8ptk6W8y1rl3dge8="; + sha256 = "sha256:1ijvav2ymgq1i8jycrqbp2y4r54y0dkwjnwxc20bmcixxh877zdn"; }; patches = [ ./etc-icinga2.patch # Makes /etc/icinga2 relative to / instead of the store path ./no-systemd-service.patch # Prevent systemd service from being written to /usr ./no-var-directories.patch # Prevent /var directories from being created + # Fix the non-unity build + (fetchpatch { + url = "https://github.com/Icinga/icinga2/commit/2ad0a4b8c3852ad937fec9fc85780230257c821e.patch"; + sha256 = "sha256:06qn7x73zbccmd8ycj46a29x2rr6qjwg0rr831wc2gc6q2k9d2g0"; + }) ]; cmakeFlags = let |