Unverified Commit 2df6c043 authored by github-actions[bot]'s avatar github-actions[bot] Committed by GitHub
Browse files

Merge master into staging-next

parents 9e4d5921 88895129

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/development/compilers/p4c/default.nix

+2 −2
Original line number Diff line number Diff line
@@ -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;

  };

pkgs/development/libraries/babl/default.nix

+2 −2
Original line number Diff line number Diff line
@@ -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 = [

pkgs/development/libraries/geographiclib/default.nix

+2 −2
Original line number Diff line number Diff line
@@ -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 ];

pkgs/development/tools/argc/default.nix

+3 −3
Original line number Diff line number Diff line
@@ -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 ];