Unverified Commit 7a910041 authored by Jennifer Graul's avatar Jennifer Graul
Browse files

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.
parent d68f5f8c

pkgs/by-name/li/librenms/package.nix

+3 −13
Original line number Diff line number Diff line
@@ -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",'