diff options
| author | Janne Heß <janne@hess.ooo> | 2021-12-13 12:06:11 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-12-13 12:06:11 +0100 |
| commit | 24e95b00528589e1642f8486f407d4da7129f495 (patch) | |
| tree | 3314b677059e334b20bc09905e2dfdd0cda0e224 | |
| parent | why3.withProvers: add dontUnpack (diff) | |
| parent | nixos/unifi: Apply log4j2 mitigation (diff) | |
| download | nixpkgs-24e95b00528589e1642f8486f407d4da7129f495.tar.gz | |
Merge pull request #150425 from pennae/backport-150329-to-release-21.11
| -rw-r--r-- | nixos/modules/services/networking/unifi.nix | 1 | ||||
| -rw-r--r-- | pkgs/servers/unifi/default.nix | 4 |
2 files changed, 3 insertions, 2 deletions
diff --git a/nixos/modules/services/networking/unifi.nix b/nixos/modules/services/networking/unifi.nix index 53ad4df477fc..174e919f988b 100644 --- a/nixos/modules/services/networking/unifi.nix +++ b/nixos/modules/services/networking/unifi.nix @@ -7,6 +7,7 @@ let @${cfg.jrePackage}/bin/java java \ ${optionalString (cfg.initialJavaHeapSize != null) "-Xms${(toString cfg.initialJavaHeapSize)}m"} \ ${optionalString (cfg.maximumJavaHeapSize != null) "-Xmx${(toString cfg.maximumJavaHeapSize)}m"} \ + ${optionalString (lib.versionOlder cfg.unifiPackage.version "6.5.54") "-Dlog4j2.formatMsgNoLookups=true"} \ -jar ${stateDir}/lib/ace.jar ''; in diff --git a/pkgs/servers/unifi/default.nix b/pkgs/servers/unifi/default.nix index 5209927c506d..3d3ac89e6c0d 100644 --- a/pkgs/servers/unifi/default.nix +++ b/pkgs/servers/unifi/default.nix @@ -52,7 +52,7 @@ in rec { }; unifi6 = generic { - version = "6.4.54"; - sha256 = "05z0r47p6cl7yi7f9a40xrsr61ndm2904vway59q1acws5i5mm9g"; + version = "6.5.54"; + sha256 = "sha256-M2gYqKZi0czFgfWx0tTW43b+aUVqS6Mg+misRB9/Fes="; }; } |