diff --git a/pkgs/applications/misc/jrnl/default.nix b/pkgs/applications/misc/jrnl/default.nix index 985ce9c1d165..8dacbf814513 100644 --- a/pkgs/applications/misc/jrnl/default.nix +++ b/pkgs/applications/misc/jrnl/default.nix @@ -5,14 +5,14 @@ python3.pkgs.buildPythonApplication rec { pname = "jrnl"; - version = "3.3"; + version = "4.0.1"; format = "pyproject"; src = fetchFromGitHub { owner = "jrnl-org"; repo = pname; rev = "refs/tags/v${version}"; - sha256 = "sha256-e2w0E8t6s0OWx2ROme2GdyzWhmCc6hnMfSdLTZqt3bg="; + hash = "sha256-NpI19NQxfDiqcfFI9kMqfMboI4fQTqCG7AoG9o8YoEI="; }; nativeBuildInputs = with python3.pkgs; [ @@ -42,17 +42,6 @@ python3.pkgs.buildPythonApplication rec { toml ]; - # Upstream expects a old pytest-bdd version - # Once it changes we should update here too - # https://github.com/jrnl-org/jrnl/blob/develop/poetry.lock#L732 - disabledTests = [ - "bdd" - ]; - - postPatch = '' - substituteInPlace pyproject.toml \ - --replace 'rich = "^12.2.0"' 'rich = ">=12.2.0, <14.0.0"' - ''; preCheck = '' export HOME=$(mktemp -d); @@ -63,9 +52,11 @@ python3.pkgs.buildPythonApplication rec { ]; meta = with lib; { + changelog = "https://github.com/jrnl-org/jrnl/releases/tag/v${version}"; description = "Simple command line journal application that stores your journal in a plain text file"; homepage = "https://jrnl.sh/"; license = licenses.gpl3Only; maintainers = with maintainers; [ bryanasdev000 zalakain ]; + mainProgram = "jrnl"; }; }