From c7e87c141e961631f63ed14ba42b58790ca8bea5 Mon Sep 17 00:00:00 2001
From: Jennifer Graul <jgraul@relaix.net>
Date: Wed, 18 Dec 2024 12:53:44 +0100
Subject: [PATCH] librenms: 24.11.0 -> 24.12.0

---
 .../li/librenms/broken-binary-paths.diff      | 22 +++++++++----------
 pkgs/by-name/li/librenms/package.nix          |  6 ++---
 2 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/pkgs/by-name/li/librenms/broken-binary-paths.diff b/pkgs/by-name/li/librenms/broken-binary-paths.diff
index 158ef779b10a6..6d98165bf7e63 100644
--- a/pkgs/by-name/li/librenms/broken-binary-paths.diff
+++ b/pkgs/by-name/li/librenms/broken-binary-paths.diff
@@ -1,18 +1,18 @@
-diff --git a/LibreNMS/Config.php b/LibreNMS/Config.php
-index 5ed6b71..de7718a 100644
---- a/LibreNMS/Config.php
-+++ b/LibreNMS/Config.php
-@@ -460,13 +460,6 @@ class Config
-             self::persist('device_display_default', $display_value);
+diff --git a/app/ConfigRepository.php b/app/ConfigRepository.php
+index 2d73cce81..b0110540b 100644
+--- a/app/ConfigRepository.php
++++ b/app/ConfigRepository.php
+@@ -444,13 +444,6 @@ class ConfigRepository
+             $this->persist('device_display_default', $display_value);
          }
- 
+
 -        // make sure we have full path to binaries in case PATH isn't set
 -        foreach (['fping', 'fping6', 'snmpgetnext', 'rrdtool', 'traceroute'] as $bin) {
--            if (! is_executable(self::get($bin))) {
--                self::persist($bin, self::locateBinary($bin));
+-            if (! is_executable($this->get($bin))) {
+-                $this->persist($bin, $this->locateBinary($bin));
 -            }
 -        }
 -
-         if (! self::has('rrdtool_version')) {
-             self::persist('rrdtool_version', Rrd::version());
+         if (! $this->has('rrdtool_version')) {
+             $this->persist('rrdtool_version', (new Version($this))->rrdtool());
          }
diff --git a/pkgs/by-name/li/librenms/package.nix b/pkgs/by-name/li/librenms/package.nix
index 2b0efaf6cf438..b96c4a2eb6f71 100644
--- a/pkgs/by-name/li/librenms/package.nix
+++ b/pkgs/by-name/li/librenms/package.nix
@@ -27,16 +27,16 @@ let
 in
 phpPackage.buildComposerProject rec {
   pname = "librenms";
-  version = "24.11.0";
+  version = "24.12.0";
 
   src = fetchFromGitHub {
     owner = "librenms";
     repo = pname;
     rev = "${version}";
-    sha256 = "sha256-pcUkmcqD/NNedKlpNEBFf9Pmxkq6qXVdagRj/QTePzw=";
+    sha256 = "sha256-/0mc4wTx9WDxgDxqq+Kut8uX/Yr+bxqZ1BeJvmFDxG8=";
   };
 
-  vendorHash = "sha256-0ZMQYODlXLHOjwWYvbrY/VQ2Zm9D7r1NvXRyP0q346M=";
+  vendorHash = "sha256-DNiTSXt/1Qr67BdlTu3ccP4Whw5pyybeFJ045c/e8Dc=";
 
   php = phpPackage;