Unverified Commit c7155484 authored by Weijia Wang's avatar Weijia Wang Committed by GitHub
Browse files

Merge pull request #257104 from vifino/unifi-7.5.176 

unifi7: 7.4.156 -> 7.5.176
parents 9e821b5a 19113107

nixos/modules/services/networking/unifi.nix

+6 −2
Original line number Diff line number Diff line
@@ -5,6 +5,10 @@ let 
  stateDir = "/var/lib/unifi";

  cmd = ''

    @${cfg.jrePackage}/bin/java java \

        ${optionalString (lib.versionAtLeast (lib.getVersion cfg.jrePackage) "16")

        "--add-opens java.base/java.lang=ALL-UNNAMED --add-opens=java.base/java.time=ALL-UNNAMED "

        + "--add-opens java.base/sun.security.util=ALL-UNNAMED --add-opens java.base/java.io=ALL-UNNAMED "

        + "--add-opens java.rmi/sun.rmi.transport=ALL-UNNAMED"} \

        ${optionalString (cfg.initialJavaHeapSize != null) "-Xms${(toString cfg.initialJavaHeapSize)}m"} \

        ${optionalString (cfg.maximumJavaHeapSize != null) "-Xmx${(toString cfg.maximumJavaHeapSize)}m"} \

        -jar ${stateDir}/lib/ace.jar
@@ -24,8 +28,8 @@ in 


    services.unifi.jrePackage = mkOption {

      type = types.package;

      default = if (lib.versionAtLeast (lib.getVersion cfg.unifiPackage) "7.3") then pkgs.jdk11 else pkgs.jre8;

      defaultText = literalExpression ''if (lib.versionAtLeast (lib.getVersion cfg.unifiPackage) "7.3" then pkgs.jdk11 else pkgs.jre8'';

      default = if (lib.versionAtLeast (lib.getVersion cfg.unifiPackage) "7.5") then pkgs.jdk17_headless else if (lib.versionAtLeast (lib.getVersion cfg.unifiPackage) "7.3") then pkgs.jdk11 else pkgs.jre8;

      defaultText = literalExpression ''if (lib.versionAtLeast (lib.getVersion cfg.unifiPackage) "7.5") then pkgs.jdk17_headless else if (lib.versionAtLeast (lib.getVersion cfg.unifiPackage) "7.3" then pkgs.jdk11 else pkgs.jre8'';

      description = lib.mdDoc ''

        The JRE package to use. Check the release notes to ensure it is supported.

      '';

pkgs/servers/unifi/default.nix

+3 −2
Original line number Diff line number Diff line
@@ -66,7 +66,8 @@ in rec { 
  };



  unifi7 = generic {

    version = "7.4.156";

    sha256 = "sha256-UJjzSC2qKi2ABwH5p0s/5fXfB3NVfYBb3wBfE/8NlK4=";

    version = "7.5.176";

    suffix = "-1136930355";

    sha256 = "sha256-prsFq09zYrB74p/MGKjwvZftw78k9wbIva5xFdk+Ztw=";

  };

}