diff options
author | Bryan A. S <bryanasdev000@gmail.com> | 2022-08-02 09:46:51 -0300 |
---|---|---|
committer | Bryan A. S <bryanasdev000@gmail.com> | 2022-08-02 09:46:51 -0300 |
commit | 2e50f02809062a25c56f404b60ca6e2ae03b2f2d (patch) | |
tree | e35fbe2a8ce046cd938325f8bb227342b0984d35 | |
parent | f046da48c92d0ecf251e0a353dafff3450767b0f (diff) |
jrnl: 2.8.4 -> 3.0.0
- add missing deps - drop bdd tests
-rw-r--r-- | pkgs/applications/misc/jrnl/default.nix | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/pkgs/applications/misc/jrnl/default.nix b/pkgs/applications/misc/jrnl/default.nix index 4aecdec4de9d6..141db33e8b1fe 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 = "2.8.4"; + version = "3.0"; format = "pyproject"; src = fetchFromGitHub { owner = "jrnl-org"; repo = pname; rev = "v${version}"; - sha256 = "sha256-Edu+GW/D+R5r0R750Z1f8YUVPMYbm9PK4D73sTDzDEc="; + sha256 = "sha256-wyN7dlAbQwqvES8qEJ4Zo+fDMM/Lh9tNjf215Ywop10="; }; nativeBuildInputs = with python3.pkgs; [ @@ -31,14 +31,24 @@ python3.pkgs.buildPythonApplication rec { pyxdg pyyaml tzlocal + ruamel-yaml + rich ]; checkInputs = with python3.pkgs; [ pytest-bdd + pytest-xdist pytestCheckHook 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 'tzlocal = ">2.0, <3.0"' 'tzlocal = ">2.0, !=3.0"' |