BoomMicrophone/nixpkgs-suyu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

jrnl: 3.3 -> 4.0.1

Browse source 
Changelog 4.0: https://github.com/jrnl-org/jrnl/releases/tag/v4.0
Changelog 4.0.1: https://github.com/jrnl-org/jrnl/releases/tag/v4.0.1

Both bdd and rich have been updated upstream, so the workarounds are no
longer required
This commit is contained in:
Anton Mosich 2023-09-04 21:52:32 +02:00
parent 6a2fd5e262
commit 1bd2aad718
1 changed files with 4 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
pkgs/applications/misc/jrnl/default.nix
View file

@ -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";
};
}