diff options
author | Martin Weinelt <hexa@darmstadt.ccc.de> | 2023-11-14 13:16:25 +0100 |
---|---|---|
committer | Martin Weinelt <hexa@darmstadt.ccc.de> | 2023-11-14 13:16:34 +0100 |
commit | 3c336a1647ada0970b71284cceb601c3d79c2134 (patch) | |
tree | dea9a6a0eb8673bf86ce7d114b09688d11356a46 /pkgs/applications/office/fava/default.nix | |
parent | 2605fad79520679232edcf4de591013d7b34b0a5 (diff) | |
parent | bf744fe90419885eefced41b3e5ae442d732712d (diff) |
Merge remote-tracking branch 'origin/master' into staging-next
Conflicts: - pkgs/development/libraries/gdcm/default.nix
Diffstat (limited to 'pkgs/applications/office/fava/default.nix')
-rw-r--r-- | pkgs/applications/office/fava/default.nix | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/pkgs/applications/office/fava/default.nix b/pkgs/applications/office/fava/default.nix index b7e2105a94eab..2e869daff5323 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.26.1"; + version = "1.26.2"; format = "pyproject"; src = fetchPypi { inherit pname version; - hash = "sha256-pj4kaQDXahjhN7bu7xxT/ZuoCfPdGyo898482S5gnlE="; + hash = "sha256-+rMuVfe6BDAcZgJkBb18YLFZirOBfad6WGbWtAT21uI="; }; nativeBuildInputs = with python3.pkgs; [ setuptools-scm ]; @@ -31,6 +31,11 @@ python3.pkgs.buildPythonApplication rec { pytestCheckHook ]; + postPatch = '' + substituteInPlace pyproject.toml \ + --replace 'setuptools_scm>=8.0' 'setuptools_scm' + ''; + preCheck = '' export HOME=$TEMPDIR ''; |