Merge pull request #330043 from Sigmanificient/fava

fava: 1.27.3 -> 1.28

3 files changed, 57 insertions, 58 deletions

diff --git a/pkgs/applications/office/fava/default.nix b/pkgs/applications/office/fava/default.nix
deleted file mode 100644
index d00600bbea59..000000000000
--- a/pkgs/applications/office/fava/default.nix
+++ /dev/null
@@ -1,56 +0,0 @@
-{ lib, python3, fetchPypi }:
-
-python3.pkgs.buildPythonApplication rec {
-  pname = "fava";
-  version = "1.27.3";
-  format = "pyproject";
-
-  src = fetchPypi {
-    inherit pname version;
-    hash = "sha256-GsnXZaazEiOhyjbIinHRD1fdoqlAp3d5csrmtydxmGM=";
-  };
-
-  nativeBuildInputs = with python3.pkgs; [ setuptools-scm ];
-
-  propagatedBuildInputs = with python3.pkgs; [
-    babel
-    beancount
-    cheroot
-    click
-    flask
-    flask-babel
-    jaraco-functools
-    jinja2
-    markdown2
-    ply
-    simplejson
-    werkzeug
-  ];
-
-  nativeCheckInputs = with python3.pkgs; [
-    pytestCheckHook
-  ];
-
-  postPatch = ''
-    substituteInPlace pyproject.toml \
-      --replace 'setuptools_scm>=8.0' 'setuptools_scm'
-  '';
-
-  preCheck = ''
-    export HOME=$TEMPDIR
-  '';
-
-  disabledTests = [
-    # runs fava in debug mode, which tries to interpret bash wrapper as Python
-    "test_cli"
-  ];
-
-  meta = with lib; {
-    description = "Web interface for beancount";
-    mainProgram = "fava";
-    homepage = "https://beancount.github.io/fava";
-    changelog = "https://beancount.github.io/fava/changelog.html";
-    license = licenses.mit;
-    maintainers = with maintainers; [ bhipple ];
-  };
-}
diff --git a/pkgs/by-name/fa/fava/package.nix b/pkgs/by-name/fa/fava/package.nix
new file mode 100644
index 000000000000..fa17fdda10f0
--- /dev/null
+++ b/pkgs/by-name/fa/fava/package.nix
@@ -0,0 +1,57 @@
+{
+  lib,
+  python3Packages,
+  fetchPypi,
+}:
+
+python3Packages.buildPythonApplication rec {
+  pname = "fava";
+  version = "1.28";
+  pyproject = true;
+
+  src = fetchPypi {
+    inherit pname version;
+    hash = "sha256-sWHVkR0/0VMGzH5OMxOCK4usf7G0odzMtr82ESRQhrk=";
+  };
+
+  postPatch = ''
+    substituteInPlace tests/test_cli.py \
+      --replace-fail '"fava"' '"${placeholder "out"}/bin/fava"'
+  '';
+
+  build-system = [ python3Packages.setuptools-scm ];
+
+  dependencies = with python3Packages; [
+    babel
+    beancount
+    cheroot
+    click
+    flask
+    flask-babel
+    jaraco-functools
+    jinja2
+    markdown2
+    ply
+    simplejson
+    werkzeug
+    watchfiles
+  ];
+
+  nativeCheckInputs = [ python3Packages.pytestCheckHook ];
+
+  preCheck = ''
+    export HOME=$TEMPDIR
+  '';
+
+  meta = with lib; {
+    description = "Web interface for beancount";
+    mainProgram = "fava";
+    homepage = "https://beancount.github.io/fava";
+    changelog = "https://beancount.github.io/fava/changelog.html";
+    license = licenses.mit;
+    maintainers = with maintainers; [
+      bhipple
+      sigmanificient
+    ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index f0ba6d69d88b..83d119d7c6a3 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -35603,8 +35603,6 @@ with pkgs;
     inherit (darwin.apple_sdk.frameworks) Security;
   };
 
-  fava = callPackage ../applications/office/fava { };
-
   nux = callPackage ../tools/misc/nux { };
 
   phonemizer = with python3Packages; toPythonApplication phonemizer;