Merge master into staging-next

2 files changed, 3 insertions, 26 deletions

diff --git a/pkgs/applications/office/fava/default.nix b/pkgs/applications/office/fava/default.nix
index ce6988e6e61bf..0c14eedd47ae9 100644
--- a/pkgs/applications/office/fava/default.nix
+++ b/pkgs/applications/office/fava/default.nix
@@ -2,24 +2,15 @@
 
 python3.pkgs.buildPythonApplication rec {
   pname = "fava";
-  version = "1.23.1";
+  version = "1.24";
   format = "pyproject";
 
   src = python3.pkgs.fetchPypi {
     inherit pname version;
-    sha256 = "sha256-Uw8UIJa+Dtsy+o31I1ynLyhZrFNX42NFRXu1O2ISbzU=";
+    hash = "sha256-Ep+8O93L/CG4qcBFzCBMRasK/ySp8+cU59LcyZRTJtg=";
   };
 
-  patches = [
-    ./flask-babel.patch
-  ];
-
-  pythonRelaxDeps = [
-    "cheroot"
-    "Flask-Babel"
-  ];
-
-  nativeBuildInputs = with python3.pkgs; [ setuptools-scm pythonRelaxDepsHook ];
+  nativeBuildInputs = with python3.pkgs; [ setuptools-scm ];
 
   propagatedBuildInputs = with python3.pkgs; [
     babel
diff --git a/pkgs/applications/office/fava/flask-babel.patch b/pkgs/applications/office/fava/flask-babel.patch
deleted file mode 100644
index 739be6327ca8c..0000000000000
--- a/pkgs/applications/office/fava/flask-babel.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff --git a/src/fava/application.py b/src/fava/application.py
-index 811c1de4..19de051a 100644
---- a/src/fava/application.py
-+++ b/src/fava/application.py
-@@ -148,8 +148,7 @@ def get_locale() -> str | None:
-     return request.accept_languages.best_match(["en"] + LANGUAGES)
- 
- 
--BABEL = Babel(app)
--BABEL.localeselector(get_locale)
-+BABEL = Babel(app, locale_selector=get_locale)
- 
- 
- for function in template_filters.FILTERS: