From 7a910041058f0f86ca3de727a95c197b836cfc61 Mon Sep 17 00:00:00 2001
From: Jennifer Graul <jgraul@relaix.net>
Date: Tue, 14 Apr 2026 14:00:56 +0200
Subject: [PATCH 1/2] librenms: 26.2.0 -> 26.3.1

Fixes #509914
Fixes #509901

The runtime dependencies ping, whois, nmap and mtr got removed in PR
https://github.com/librenms/librenms/pull/19131 for security reasons.
---
 pkgs/by-name/li/librenms/package.nix | 16 +++-------------
 1 file changed, 3 insertions(+), 13 deletions(-)

diff --git a/pkgs/by-name/li/librenms/package.nix b/pkgs/by-name/li/librenms/package.nix
index 65d060171836..feefd2b5c95b 100644
--- a/pkgs/by-name/li/librenms/package.nix
+++ b/pkgs/by-name/li/librenms/package.nix
@@ -11,13 +11,10 @@
   ipmitool,
   libvirt,
   monitoring-plugins,
-  mtr,
   net-snmp,
   nfdump,
-  nmap,
   rrdtool,
   system-sendmail,
-  whois,
   dataDir ? "/var/lib/librenms",
   logDir ? "/var/log/librenms",
 }:
@@ -27,16 +24,16 @@ let
 in
 phpPackage.buildComposerProject2 rec {
   pname = "librenms";
-  version = "26.2.0";
+  version = "26.3.1";
 
   src = fetchFromGitHub {
     owner = "librenms";
     repo = "librenms";
     tag = version;
-    hash = "sha256-cFFAUgUq+AxOdmHI92WYY6h9jSubXRUL4Jp8q+mDdHg=";
+    hash = "sha256-wLmZHE7W1ulBvUBpwVatdR8etFVhdG/zpggUpNIb65s=";
   };
 
-  vendorHash = "sha256-73E3fH1JUHxjphF6aPrmNJu3P1DZd28blmBxSiyuCTc=";
+  vendorHash = "sha256-uJ7DBJGQ4D1UnZXSUnrO3Fy3xEFz6ZxcMQ12E2jKKSM=";
 
   php = phpPackage;
 
@@ -45,14 +42,11 @@ phpPackage.buildComposerProject2 rec {
     ipmitool
     libvirt
     monitoring-plugins
-    mtr
     net-snmp
     nfdump
-    nmap
     rrdtool
     system-sendmail
     unixtools.whereis
-    whois
     (python3.withPackages (
       ps: with ps; [
         pymysql
@@ -78,22 +72,18 @@ phpPackage.buildComposerProject2 rec {
 
     substituteInPlace \
       $out/resources/definitions/config_definitions.json \
-      --replace-fail '"default": "/bin/ping",' '"default": "/run/wrappers/bin/ping",' \
       --replace-fail '"default": "fping",' '"default": "/run/wrappers/bin/fping",' \
       --replace-fail '"default": "fping6",' '"default": "/run/wrappers/bin/fping6",' \
       --replace-fail '"default": "rrdtool",' '"default": "${rrdtool}/bin/rrdtool",' \
       --replace-fail '"default": "snmpgetnext",' '"default": "${net-snmp}/bin/snmpgetnext",' \
       --replace-fail '"default": "traceroute",' '"default": "/run/wrappers/bin/traceroute",' \
       --replace-fail '"default": "/usr/bin/ipmitool",' '"default": "${ipmitool}/bin/ipmitool",' \
-      --replace-fail '"default": "/usr/bin/mtr",' '"default": "${mtr}/bin/mtr",' \
       --replace-fail '"default": "/usr/bin/nfdump",' '"default": "${nfdump}/bin/nfdump",' \
-      --replace-fail '"default": "/usr/bin/nmap",' '"default": "${nmap}/bin/nmap",' \
       --replace-fail '"default": "/usr/bin/snmpbulkwalk",' '"default": "${net-snmp}/bin/snmpbulkwalk",' \
       --replace-fail '"default": "/usr/bin/snmpget",' '"default": "${net-snmp}/bin/snmpget",' \
       --replace-fail '"default": "/usr/bin/snmptranslate",' '"default": "${net-snmp}/bin/snmptranslate",' \
       --replace-fail '"default": "/usr/bin/snmpwalk",' '"default": "${net-snmp}/bin/snmpwalk",' \
       --replace-fail '"default": "/usr/bin/virsh",' '"default": "${libvirt}/bin/virsh",' \
-      --replace-fail '"default": "/usr/bin/whois",' '"default": "${whois}/bin/whois",' \
       --replace-fail '"default": "/usr/lib/nagios/plugins",' '"default": "${monitoring-plugins}/bin",' \
       --replace-fail '"default": "/usr/sbin/sendmail",' '"default": "${system-sendmail}/bin/sendmail",'
 

From ede52337adc17d164316d88bebb44a9c9a27282f Mon Sep 17 00:00:00 2001
From: Jennifer Graul <jgraul@relaix.net>
Date: Tue, 14 Apr 2026 14:02:37 +0200
Subject: [PATCH 2/2] nixos/librenms: remove mtr since it is not used anymore

The runtime dependency mtr was removed among others in PR
https://github.com/librenms/librenms/pull/19131 for security reasons.
---
 nixos/modules/services/monitoring/librenms.nix | 2 --
 1 file changed, 2 deletions(-)

diff --git a/nixos/modules/services/monitoring/librenms.nix b/nixos/modules/services/monitoring/librenms.nix
index db45fea66d86..1c8f2e76818b 100644
--- a/nixos/modules/services/monitoring/librenms.nix
+++ b/nixos/modules/services/monitoring/librenms.nix
@@ -735,8 +735,6 @@ in
         '';
     };
 
-    programs.mtr.enable = true;
-
     services.logrotate = {
       enable = true;
       settings."${cfg.logDir}/librenms.log" = {