Merge pull request #142594 from fabaff/bump-jrnl

jrnl: 2.8 -> 2.8.3

authored by

Fabian Affolter and committed by
GitHub
9941cc4f 6e163ffd

+34 -24
+33 -23
pkgs/applications/misc/jrnl/default.nix
··· 1 { lib 2 - , ansiwrap 3 - , asteval 4 - , buildPythonApplication 5 - , colorama 6 - , cryptography 7 , fetchFromGitHub 8 - , keyring 9 - , parsedatetime 10 - , poetry 11 - , pytestCheckHook 12 - , python-dateutil 13 - , pytz 14 - , pyxdg 15 - , pyyaml 16 - , tzlocal 17 }: 18 19 - buildPythonApplication rec { 20 pname = "jrnl"; 21 - version = "2.8"; 22 format = "pyproject"; 23 24 src = fetchFromGitHub { 25 owner = "jrnl-org"; 26 repo = pname; 27 rev = "v${version}"; 28 - sha256 = "1zpsvrjhami9y7204yjbdzi04bkkz6i3apda9fh3hbq83y6wzprz"; 29 }; 30 31 - nativeBuildInputs = [ poetry ]; 32 33 - propagatedBuildInputs = [ 34 ansiwrap 35 asteval 36 colorama ··· 44 tzlocal 45 ]; 46 47 - checkInputs = [ pytestCheckHook ]; 48 - pythonImportsCheck = [ "jrnl" ]; 49 50 meta = with lib; { 51 - homepage = "http://maebert.github.io/jrnl/"; 52 - description = "A simple command line journal application that stores your journal in a plain text file"; 53 license = licenses.gpl3Only; 54 maintainers = with maintainers; [ zalakain ]; 55 };
··· 1 { lib 2 , fetchFromGitHub 3 + , fetchpatch 4 + , python3 5 }: 6 7 + python3.pkgs.buildPythonApplication rec { 8 pname = "jrnl"; 9 + version = "2.8.3"; 10 format = "pyproject"; 11 12 src = fetchFromGitHub { 13 owner = "jrnl-org"; 14 repo = pname; 15 rev = "v${version}"; 16 + sha256 = "sha256-+kPr7ndY6u1HMw6m0UZJ5jxVIPNjlTfQt7OYEdZkHBE="; 17 }; 18 19 + nativeBuildInputs = with python3.pkgs; [ 20 + poetry-core 21 + ]; 22 23 + propagatedBuildInputs = with python3.pkgs; [ 24 ansiwrap 25 asteval 26 colorama ··· 34 tzlocal 35 ]; 36 37 + checkInputs = with python3.pkgs; [ 38 + pytest-bdd 39 + pytestCheckHook 40 + toml 41 + ]; 42 + 43 + patches = [ 44 + # Switch to poetry-core, https://github.com/jrnl-org/jrnl/pull/1359 45 + (fetchpatch { 46 + name = "switch-to-poetry-core.patch"; 47 + url = "https://github.com/jrnl-org/jrnl/commit/a55a240eff7a167af5974a03e9de6f7b818eafd9.patch"; 48 + sha256 = "1w3gb4vasvh51nggf89fsqsm4862m0g7hr36qz22n4vg9dds175m"; 49 + }) 50 + ]; 51 + 52 + preCheck = '' 53 + export HOME=$(mktemp -d); 54 + ''; 55 + 56 + pythonImportsCheck = [ 57 + "jrnl" 58 + ]; 59 60 meta = with lib; { 61 + description = "Simple command line journal application that stores your journal in a plain text file"; 62 + homepage = "https://jrnl.sh/"; 63 license = licenses.gpl3Only; 64 maintainers = with maintainers; [ zalakain ]; 65 };
+1 -1
pkgs/top-level/all-packages.nix
··· 6541 inherit (darwin.apple_sdk.frameworks) SystemConfiguration; 6542 }; 6543 6544 - jrnl = python3Packages.callPackage ../applications/misc/jrnl { }; 6545 6546 jsawk = callPackage ../tools/text/jsawk { }; 6547
··· 6541 inherit (darwin.apple_sdk.frameworks) SystemConfiguration; 6542 }; 6543 6544 + jrnl = callPackage ../applications/misc/jrnl { }; 6545 6546 jsawk = callPackage ../tools/text/jsawk { }; 6547