jrnl: 2.8.3 -> 2.8.4

This commit is contained in:
Fabian Affolter 2022-02-19 11:16:39 +01:00
parent 3dff038ace
commit 75aa457cc6

View file

@ -1,26 +1,20 @@
{ lib
, fetchFromGitHub
, fetchpatch
, python3
}:
python3.pkgs.buildPythonApplication rec {
pname = "jrnl";
version = "2.8.3";
version = "2.8.4";
format = "pyproject";
src = fetchFromGitHub {
owner = "jrnl-org";
repo = pname;
rev = "v${version}";
sha256 = "sha256-+kPr7ndY6u1HMw6m0UZJ5jxVIPNjlTfQt7OYEdZkHBE=";
sha256 = "sha256-Edu+GW/D+R5r0R750Z1f8YUVPMYbm9PK4D73sTDzDEc=";
};
postPatch = ''
substituteInPlace pyproject.toml \
--replace 'tzlocal = ">2.0, <3.0"' 'tzlocal = ">2.0, !=3.0"'
'';
nativeBuildInputs = with python3.pkgs; [
poetry-core
];
@ -45,14 +39,10 @@ python3.pkgs.buildPythonApplication rec {
toml
];
patches = [
# Switch to poetry-core, https://github.com/jrnl-org/jrnl/pull/1359
(fetchpatch {
name = "switch-to-poetry-core.patch";
url = "https://github.com/jrnl-org/jrnl/commit/a55a240eff7a167af5974a03e9de6f7b818eafd9.patch";
sha256 = "1w3gb4vasvh51nggf89fsqsm4862m0g7hr36qz22n4vg9dds175m";
})
];
postPatch = ''
substituteInPlace pyproject.toml \
--replace 'tzlocal = ">2.0, <3.0"' 'tzlocal = ">2.0, !=3.0"'
'';
preCheck = ''
export HOME=$(mktemp -d);