diff options
author | Weijia Wang <9713184+wegank@users.noreply.github.com> | 2023-09-06 13:09:26 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-09-06 13:09:26 +0200 |
commit | f76b6f4bc3bcb68d146c51afe09cabce49ef6883 (patch) | |
tree | 15da305a444a24d8fd1da6dc1b3cd0b3d1834f38 /pkgs/applications/misc | |
parent | 97eef236aad5fbd8e507cf29c9b87bfdddc12727 (diff) | |
parent | 1bd2aad718238eb3ec78eed517314f1c14fc0c79 (diff) | |
download | nixpkgs-f76b6f4bc3bcb68d146c51afe09cabce49ef6883.tar nixpkgs-f76b6f4bc3bcb68d146c51afe09cabce49ef6883.tar.gz nixpkgs-f76b6f4bc3bcb68d146c51afe09cabce49ef6883.tar.bz2 nixpkgs-f76b6f4bc3bcb68d146c51afe09cabce49ef6883.tar.lz nixpkgs-f76b6f4bc3bcb68d146c51afe09cabce49ef6883.tar.xz nixpkgs-f76b6f4bc3bcb68d146c51afe09cabce49ef6883.tar.zst nixpkgs-f76b6f4bc3bcb68d146c51afe09cabce49ef6883.zip |
Merge pull request #253311 from antonmosich/jrnl-update
jrnl: 3.3 -> 4.0.1
Diffstat (limited to 'pkgs/applications/misc')
-rw-r--r-- | pkgs/applications/misc/jrnl/default.nix | 17 |
1 files changed, 4 insertions, 13 deletions
diff --git a/pkgs/applications/misc/jrnl/default.nix b/pkgs/applications/misc/jrnl/default.nix index 985ce9c1d16..8dacbf81451 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"; }; } |