lol

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

authored by

Sandro and committed by
GitHub
66e0910e b6191b9a

+13 -3
+11 -1
nixos/modules/services/misc/zoneminder.nix
··· 283 283 phpfpm = lib.mkIf useNginx { 284 284 pools.zoneminder = { 285 285 inherit user group; 286 - phpPackage = pkgs.php.withExtensions ({ enabled, all }: enabled ++ [ all.apcu ]); 286 + phpPackage = pkgs.php.withExtensions ( 287 + { enabled, all }: enabled ++ [ all.apcu all.sysvsem ]); 287 288 phpOptions = '' 288 289 date.timezone = "${config.time.timeZone}" 289 290 ''; ··· 326 327 fi 327 328 328 329 ${zoneminder}/bin/zmupdate.pl -nointeractive 330 + ${zoneminder}/bin/zmupdate.pl --nointeractive -f 331 + 332 + # Update ZM's Nix store path in the configuration table. Do nothing if the config doesn't 333 + # contain ZM's Nix store path. 334 + ${config.services.mysql.package}/bin/mysql -u zoneminder zm << EOF 335 + UPDATE Config 336 + SET Value = REGEXP_REPLACE(Value, "^/nix/store/[^-/]+-zoneminder-[^/]+", "${pkgs.zoneminder}") 337 + WHERE Name = "ZM_FONT_FILE_LOCATION"; 338 + EOF 329 339 ''; 330 340 serviceConfig = { 331 341 User = user;
+2 -2
pkgs/servers/zoneminder/default.nix
··· 57 57 58 58 in stdenv.mkDerivation rec { 59 59 pname = "zoneminder"; 60 - version = "1.36.28"; 60 + version = "1.36.32"; 61 61 62 62 src = fetchFromGitHub { 63 63 owner = "ZoneMinder"; 64 64 repo = "zoneminder"; 65 65 rev = version; 66 - sha256 = "sha256-x00u7AWMNS+wAO/tdWi7GYbMZZM7XnszCO57ZDlm0J0="; 66 + sha256 = "sha256-8iRoGpkpZVOOr0wSY9iey2x4gPfKTfUNtt5TCHCCRIQ="; 67 67 fetchSubmodules = true; 68 68 }; 69 69