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

Merge pull request #184429 from bryanasdev000/jrnl-up-fix

Browse source 
jrnl: 2.8.4 -> 3.0.0
This commit is contained in:
Thiago Kenji Okada 2022-08-02 16:02:58 +01:00 committed by GitHub
commit be2225f322
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 12 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -5,14 +5,14 @@
python3.pkgs.buildPythonApplication rec { python3.pkgs.buildPythonApplication rec {
pname = "jrnl"; pname = "jrnl";
version = "2.8.4"; version = "3.0";
format = "pyproject"; format = "pyproject";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "jrnl-org"; owner = "jrnl-org";
repo = pname; repo = pname;
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-Edu+GW/D+R5r0R750Z1f8YUVPMYbm9PK4D73sTDzDEc="; sha256 = "sha256-wyN7dlAbQwqvES8qEJ4Zo+fDMM/Lh9tNjf215Ywop10=";
}; };
nativeBuildInputs = with python3.pkgs; [ nativeBuildInputs = with python3.pkgs; [
@ -31,14 +31,24 @@ python3.pkgs.buildPythonApplication rec {
pyxdg pyxdg
pyyaml pyyaml
tzlocal tzlocal
ruamel-yaml
rich
]; ];
checkInputs = with python3.pkgs; [ checkInputs = with python3.pkgs; [
pytest-bdd pytest-bdd
pytest-xdist
pytestCheckHook pytestCheckHook
toml 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 = '' postPatch = ''
substituteInPlace pyproject.toml \ substituteInPlace pyproject.toml \
--replace 'tzlocal = ">2.0, <3.0"' 'tzlocal = ">2.0, !=3.0"' --replace 'tzlocal = ">2.0, <3.0"' 'tzlocal = ">2.0, !=3.0"'