tjh.dev
nixpkgs mirror (for testing)
github.com/NixOS/nixpkgs
nix
icinga2: 2.14.3 -> 2.14.5
+25
-21
+2
-2
pkgs/servers/monitoring/icinga2/default.nix
+2
-2
pkgs/servers/monitoring/icinga2/default.nix
···
30
30
31
31
stdenv.mkDerivation rec {
32
32
pname = "icinga2${nameSuffix}";
33
-
version = "2.14.3";
33
+
version = "2.14.5";
34
34
35
35
src = fetchFromGitHub {
36
36
owner = "icinga";
37
37
repo = "icinga2";
38
38
rev = "v${version}";
39
-
hash = "sha256-QXe/+yQlyyOa78eEiudDni08SCUP3nhTYVpbmVUVKA8=";
39
+
hash = "sha256-5FQIcOvuq1GHX80rYuZ3jCM3CF9Fq1149nvlO1njqfA=";
40
40
};
41
41
42
42
patches = [
+23
-19
pkgs/servers/monitoring/icinga2/no-var-directories.patch
+23
-19
pkgs/servers/monitoring/icinga2/no-var-directories.patch
···
1
1
diff --git a/icinga-app/CMakeLists.txt b/icinga-app/CMakeLists.txt
2
-
index 87993df..819c87b 100644
2
+
index 1c92d8331..e77199959 100644
3
3
--- a/icinga-app/CMakeLists.txt
4
4
+++ b/icinga-app/CMakeLists.txt
5
-
@@ -106,7 +106,3 @@ install(
5
+
@@ -94,9 +94,3 @@ install(
6
6
TARGETS icinga-app
7
7
RUNTIME DESTINATION ${InstallPath}
8
8
)
9
9
-
10
-
-install(CODE "file(MAKE_DIRECTORY \"\$ENV{DESTDIR}${ICINGA2_FULL_LOGDIR}\")")
11
-
-install(CODE "file(MAKE_DIRECTORY \"\$ENV{DESTDIR}${ICINGA2_FULL_DATADIR}\")")
12
-
-install(CODE "file(MAKE_DIRECTORY \"\$ENV{DESTDIR}${ICINGA2_FULL_INITRUNDIR}\")")
10
+
-if(NOT WIN32)
11
+
- install(CODE "file(MAKE_DIRECTORY \"\$ENV{DESTDIR}${ICINGA2_FULL_LOGDIR}\")")
12
+
- install(CODE "file(MAKE_DIRECTORY \"\$ENV{DESTDIR}${ICINGA2_FULL_DATADIR}\")")
13
+
- install(CODE "file(MAKE_DIRECTORY \"\$ENV{DESTDIR}${ICINGA2_FULL_INITRUNDIR}\")")
14
+
-endif()
13
15
diff --git a/lib/base/CMakeLists.txt b/lib/base/CMakeLists.txt
14
-
index 5dda179..22cf69f 100644
16
+
index 986050017..39711c79e 100644
15
17
--- a/lib/base/CMakeLists.txt
16
18
+++ b/lib/base/CMakeLists.txt
17
-
@@ -125,7 +125,4 @@ set_target_properties (
19
+
@@ -154,9 +154,4 @@ set_target_properties (
18
20
FOLDER Lib
19
21
)
20
22
21
-
-install(CODE "file(MAKE_DIRECTORY \"\$ENV{DESTDIR}${ICINGA2_FULL_CACHEDIR}\")")
22
-
-install(CODE "file(MAKE_DIRECTORY \"\$ENV{DESTDIR}${ICINGA2_FULL_LOGDIR}/crash\")")
23
+
-if(NOT WIN32)
24
+
- install(CODE "file(MAKE_DIRECTORY \"\$ENV{DESTDIR}${ICINGA2_FULL_CACHEDIR}\")")
25
+
- install(CODE "file(MAKE_DIRECTORY \"\$ENV{DESTDIR}${ICINGA2_FULL_LOGDIR}/crash\")")
26
+
-endif()
23
27
-
24
28
set(CPACK_NSIS_EXTRA_INSTALL_COMMANDS "${CPACK_NSIS_EXTRA_INSTALL_COMMANDS}" PARENT_SCOPE)
25
29
diff --git a/lib/perfdata/CMakeLists.txt b/lib/perfdata/CMakeLists.txt
···
39
35
-
40
36
set(CPACK_NSIS_EXTRA_INSTALL_COMMANDS "${CPACK_NSIS_EXTRA_INSTALL_COMMANDS}" PARENT_SCOPE)
41
37
diff --git a/lib/remote/CMakeLists.txt b/lib/remote/CMakeLists.txt
42
-
index 65113d2..5e4398f 100644
38
+
index 2271abff6..fc03b5c6b 100644
43
39
--- a/lib/remote/CMakeLists.txt
44
40
+++ b/lib/remote/CMakeLists.txt
45
-
@@ -55,12 +55,3 @@ set_target_properties (
41
+
@@ -57,12 +57,3 @@ set_target_properties (
46
42
remote PROPERTIES
47
43
FOLDER Lib
48
44
)
49
45
-
50
-
-#install(CODE "file(MAKE_DIRECTORY \"\$ENV{DESTDIR}${ICINGA2_FULL_DATADIR}/api\")")
51
-
-install(CODE "file(MAKE_DIRECTORY \"\$ENV{DESTDIR}${ICINGA2_FULL_DATADIR}/api/log\")")
52
-
-install(CODE "file(MAKE_DIRECTORY \"\$ENV{DESTDIR}${ICINGA2_FULL_DATADIR}/api/zones\")")
53
-
-install(CODE "file(MAKE_DIRECTORY \"\$ENV{DESTDIR}${ICINGA2_FULL_DATADIR}/api/zones-stage\")")
54
-
-install(CODE "file(MAKE_DIRECTORY \"\$ENV{DESTDIR}${ICINGA2_FULL_DATADIR}/certs\")")
55
-
-install(CODE "file(MAKE_DIRECTORY \"\$ENV{DESTDIR}${ICINGA2_FULL_DATADIR}/certificate-requests\")")
56
-
-
57
-
-
46
+
-if(NOT WIN32)
47
+
- #install(CODE "file(MAKE_DIRECTORY \"\$ENV{DESTDIR}${ICINGA2_FULL_DATADIR}/api\")")
48
+
- install(CODE "file(MAKE_DIRECTORY \"\$ENV{DESTDIR}${ICINGA2_FULL_DATADIR}/api/log\")")
49
+
- install(CODE "file(MAKE_DIRECTORY \"\$ENV{DESTDIR}${ICINGA2_FULL_DATADIR}/api/zones\")")
50
+
- install(CODE "file(MAKE_DIRECTORY \"\$ENV{DESTDIR}${ICINGA2_FULL_DATADIR}/api/zones-stage\")")
51
+
- install(CODE "file(MAKE_DIRECTORY \"\$ENV{DESTDIR}${ICINGA2_FULL_DATADIR}/certs\")")
52
+
- install(CODE "file(MAKE_DIRECTORY \"\$ENV{DESTDIR}${ICINGA2_FULL_DATADIR}/certificate-requests\")")
53
+
-endif()
58
54
diff --git a/lib/compat/CMakeLists.txt b/lib/compat/CMakeLists.txt
59
55
index 1438626..d882ae2 100644
60
56
--- a/lib/compat/CMakeLists.txt