Merge branch 'staging-next-21.05' into staging-21.05

pkgs/servers/ldap/389/default.nix

@@ -65,5 +65,8 @@ stdenv.mkDerivation rec {
     description = "Enterprise-class Open Source LDAP server for Linux";
     license = licenses.gpl3Plus;
     platforms = platforms.linux;
+    knownVulnerabilities = [
+      "CVE-2021-3514" # https://nvd.nist.gov/vuln/detail/CVE-2021-3514
+    ];
   };
 }

pkgs/servers/monitoring/zabbix/agent2.nix

@@ -46,8 +46,13 @@ import ./versions.nix ({ version, sha256 }:
     '';
 
     installPhase = ''
+      mkdir -p $out/sbin
+
       install -Dm0644 src/go/conf/zabbix_agent2.conf $out/etc/zabbix_agent2.conf
       install -Dm0755 src/go/bin/zabbix_agent2 $out/bin/zabbix_agent2
+
+      # create a symlink which is compatible with the zabbixAgent module
+      ln -s $out/bin/zabbix_agent2 $out/sbin/zabbix_agentd
     '';
 
     meta = with lib; {