From 3b0431e14d8915ae056b16a8f267ece8efc55c28 Mon Sep 17 00:00:00 2001 From: Sigmanificient Date: Fri, 26 Jul 2024 02:54:36 +0200 Subject: [PATCH 1/6] fava: 1.27.3 -> 1.28 --- pkgs/applications/office/fava/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/office/fava/default.nix b/pkgs/applications/office/fava/default.nix index d00600bbea59..0e0fba19f064 100644 --- a/pkgs/applications/office/fava/default.nix +++ b/pkgs/applications/office/fava/default.nix @@ -2,12 +2,12 @@ python3.pkgs.buildPythonApplication rec { pname = "fava"; - version = "1.27.3"; + version = "1.28"; format = "pyproject"; src = fetchPypi { inherit pname version; - hash = "sha256-GsnXZaazEiOhyjbIinHRD1fdoqlAp3d5csrmtydxmGM="; + hash = "sha256-sWHVkR0/0VMGzH5OMxOCK4usf7G0odzMtr82ESRQhrk="; }; nativeBuildInputs = with python3.pkgs; [ setuptools-scm ]; @@ -25,6 +25,7 @@ python3.pkgs.buildPythonApplication rec { ply simplejson werkzeug + watchfiles ]; nativeCheckInputs = with python3.pkgs; [ From bff7842b1e53ee7d8bc1356d38ea8ddbdda9b783 Mon Sep 17 00:00:00 2001 From: Sigmanificient Date: Fri, 26 Jul 2024 03:22:47 +0200 Subject: [PATCH 2/6] fava: replace python.pkgs to python3Packages due to splicing --- pkgs/applications/office/fava/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/office/fava/default.nix b/pkgs/applications/office/fava/default.nix index 0e0fba19f064..be136ba53700 100644 --- a/pkgs/applications/office/fava/default.nix +++ b/pkgs/applications/office/fava/default.nix @@ -1,6 +1,6 @@ -{ lib, python3, fetchPypi }: +{ lib, python3Packages, fetchPypi }: -python3.pkgs.buildPythonApplication rec { +python3Packages.buildPythonApplication rec { pname = "fava"; version = "1.28"; format = "pyproject"; @@ -10,9 +10,9 @@ python3.pkgs.buildPythonApplication rec { hash = "sha256-sWHVkR0/0VMGzH5OMxOCK4usf7G0odzMtr82ESRQhrk="; }; - nativeBuildInputs = with python3.pkgs; [ setuptools-scm ]; + nativeBuildInputs = with python3Packages; [ setuptools-scm ]; - propagatedBuildInputs = with python3.pkgs; [ + propagatedBuildInputs = with python3Packages; [ babel beancount cheroot @@ -28,7 +28,7 @@ python3.pkgs.buildPythonApplication rec { watchfiles ]; - nativeCheckInputs = with python3.pkgs; [ + nativeCheckInputs = with python3Packages; [ pytestCheckHook ]; From acb2c75e701b031eaf12c54146663d42a72c672f Mon Sep 17 00:00:00 2001 From: Sigmanificient Date: Fri, 26 Jul 2024 03:28:57 +0200 Subject: [PATCH 3/6] fava: fix disabled cli test --- pkgs/applications/office/fava/default.nix | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/office/fava/default.nix b/pkgs/applications/office/fava/default.nix index be136ba53700..d08abeb95e06 100644 --- a/pkgs/applications/office/fava/default.nix +++ b/pkgs/applications/office/fava/default.nix @@ -11,6 +11,10 @@ python3Packages.buildPythonApplication rec { }; nativeBuildInputs = with python3Packages; [ setuptools-scm ]; + postPatch = '' + substituteInPlace tests/test_cli.py \ + --replace-fail '"fava"' '"${placeholder "out"}/bin/fava"' + ''; propagatedBuildInputs = with python3Packages; [ babel @@ -41,11 +45,6 @@ python3Packages.buildPythonApplication rec { 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"; From 248a1649a56c7087fe817c918e61999b900bc879 Mon Sep 17 00:00:00 2001 From: Sigmanificient Date: Fri, 26 Jul 2024 03:29:06 +0200 Subject: [PATCH 4/6] fava: modernize --- pkgs/applications/office/fava/default.nix | 22 ++++++++++------------ 1 file changed, 10 insertions(+), 12 deletions(-) diff --git a/pkgs/applications/office/fava/default.nix b/pkgs/applications/office/fava/default.nix index d08abeb95e06..e07cde3137d6 100644 --- a/pkgs/applications/office/fava/default.nix +++ b/pkgs/applications/office/fava/default.nix @@ -1,22 +1,27 @@ -{ lib, python3Packages, fetchPypi }: +{ + lib, + python3Packages, + fetchPypi, +}: python3Packages.buildPythonApplication rec { pname = "fava"; version = "1.28"; - format = "pyproject"; + pyproject = true; src = fetchPypi { inherit pname version; hash = "sha256-sWHVkR0/0VMGzH5OMxOCK4usf7G0odzMtr82ESRQhrk="; }; - nativeBuildInputs = with python3Packages; [ setuptools-scm ]; postPatch = '' substituteInPlace tests/test_cli.py \ --replace-fail '"fava"' '"${placeholder "out"}/bin/fava"' ''; - propagatedBuildInputs = with python3Packages; [ + build-system = [ python3Packages.setuptools-scm ]; + + dependencies = with python3Packages; [ babel beancount cheroot @@ -32,14 +37,7 @@ python3Packages.buildPythonApplication rec { watchfiles ]; - nativeCheckInputs = with python3Packages; [ - pytestCheckHook - ]; - - postPatch = '' - substituteInPlace pyproject.toml \ - --replace 'setuptools_scm>=8.0' 'setuptools_scm' - ''; + nativeCheckInputs = [ python3Packages.pytestCheckHook ]; preCheck = '' export HOME=$TEMPDIR From 145580edb6e7c78edb89c5e6a1d16308d7e8eed0 Mon Sep 17 00:00:00 2001 From: Sigmanificient Date: Fri, 26 Jul 2024 03:30:54 +0200 Subject: [PATCH 5/6] fava: migrate to pkgs/by-name --- .../office/fava/default.nix => by-name/fa/fava/package.nix} | 0 pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 2 deletions(-) rename pkgs/{applications/office/fava/default.nix => by-name/fa/fava/package.nix} (100%) diff --git a/pkgs/applications/office/fava/default.nix b/pkgs/by-name/fa/fava/package.nix similarity index 100% rename from pkgs/applications/office/fava/default.nix rename to pkgs/by-name/fa/fava/package.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 84cae899cd6d..3a9604249ecd 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -35655,8 +35655,6 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) Security; }; - fava = callPackage ../applications/office/fava { }; - nux = callPackage ../tools/misc/nux { }; phonemizer = with python3Packages; toPythonApplication phonemizer; From e96078899dbe456d663521702441fdfcf6940f3c Mon Sep 17 00:00:00 2001 From: Sigmanificient Date: Fri, 26 Jul 2024 03:31:17 +0200 Subject: [PATCH 6/6] fava: add sigmanificient to maintainers --- pkgs/by-name/fa/fava/package.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/fa/fava/package.nix b/pkgs/by-name/fa/fava/package.nix index e07cde3137d6..fa17fdda10f0 100644 --- a/pkgs/by-name/fa/fava/package.nix +++ b/pkgs/by-name/fa/fava/package.nix @@ -49,6 +49,9 @@ python3Packages.buildPythonApplication rec { homepage = "https://beancount.github.io/fava"; changelog = "https://beancount.github.io/fava/changelog.html"; license = licenses.mit; - maintainers = with maintainers; [ bhipple ]; + maintainers = with maintainers; [ + bhipple + sigmanificient + ]; }; }