tangled
alpha
login
or
join now
pyrox.dev
/
nixpkgs
lol
0
fork
atom
overview
issues
pulls
pipelines
librenms: 24.11.0 -> 24.12.0
Jennifer Graul
1 year ago
c7e87c14
84edf387
+14
-14
2 changed files
expand all
collapse all
unified
split
pkgs
by-name
li
librenms
broken-binary-paths.diff
package.nix
+11
-11
pkgs/by-name/li/librenms/broken-binary-paths.diff
···
1
-
diff --git a/LibreNMS/Config.php b/LibreNMS/Config.php
2
-
index 5ed6b71..de7718a 100644
3
-
--- a/LibreNMS/Config.php
4
-
+++ b/LibreNMS/Config.php
5
-
@@ -460,13 +460,6 @@ class Config
6
-
self::persist('device_display_default', $display_value);
7
}
8
-
9
- // make sure we have full path to binaries in case PATH isn't set
10
- foreach (['fping', 'fping6', 'snmpgetnext', 'rrdtool', 'traceroute'] as $bin) {
11
-
- if (! is_executable(self::get($bin))) {
12
-
- self::persist($bin, self::locateBinary($bin));
13
- }
14
- }
15
-
16
-
if (! self::has('rrdtool_version')) {
17
-
self::persist('rrdtool_version', Rrd::version());
18
}
···
1
+
diff --git a/app/ConfigRepository.php b/app/ConfigRepository.php
2
+
index 2d73cce81..b0110540b 100644
3
+
--- a/app/ConfigRepository.php
4
+
+++ b/app/ConfigRepository.php
5
+
@@ -444,13 +444,6 @@ class ConfigRepository
6
+
$this->persist('device_display_default', $display_value);
7
}
8
+
9
- // make sure we have full path to binaries in case PATH isn't set
10
- foreach (['fping', 'fping6', 'snmpgetnext', 'rrdtool', 'traceroute'] as $bin) {
11
+
- if (! is_executable($this->get($bin))) {
12
+
- $this->persist($bin, $this->locateBinary($bin));
13
- }
14
- }
15
-
16
+
if (! $this->has('rrdtool_version')) {
17
+
$this->persist('rrdtool_version', (new Version($this))->rrdtool());
18
}
+3
-3
pkgs/by-name/li/librenms/package.nix
···
27
in
28
phpPackage.buildComposerProject rec {
29
pname = "librenms";
30
-
version = "24.11.0";
31
32
src = fetchFromGitHub {
33
owner = "librenms";
34
repo = pname;
35
rev = "${version}";
36
-
sha256 = "sha256-pcUkmcqD/NNedKlpNEBFf9Pmxkq6qXVdagRj/QTePzw=";
37
};
38
39
-
vendorHash = "sha256-0ZMQYODlXLHOjwWYvbrY/VQ2Zm9D7r1NvXRyP0q346M=";
40
41
php = phpPackage;
42
···
27
in
28
phpPackage.buildComposerProject rec {
29
pname = "librenms";
30
+
version = "24.12.0";
31
32
src = fetchFromGitHub {
33
owner = "librenms";
34
repo = pname;
35
rev = "${version}";
36
+
sha256 = "sha256-/0mc4wTx9WDxgDxqq+Kut8uX/Yr+bxqZ1BeJvmFDxG8=";
37
};
38
39
+
vendorHash = "sha256-DNiTSXt/1Qr67BdlTu3ccP4Whw5pyybeFJ045c/e8Dc=";
40
41
php = phpPackage;
42