Clone of https://github.com/NixOS/nixpkgs.git (to stress-test knotserver)

netdata: 2.5.3 -> 2.6.2 (#426186)

authored by pyrox.dev and committed by

GitHub cdfc42d8 e98a7ef7

+52 -19
+52 -19
pkgs/tools/system/netdata/default.nix
··· 47 47 withDBengine ? true, 48 48 withDebug ? false, 49 49 withEbpf ? false, 50 - withIpmi ? (stdenv.hostPlatform.isLinux), 50 + withIpmi ? stdenv.hostPlatform.isLinux, 51 51 withLibbacktrace ? true, 52 + withML ? true, 52 53 withNdsudo ? false, 53 - withNetfilter ? (stdenv.hostPlatform.isLinux), 54 - withNetworkViewer ? (stdenv.hostPlatform.isLinux), 54 + withNetfilter ? stdenv.hostPlatform.isLinux, 55 + withNetworkViewer ? stdenv.hostPlatform.isLinux, 55 56 withSsl ? true, 56 - withSystemdJournal ? (stdenv.hostPlatform.isLinux), 57 - withML ? true, 57 + withSystemdJournal ? stdenv.hostPlatform.isLinux, 58 + withSystemdUnits ? stdenv.hostPlatform.isLinux, 58 59 }: 59 60 stdenv.mkDerivation (finalAttrs: { 60 - version = "2.5.3"; 61 + version = "2.6.2"; 61 62 pname = "netdata"; 62 63 63 64 src = fetchFromGitHub { 64 65 owner = "netdata"; 65 66 repo = "netdata"; 66 67 rev = "v${finalAttrs.version}"; 67 - hash = "sha256-OdH6cQ2dYvbeLh9ljaqmdr02VN2qbvNUXbPNCEkNzxc="; 68 + hash = "sha256-XtU+oGynAnpwWTinwXVjtRYsTwIyAhkiRqY9CaOo7B0="; 68 69 fetchSubmodules = true; 69 70 }; 70 71 ··· 119 120 libnetfilter_acct 120 121 ] 121 122 ++ lib.optionals withSsl [ openssl ] 122 - ++ lib.optionals withSystemdJournal [ systemd ]; 123 + ++ lib.optionals withSystemdJournal [ systemd ] 124 + ++ lib.optionals withSystemdUnits [ systemd ]; 123 125 124 126 patches = [ 125 127 # Allow ndsudo to use non-hardcoded `PATH` ··· 166 168 $out/libexec/netdata/plugins.d/slabinfo.plugin.org 167 169 mv $out/libexec/netdata/plugins.d/debugfs.plugin \ 168 170 $out/libexec/netdata/plugins.d/debugfs.plugin.org 169 - ${lib.optionalString withSystemdJournal '' 170 - mv $out/libexec/netdata/plugins.d/systemd-journal.plugin \ 171 - $out/libexec/netdata/plugins.d/systemd-journal.plugin.org 172 - ''} 173 171 ${lib.optionalString withIpmi '' 174 172 mv $out/libexec/netdata/plugins.d/freeipmi.plugin \ 175 173 $out/libexec/netdata/plugins.d/freeipmi.plugin.org 176 174 ''} 177 - ${lib.optionalString withNetworkViewer '' 178 - mv $out/libexec/netdata/plugins.d/network-viewer.plugin \ 179 - $out/libexec/netdata/plugins.d/network-viewer.plugin.org 180 - ''} 181 175 ${lib.optionalString withNdsudo '' 182 176 mv $out/libexec/netdata/plugins.d/ndsudo \ 183 177 $out/libexec/netdata/plugins.d/ndsudo.org 184 178 185 179 ln -s /var/lib/netdata/ndsudo/ndsudo $out/libexec/netdata/plugins.d/ndsudo 186 180 ''} 181 + ${lib.optionalString withNetworkViewer '' 182 + mv $out/libexec/netdata/plugins.d/network-viewer.plugin \ 183 + $out/libexec/netdata/plugins.d/network-viewer.plugin.org 184 + ''} 185 + ${lib.optionalString withSystemdJournal '' 186 + mv $out/libexec/netdata/plugins.d/systemd-journal.plugin \ 187 + $out/libexec/netdata/plugins.d/systemd-journal.plugin.org 188 + ''} 189 + ${lib.optionalString withSystemdUnits '' 190 + mv $out/libexec/netdata/plugins.d/systemd-units.plugin \ 191 + $out/libexec/netdata/plugins.d/systemd-units.plugin.org 192 + ''} 187 193 ''; 188 194 189 195 preConfigure = '' ··· 194 200 substituteInPlace packaging/cmake/Modules/NetdataGoTools.cmake \ 195 201 --replace-fail \ 196 202 'GOPROXY=https://proxy.golang.org' \ 197 - 'GOPROXY=file://${finalAttrs.passthru.netdata-go-modules}' 203 + 'GOPROXY=file://${finalAttrs.passthru.netdata-go-modules},file://${finalAttrs.passthru.nd-mcp}' 198 204 199 205 # Prevent the path to be caught into the Nix store path. 200 206 substituteInPlace CMakeLists.txt \ ··· 222 228 (lib.cmakeBool "ENABLE_EXPORTER_PROMETHEUS_REMOTE_WRITE" withConnPrometheus) 223 229 (lib.cmakeBool "ENABLE_JEMALLOC" true) 224 230 (lib.cmakeBool "ENABLE_LIBBACKTRACE" withLibbacktrace) 231 + (lib.cmakeBool "ENABLE_ML" withML) 225 232 (lib.cmakeBool "ENABLE_PLUGIN_CUPS" withCups) 226 233 (lib.cmakeBool "ENABLE_PLUGIN_EBPF" withEbpf) 227 234 (lib.cmakeBool "ENABLE_PLUGIN_FREEIPMI" withIpmi) 228 235 (lib.cmakeBool "ENABLE_PLUGIN_NETWORK_VIEWER" withNetworkViewer) 229 236 (lib.cmakeBool "ENABLE_PLUGIN_SYSTEMD_JOURNAL" withSystemdJournal) 237 + (lib.cmakeBool "ENABLE_PLUGIN_SYSTEMD_UNITS" withSystemdUnits) 230 238 (lib.cmakeBool "ENABLE_PLUGIN_XENSTAT" false) 231 - (lib.cmakeBool "ENABLE_ML" withML) 232 239 # Suggested by upstream. 233 240 "-G Ninja" 234 241 ] ··· 252 259 enableParallelBuilding = true; 253 260 254 261 passthru = rec { 262 + nd-mcp = 263 + (buildGoModule { 264 + pname = "nd-mcp"; 265 + version = finalAttrs.version; 266 + inherit (finalAttrs) src; 267 + 268 + sourceRoot = "${finalAttrs.src.name}/src/web/mcp/bridges/stdio-golang"; 269 + 270 + vendorHash = "sha256-6JfHrBloJQ5wHyogIPTVDZjlITWZXbsv2m2lMlQmBUY="; 271 + 272 + proxyVendor = true; 273 + doCheck = false; 274 + 275 + subPackages = [ "." ]; 276 + 277 + ldflags = [ 278 + "-s" 279 + "-w" 280 + ]; 281 + 282 + meta = { 283 + description = "Netdata Model Context Protocol (MCP) Integration"; 284 + license = lib.licenses.gpl3Only; 285 + }; 286 + }).goModules; 287 + 255 288 netdata-go-modules = 256 289 (buildGoModule { 257 290 pname = "netdata-go-plugins"; ··· 259 292 260 293 sourceRoot = "${finalAttrs.src.name}/src/go/plugin/go.d"; 261 294 262 - vendorHash = "sha256-N03IGTtF78PCo4kf0Sdtzv6f8z47ohg8g3YIXtINRjU="; 295 + vendorHash = "sha256-aOFmfBcBjnTfFHfMNemSJHbnMnhBojYrGe21zDxPxME="; 263 296 doCheck = false; 264 297 proxyVendor = true; 265 298