From b4bba87c4b25dcab6495a5ee02b793d98bad0324 Mon Sep 17 00:00:00 2001 From: Anton Mosich Date: Sun, 5 Nov 2023 11:47:24 +0100 Subject: [PATCH 1/2] jrnl: 4.0.1 -> 4.1 See https://github.com/jrnl-org/jrnl/releases/tag/v4.1 for changelog. This update removes the ansiwrap dependency. --- pkgs/applications/misc/jrnl/default.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/misc/jrnl/default.nix b/pkgs/applications/misc/jrnl/default.nix index 8dacbf814513..4adae2f32dc9 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 = "4.0.1"; + version = "4.1"; format = "pyproject"; src = fetchFromGitHub { owner = "jrnl-org"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-NpI19NQxfDiqcfFI9kMqfMboI4fQTqCG7AoG9o8YoEI="; + hash = "sha256-DtujXSDJWnOrHjVgJEJNKJMhSrNBHlR2hvHeHLSIF2o="; }; nativeBuildInputs = with python3.pkgs; [ @@ -20,7 +20,6 @@ python3.pkgs.buildPythonApplication rec { ]; propagatedBuildInputs = with python3.pkgs; [ - ansiwrap asteval colorama cryptography From 463bd286278a4873f7e97ee57ce44d2c2dd5a4e2 Mon Sep 17 00:00:00 2001 From: Anton Mosich Date: Sun, 5 Nov 2023 11:52:47 +0100 Subject: [PATCH 2/2] jrnl: add version test --- pkgs/applications/misc/jrnl/default.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/pkgs/applications/misc/jrnl/default.nix b/pkgs/applications/misc/jrnl/default.nix index 4adae2f32dc9..43d320a4c043 100644 --- a/pkgs/applications/misc/jrnl/default.nix +++ b/pkgs/applications/misc/jrnl/default.nix @@ -1,6 +1,8 @@ { lib , fetchFromGitHub , python3 +, testers +, jrnl }: python3.pkgs.buildPythonApplication rec { @@ -50,6 +52,11 @@ python3.pkgs.buildPythonApplication rec { "jrnl" ]; + passthru.tests.version = testers.testVersion { + package = jrnl; + version = "v${version}"; + }; + 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";