From 0bc74963f09dc60aefb151d539402dcf5d2833b0 Mon Sep 17 00:00:00 2001 From: Ratchanan Srirattanamet Date: Sun, 8 Jan 2023 00:14:02 +0700 Subject: [PATCH 1/9] zoneminder: 1.36.28 -> 1.36.32 --- pkgs/servers/zoneminder/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/zoneminder/default.nix b/pkgs/servers/zoneminder/default.nix index cfdde9ab2d87..80ff140122fd 100644 --- a/pkgs/servers/zoneminder/default.nix +++ b/pkgs/servers/zoneminder/default.nix @@ -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; }; From 4c64355fa3f48800ec36ef0b8c41dd5bcb895d6e Mon Sep 17 00:00:00 2001 From: Ratchanan Srirattanamet Date: Sat, 5 Nov 2022 15:48:03 +0700 Subject: [PATCH 2/9] nixos/zoneminder: also run zmupdate "freshen" on start -f "freshen the configuration in the database", which will matter when ZoneMinder adds a new configuration item [1]. Although it can also be run without a new configuration item too; upstream's Debian postinst code always run it on upgrade [2]. [1] e.g. https://forums.zoneminder.com/viewtopic.php?p=127220 [2] https://github.com/ZoneMinder/zoneminder/blob/master/distros/ubuntu2004/zoneminder.postinst#L45 --- nixos/modules/services/misc/zoneminder.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/modules/services/misc/zoneminder.nix b/nixos/modules/services/misc/zoneminder.nix index 109415a20ee6..a52428ca1f67 100644 --- a/nixos/modules/services/misc/zoneminder.nix +++ b/nixos/modules/services/misc/zoneminder.nix @@ -326,6 +326,7 @@ in { fi ${zoneminder}/bin/zmupdate.pl -nointeractive + ${zoneminder}/bin/zmupdate.pl --nointeractive -f ''; serviceConfig = { User = user; From 8093c136a2fadb81a6bc629a33827ed4c39ed55e Mon Sep 17 00:00:00 2001 From: Ratchanan Srirattanamet Date: Sat, 5 Nov 2022 15:56:09 +0700 Subject: [PATCH 3/9] nixos/zoneminder: requires `sysvsem` PHP extension This is used in ZoneMinder since some time ago [1]. Without this extension, controling of playback (play, pause, fast forward, etc.) will not work. [1] https://github.com/ZoneMinder/zoneminder/issues/2261#issuecomment-433129559 --- nixos/modules/services/misc/zoneminder.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/nixos/modules/services/misc/zoneminder.nix b/nixos/modules/services/misc/zoneminder.nix index a52428ca1f67..45b554d193d5 100644 --- a/nixos/modules/services/misc/zoneminder.nix +++ b/nixos/modules/services/misc/zoneminder.nix @@ -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}" ''; From 86b48684bb028e551bf6c876d0a0668532ea2f4f Mon Sep 17 00:00:00 2001 From: Ratchanan Srirattanamet Date: Sat, 5 Nov 2022 16:51:30 +0700 Subject: [PATCH 4/9] nixos/zoneminder: automatically update Nix store path in config DB ZM has a configuration which defaults to a file in its installaton path. In NixOS, this means a Nix store path is persisted into the database, which will break when e.g. ZM is upgraded. Workaround this by doing a regular expression-based string replacement SQL command to replace this value. The regular expression should not match if users has changed this config to somewhere else. It will match even if ZM isn't upgraded, in which case it'll replace the value with itself. As such, it should be safe to run this at every ZM startup. --- nixos/modules/services/misc/zoneminder.nix | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/nixos/modules/services/misc/zoneminder.nix b/nixos/modules/services/misc/zoneminder.nix index 45b554d193d5..11722979851c 100644 --- a/nixos/modules/services/misc/zoneminder.nix +++ b/nixos/modules/services/misc/zoneminder.nix @@ -328,6 +328,14 @@ in { ${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; From de2a72273a19d22ae9604272fca96e5eb5840149 Mon Sep 17 00:00:00 2001 From: figsoda Date: Mon, 13 Mar 2023 09:55:22 -0400 Subject: [PATCH 5/9] cargo-binstall: 0.21.0 -> 0.21.2 Diff: https://github.com/cargo-bins/cargo-binstall/compare/v0.21.0...v0.21.2 Changelog: https://github.com/cargo-bins/cargo-binstall/releases/tag/v0.21.2 --- pkgs/development/tools/rust/cargo-binstall/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/rust/cargo-binstall/default.nix b/pkgs/development/tools/rust/cargo-binstall/default.nix index 6bf0b54a3328..689b53e5fa17 100644 --- a/pkgs/development/tools/rust/cargo-binstall/default.nix +++ b/pkgs/development/tools/rust/cargo-binstall/default.nix @@ -11,16 +11,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-binstall"; - version = "0.21.0"; + version = "0.21.2"; src = fetchFromGitHub { owner = "cargo-bins"; repo = "cargo-binstall"; rev = "v${version}"; - hash = "sha256-btpXmtnsnZy7ai+WlWtgLjwbHqQvIphNM7aqMmA5Wjs="; + hash = "sha256-8iJOjaOnbvRZWkygkXK0e/BiImpyQ92E0XQDklb4JJQ="; }; - cargoHash = "sha256-bfdyLXfasPeUAxiA7tFV1vc4tVnTO84GFOdBWjTx/4s="; + cargoHash = "sha256-+u1v3XJ+DCXMbMpLcjxUZMKcF0E9LrNv6+9XVo/DduQ="; nativeBuildInputs = [ pkg-config From 198d51375be2c7cceca7ef5bdabf0b32f6f7658b Mon Sep 17 00:00:00 2001 From: figsoda Date: Mon, 13 Mar 2023 10:10:24 -0400 Subject: [PATCH 6/9] argc: 0.12.0 -> 0.13.0 Diff: https://github.com/sigoden/argc/compare/v0.12.0...v0.13.0 --- pkgs/development/tools/argc/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/argc/default.nix b/pkgs/development/tools/argc/default.nix index 5007428ab463..373a91644600 100644 --- a/pkgs/development/tools/argc/default.nix +++ b/pkgs/development/tools/argc/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "argc"; - version = "0.12.0"; + version = "0.13.0"; src = fetchFromGitHub { owner = "sigoden"; repo = pname; rev = "v${version}"; - sha256 = "sha256-Y6qXxnjep9AF3aAW6EZNx4dghMH3BSw8ExpNhTVH1QI="; + sha256 = "sha256-G5dEN1yO/WnMLVZtxL6vD+YjvHDWiWehZSqeL43IDXE="; }; - cargoSha256 = "sha256-Wr+sUtxxdmY6l+sMAcQGR3Zmqvj8qybC74o9ipkwTMk="; + cargoSha256 = "sha256-carsp6IRFCw5bLRYoyy6QP8jnImTSf/6GxYDH9lR7GA="; nativeBuildInputs = [ installShellFiles ]; From 8441efbcab1fe45005e360a699413bd2d544ddd2 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 13 Mar 2023 19:26:03 +0000 Subject: [PATCH 7/9] p4c: 1.2.3.6 -> 1.2.3.7 --- pkgs/development/compilers/p4c/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/p4c/default.nix b/pkgs/development/compilers/p4c/default.nix index 08406a277353..c26aa44170f1 100644 --- a/pkgs/development/compilers/p4c/default.nix +++ b/pkgs/development/compilers/p4c/default.nix @@ -27,13 +27,13 @@ let in stdenv.mkDerivation rec { pname = "p4c"; - version = "1.2.3.6"; + version = "1.2.3.7"; src = fetchFromGitHub { owner = "p4lang"; repo = "p4c"; rev = "v${version}"; - sha256 = "sha256-3i2L1wORVN+X5sr4Hs+zGD/GgM1sAXt34R4kGMkd4qk="; + sha256 = "sha256-s9uUq86xbqU21jfAF42blbbIvHlkv7W75rotjSbMxHc="; fetchSubmodules = true; }; From ae8fa2344871a012b4ae173d5fd531bf7d27b269 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 14 Mar 2023 09:14:03 +0000 Subject: [PATCH 8/9] geographiclib: 2.1.2 -> 2.2 --- pkgs/development/libraries/geographiclib/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/geographiclib/default.nix b/pkgs/development/libraries/geographiclib/default.nix index d6a8879f671a..1d48ebf8ff43 100644 --- a/pkgs/development/libraries/geographiclib/default.nix +++ b/pkgs/development/libraries/geographiclib/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "geographiclib"; - version = "2.1.2"; + version = "2.2"; src = fetchFromGitHub { owner = "geographiclib"; repo = "geographiclib"; rev = "v${version}"; - hash = "sha256-DVJi6EosJOPoVJEgZYsro5C/lrHrXEfbjLWiQVJk4+U="; + hash = "sha256-W2YbeUYr6rjzdufVGzJ1k56uHHMzq8eidDZbRxTyzAU="; }; nativeBuildInputs = [ cmake doxygen ]; From 8889512934037f08a9d09104d604b231095f8d02 Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Mon, 13 Mar 2023 10:54:44 +0100 Subject: [PATCH 9/9] babl: 0.1.100 -> 0.1.102 --- pkgs/development/libraries/babl/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/babl/default.nix b/pkgs/development/libraries/babl/default.nix index 61bba841ead9..8273553a14ab 100644 --- a/pkgs/development/libraries/babl/default.nix +++ b/pkgs/development/libraries/babl/default.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation rec { pname = "babl"; - version = "0.1.100"; + version = "0.1.102"; outputs = [ "out" "dev" ]; src = fetchurl { url = "https://download.gimp.org/pub/babl/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "pebhk2diFdZdfN/q8RWKBgtCoUKjbxqwdtGDMhL50tQ="; + sha256 = "a88bb28506575f95158c8c89df6e23686e50c8b9fea412bf49fe8b80002d84f0"; }; nativeBuildInputs = [