diff --git a/pkgs/by-name/fr/frigate/package.nix b/pkgs/by-name/fr/frigate/package.nix index 952c7c49c4f8..024fdc31b76d 100644 --- a/pkgs/by-name/fr/frigate/package.nix +++ b/pkgs/by-name/fr/frigate/package.nix @@ -29,8 +29,8 @@ let inherit version src; }; - python = python313Packages.python.override { - packageOverrides = self: super: { + python3Packages = python313Packages.overrideScope ( + self: super: { joserfc = super.joserfc.overridePythonAttrs (oldAttrs: { version = "1.1.0"; src = fetchFromGitHub { @@ -43,9 +43,10 @@ let huggingface-hub = super.huggingface-hub_0; transformers = super.transformers_4; - }; - }; - python3Packages = python.pkgs; + } + ); + + inherit (python3Packages) python; # Tensorflow audio model # https://github.com/blakeblackshear/frigate/blob/v0.15.0/docker/main/Dockerfile#L125 @@ -101,6 +102,9 @@ python3Packages.buildPythonApplication rec { # Fix excessive trailing whitespaces in process commandlines # https://github.com/blakeblackshear/frigate/pull/22089 ./proc-cmdline-strip.patch + + # Fix more granular dtype resultion in Pandas 3.0 + ./pandas3-compat.patch ]; postPatch = '' diff --git a/pkgs/by-name/fr/frigate/pandas3-compat.patch b/pkgs/by-name/fr/frigate/pandas3-compat.patch new file mode 100644 index 000000000000..466e45e0153f --- /dev/null +++ b/pkgs/by-name/fr/frigate/pandas3-compat.patch @@ -0,0 +1,13 @@ +diff --git a/frigate/api/review.py b/frigate/api/review.py +index 76619dcb2..f72c0efc3 100644 +--- a/frigate/api/review.py ++++ b/frigate/api/review.py +@@ -660,7 +660,7 @@ def motion_activity( + df.iloc[i : i + chunk, 0] = 0.0 + + # change types for output +- df.index = df.index.astype(int) // (10**9) ++ df.index = df.index.as_unit("s").astype("int64") + normalized = df.reset_index().to_dict("records") + return JSONResponse(content=normalized) +