From 827bad2edc1b442410dabb5998bc882f3b1eac12 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 10 Feb 2021 22:23:37 +0100 Subject: [PATCH 1/4] python3Packages.ansiwrap: switch to pytestCheckHook --- .../python-modules/ansiwrap/default.nix | 22 +++++++------------ 1 file changed, 8 insertions(+), 14 deletions(-) diff --git a/pkgs/development/python-modules/ansiwrap/default.nix b/pkgs/development/python-modules/ansiwrap/default.nix index 1af39e970bc..1d0aef1ee5d 100644 --- a/pkgs/development/python-modules/ansiwrap/default.nix +++ b/pkgs/development/python-modules/ansiwrap/default.nix @@ -1,11 +1,10 @@ { lib -, buildPythonPackage -, fetchPypi -, tox -, pytest , ansicolors +, buildPythonPackage , coverage -, pytestcov +, fetchPypi +, pytest-cov +, pytestCheckHook , textwrap3 }: @@ -20,20 +19,15 @@ buildPythonPackage rec { }; checkInputs = [ - tox - pytest ansicolors coverage - pytestcov + pytest-cov + pytestCheckHook ]; - propagatedBuildInputs = [ - textwrap3 - ]; + propagatedBuildInputs = [ textwrap3 ]; - checkPhase = '' - pytest - ''; + pythonImportsCheck = [ "ansiwrap" ]; meta = with lib; { description = "Textwrap, but savvy to ANSI colors and styles"; From 4582127fcd682c420f13cf18dfcbc1d241fe0d8c Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 10 Feb 2021 22:34:19 +0100 Subject: [PATCH 2/4] python3Packages.asteval: init at 0.9.21 --- .../python-modules/asteval/default.nix | 30 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 32 insertions(+) create mode 100644 pkgs/development/python-modules/asteval/default.nix diff --git a/pkgs/development/python-modules/asteval/default.nix b/pkgs/development/python-modules/asteval/default.nix new file mode 100644 index 00000000000..c66a5468873 --- /dev/null +++ b/pkgs/development/python-modules/asteval/default.nix @@ -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 ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 08b8cb84675..1977fd25128 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -461,6 +461,8 @@ in { aspy-yaml = callPackage ../development/python-modules/aspy.yaml { }; + asteval = callPackage ../development/python-modules/asteval { }; + astor = callPackage ../development/python-modules/astor { }; astral = callPackage ../development/python-modules/astral { }; From bdf412c408823447144bff6bc7e634847ac47fbe Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 11 Feb 2021 16:46:34 +0100 Subject: [PATCH 3/4] av-98: add pythonImportsCheck --- pkgs/applications/networking/browsers/av-98/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/applications/networking/browsers/av-98/default.nix b/pkgs/applications/networking/browsers/av-98/default.nix index 2184c8d699a..afd2e9b9c1a 100644 --- a/pkgs/applications/networking/browsers/av-98/default.nix +++ b/pkgs/applications/networking/browsers/av-98/default.nix @@ -12,6 +12,10 @@ python3Packages.buildPythonApplication rec { propagatedBuildInputs = with python3Packages; [ ansiwrap cryptography ]; + # No tests are available + doCheck = false; + pythonImportsCheck = [ "av98" ]; + meta = with lib; { homepage = "https://tildegit.org/solderpunk/AV-98"; description = "Experimental console client for the Gemini protocol"; From 3efd6fe92245c2b1b81e12d74ee736ef7f887805 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 11 Feb 2021 16:48:36 +0100 Subject: [PATCH 4/4] jrnl: 1.9.8 -> 2.7 --- pkgs/applications/misc/jrnl/default.nix | 50 +++++++++++++++++++------ pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 39 insertions(+), 13 deletions(-) diff --git a/pkgs/applications/misc/jrnl/default.nix b/pkgs/applications/misc/jrnl/default.nix index 79f87612e49..8d2cabb5b8b 100644 --- a/pkgs/applications/misc/jrnl/default.nix +++ b/pkgs/applications/misc/jrnl/default.nix @@ -1,30 +1,56 @@ { lib -, python3 +, ansiwrap +, asteval +, buildPythonApplication +, colorama +, cryptography +, fetchFromGitHub +, keyring +, parsedatetime +, poetry +, pytestCheckHook +, python-dateutil +, pytz +, pyxdg +, pyyaml +, tzlocal }: -with python3.pkgs; - buildPythonApplication rec { pname = "jrnl"; - version = "1.9.8"; + version = "2.7"; + format = "pyproject"; - src = fetchPypi { - inherit pname version; - sha256 = "d254c9c8f24dcf985b98a1d5311337c7f416e6305107eec34c567f58c95b06f4"; + src = fetchFromGitHub { + owner = "jrnl-org"; + repo = pname; + rev = "v${version}"; + sha256 = "1hyjjw9mxy73n3pkliaaif135h2sd4iy43pw9d5zynid5abnr3yz"; }; + nativeBuildInputs = [ poetry ]; + propagatedBuildInputs = [ - pytz six tzlocal keyring dateutil - parsedatetime pycrypto + ansiwrap + asteval + colorama + cryptography + keyring + parsedatetime + python-dateutil + pytz + pyxdg + pyyaml + tzlocal ]; - # No tests in archive - doCheck = false; + checkInputs = [ pytestCheckHook ]; + pythonImportsCheck = [ "jrnl" ]; meta = with lib; { homepage = "http://maebert.github.io/jrnl/"; 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 ]; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 148ce73d290..1dba2897b91 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5428,7 +5428,7 @@ in jo = callPackage ../development/tools/jo { }; - jrnl = callPackage ../applications/misc/jrnl { }; + jrnl = python3Packages.callPackage ../applications/misc/jrnl { }; jsawk = callPackage ../tools/text/jsawk { };