Unverified Commit 66e0910e authored by Sandro Jäckel's avatar Sandro Jäckel Committed by GitHub
Browse files

Merge pull request #199729 from peat-psuwit/zoneminder-1.36.31 

zoneminder, nixos/zoneminder: 1.36.28 -> 1.36.31, fix issues relating to upgrade
parents b6191b9a 86b48684

nixos/modules/services/misc/zoneminder.nix

+11 −1
Original line number Diff line number Diff line
@@ -283,7 +283,8 @@ in { 
      phpfpm = lib.mkIf useNginx {

        pools.zoneminder = {

          inherit user group;

          phpPackage = pkgs.php.withExtensions ({ enabled, all }: enabled ++ [ all.apcu ]);

          phpPackage = pkgs.php.withExtensions (

            { enabled, all }: enabled ++ [ all.apcu all.sysvsem ]);

          phpOptions = ''

            date.timezone = "${config.time.timeZone}"

          '';
@@ -326,6 +327,15 @@ in { 
          fi



          ${zoneminder}/bin/zmupdate.pl -nointeractive

          ${zoneminder}/bin/zmupdate.pl --nointeractive -f



          # Update ZM's Nix store path in the configuration table. Do nothing if the config doesn't

          # contain ZM's Nix store path.

          ${config.services.mysql.package}/bin/mysql -u zoneminder zm << EOF

            UPDATE Config

              SET Value = REGEXP_REPLACE(Value, "^/nix/store/[^-/]+-zoneminder-[^/]+", "${pkgs.zoneminder}")

              WHERE Name = "ZM_FONT_FILE_LOCATION";

          EOF

        '';

        serviceConfig = {

          User = user;

pkgs/servers/zoneminder/default.nix

+2 −2
Original line number Diff line number Diff line
@@ -57,13 +57,13 @@ let 


in stdenv.mkDerivation rec {

  pname = "zoneminder";

  version = "1.36.28";

  version = "1.36.32";



  src = fetchFromGitHub {

    owner  = "ZoneMinder";

    repo   = "zoneminder";

    rev    = version;

    sha256 = "sha256-x00u7AWMNS+wAO/tdWi7GYbMZZM7XnszCO57ZDlm0J0=";

    sha256 = "sha256-8iRoGpkpZVOOr0wSY9iey2x4gPfKTfUNtt5TCHCCRIQ=";

    fetchSubmodules = true;

  };