Merge pull request #112684 from fabaff/bump-jrnl
commit
9042f74570
|
@ -1,30 +1,56 @@
|
||||||
{ lib
|
{ lib
|
||||||
, python3
|
, ansiwrap
|
||||||
|
, asteval
|
||||||
|
, buildPythonApplication
|
||||||
|
, colorama
|
||||||
|
, cryptography
|
||||||
|
, fetchFromGitHub
|
||||||
|
, keyring
|
||||||
|
, parsedatetime
|
||||||
|
, poetry
|
||||||
|
, pytestCheckHook
|
||||||
|
, python-dateutil
|
||||||
|
, pytz
|
||||||
|
, pyxdg
|
||||||
|
, pyyaml
|
||||||
|
, tzlocal
|
||||||
}:
|
}:
|
||||||
|
|
||||||
with python3.pkgs;
|
|
||||||
|
|
||||||
buildPythonApplication rec {
|
buildPythonApplication rec {
|
||||||
pname = "jrnl";
|
pname = "jrnl";
|
||||||
version = "1.9.8";
|
version = "2.7";
|
||||||
|
format = "pyproject";
|
||||||
|
|
||||||
src = fetchPypi {
|
src = fetchFromGitHub {
|
||||||
inherit pname version;
|
owner = "jrnl-org";
|
||||||
sha256 = "d254c9c8f24dcf985b98a1d5311337c7f416e6305107eec34c567f58c95b06f4";
|
repo = pname;
|
||||||
|
rev = "v${version}";
|
||||||
|
sha256 = "1hyjjw9mxy73n3pkliaaif135h2sd4iy43pw9d5zynid5abnr3yz";
|
||||||
};
|
};
|
||||||
|
|
||||||
|
nativeBuildInputs = [ poetry ];
|
||||||
|
|
||||||
propagatedBuildInputs = [
|
propagatedBuildInputs = [
|
||||||
pytz six tzlocal keyring dateutil
|
ansiwrap
|
||||||
parsedatetime pycrypto
|
asteval
|
||||||
|
colorama
|
||||||
|
cryptography
|
||||||
|
keyring
|
||||||
|
parsedatetime
|
||||||
|
python-dateutil
|
||||||
|
pytz
|
||||||
|
pyxdg
|
||||||
|
pyyaml
|
||||||
|
tzlocal
|
||||||
];
|
];
|
||||||
|
|
||||||
# No tests in archive
|
checkInputs = [ pytestCheckHook ];
|
||||||
doCheck = false;
|
pythonImportsCheck = [ "jrnl" ];
|
||||||
|
|
||||||
meta = with lib; {
|
meta = with lib; {
|
||||||
homepage = "http://maebert.github.io/jrnl/";
|
homepage = "http://maebert.github.io/jrnl/";
|
||||||
description = "A simple command line journal application that stores your journal in a plain text file";
|
description = "A simple command line journal application that stores your journal in a plain text file";
|
||||||
license = licenses.mit;
|
license = licenses.gpl3Only;
|
||||||
maintainers = with maintainers; [ zalakain ];
|
maintainers = with maintainers; [ zalakain ];
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
|
@ -12,6 +12,10 @@ python3Packages.buildPythonApplication rec {
|
||||||
|
|
||||||
propagatedBuildInputs = with python3Packages; [ ansiwrap cryptography ];
|
propagatedBuildInputs = with python3Packages; [ ansiwrap cryptography ];
|
||||||
|
|
||||||
|
# No tests are available
|
||||||
|
doCheck = false;
|
||||||
|
pythonImportsCheck = [ "av98" ];
|
||||||
|
|
||||||
meta = with lib; {
|
meta = with lib; {
|
||||||
homepage = "https://tildegit.org/solderpunk/AV-98";
|
homepage = "https://tildegit.org/solderpunk/AV-98";
|
||||||
description = "Experimental console client for the Gemini protocol";
|
description = "Experimental console client for the Gemini protocol";
|
||||||
|
|
|
@ -1,11 +1,10 @@
|
||||||
{ lib
|
{ lib
|
||||||
, buildPythonPackage
|
|
||||||
, fetchPypi
|
|
||||||
, tox
|
|
||||||
, pytest
|
|
||||||
, ansicolors
|
, ansicolors
|
||||||
|
, buildPythonPackage
|
||||||
, coverage
|
, coverage
|
||||||
, pytestcov
|
, fetchPypi
|
||||||
|
, pytest-cov
|
||||||
|
, pytestCheckHook
|
||||||
, textwrap3
|
, textwrap3
|
||||||
}:
|
}:
|
||||||
|
|
||||||
|
@ -20,20 +19,15 @@ buildPythonPackage rec {
|
||||||
};
|
};
|
||||||
|
|
||||||
checkInputs = [
|
checkInputs = [
|
||||||
tox
|
|
||||||
pytest
|
|
||||||
ansicolors
|
ansicolors
|
||||||
coverage
|
coverage
|
||||||
pytestcov
|
pytest-cov
|
||||||
|
pytestCheckHook
|
||||||
];
|
];
|
||||||
|
|
||||||
propagatedBuildInputs = [
|
propagatedBuildInputs = [ textwrap3 ];
|
||||||
textwrap3
|
|
||||||
];
|
|
||||||
|
|
||||||
checkPhase = ''
|
pythonImportsCheck = [ "ansiwrap" ];
|
||||||
pytest
|
|
||||||
'';
|
|
||||||
|
|
||||||
meta = with lib; {
|
meta = with lib; {
|
||||||
description = "Textwrap, but savvy to ANSI colors and styles";
|
description = "Textwrap, but savvy to ANSI colors and styles";
|
||||||
|
|
|
@ -0,0 +1,30 @@
|
||||||
|
{ lib
|
||||||
|
, buildPythonPackage
|
||||||
|
, fetchFromGitHub
|
||||||
|
, pytestCheckHook
|
||||||
|
, pythonOlder
|
||||||
|
}:
|
||||||
|
|
||||||
|
buildPythonPackage rec {
|
||||||
|
pname = "asteval";
|
||||||
|
version = "0.9.21";
|
||||||
|
disabled = pythonOlder "3.6";
|
||||||
|
|
||||||
|
src = fetchFromGitHub {
|
||||||
|
owner = "newville";
|
||||||
|
repo = pname;
|
||||||
|
rev = version;
|
||||||
|
sha256 = "1bhdj7zybsqghgd7qx50il7nwfg79qx9wg03n0z96jgq5gydqd9w";
|
||||||
|
};
|
||||||
|
|
||||||
|
checkInputs = [ pytestCheckHook ];
|
||||||
|
|
||||||
|
pythonImportsCheck = [ "asteval" ];
|
||||||
|
|
||||||
|
meta = with lib; {
|
||||||
|
description = "AST evaluator of Python expression using ast module";
|
||||||
|
homepage = "https://github.com/newville/asteval";
|
||||||
|
license = with licenses; [ mit ];
|
||||||
|
maintainers = with maintainers; [ fab ];
|
||||||
|
};
|
||||||
|
}
|
|
@ -5428,7 +5428,7 @@ in
|
||||||
|
|
||||||
jo = callPackage ../development/tools/jo { };
|
jo = callPackage ../development/tools/jo { };
|
||||||
|
|
||||||
jrnl = callPackage ../applications/misc/jrnl { };
|
jrnl = python3Packages.callPackage ../applications/misc/jrnl { };
|
||||||
|
|
||||||
jsawk = callPackage ../tools/text/jsawk { };
|
jsawk = callPackage ../tools/text/jsawk { };
|
||||||
|
|
||||||
|
|
|
@ -463,6 +463,8 @@ in {
|
||||||
|
|
||||||
aspy-yaml = callPackage ../development/python-modules/aspy.yaml { };
|
aspy-yaml = callPackage ../development/python-modules/aspy.yaml { };
|
||||||
|
|
||||||
|
asteval = callPackage ../development/python-modules/asteval { };
|
||||||
|
|
||||||
astor = callPackage ../development/python-modules/astor { };
|
astor = callPackage ../development/python-modules/astor { };
|
||||||
|
|
||||||
astral = callPackage ../development/python-modules/astral { };
|
astral = callPackage ../development/python-modules/astral { };
|
||||||
|
|
Loading…
Reference in New Issue