From 0af347320c083112120d81f55a1a77f12eee31ac Mon Sep 17 00:00:00 2001 From: Francesco Gazzetta Date: Mon, 25 Jan 2021 15:16:56 +0100 Subject: [PATCH 1/2] pythonPackages.pytest-check: 0.3.9 -> 1.0.1 --- pkgs/development/python-modules/pytest-check/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pytest-check/default.nix b/pkgs/development/python-modules/pytest-check/default.nix index 41f316a18a6..05082a1aecf 100644 --- a/pkgs/development/python-modules/pytest-check/default.nix +++ b/pkgs/development/python-modules/pytest-check/default.nix @@ -7,12 +7,12 @@ buildPythonPackage rec { pname = "pytest-check"; - version = "0.3.9"; + version = "1.0.1"; src = fetchPypi { pname = "pytest_check"; inherit version; - sha256 = "0asrrz0fgk6wqffsz1ffd6z9xyw314fwh5bwjzcq75w8w1g4ass9"; + sha256 = "1i01i5ab06ic11na13gcacrlcs2ab6rmaii0yz0x06z5ynnljn6s"; }; propagatedBuildInputs = [ pytest ]; From 7e33a28b4b34017c96e78199347845b2c9e252d8 Mon Sep 17 00:00:00 2001 From: Francesco Gazzetta Date: Mon, 25 Jan 2021 15:17:20 +0100 Subject: [PATCH 2/2] staticjinja: 0.4.0 -> 1.0.3 --- .../python-modules/staticjinja/default.nix | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/staticjinja/default.nix b/pkgs/development/python-modules/staticjinja/default.nix index d49bae2eab9..a49f6a4fdfc 100644 --- a/pkgs/development/python-modules/staticjinja/default.nix +++ b/pkgs/development/python-modules/staticjinja/default.nix @@ -6,12 +6,16 @@ , easywatch , jinja2 , pytestCheckHook +, pytest-check +, fetchPypi , markdown +, sphinx +, sphinx_rtd_theme }: buildPythonPackage rec { pname = "staticjinja"; - version = "0.4.0"; + version = "1.0.3"; disabled = isPy27; # 0.4.0 drops python2 support @@ -21,7 +25,7 @@ buildPythonPackage rec { owner = "staticjinja"; repo = pname; rev = version; - sha256 = "0pysk8pzmcg1nfxz8m4i6bvww71w2zg6xp33zgg5vrf8yd2dfx9i"; + sha256 = "12rpv5gv64i5j4w98wm1444xnnmarcn3pg783j3fkkzc58lk5wwj"; }; propagatedBuildInputs = [ @@ -32,13 +36,18 @@ buildPythonPackage rec { checkInputs = [ pytestCheckHook + pytest-check markdown + sphinx_rtd_theme + sphinx ]; - # Import paths differ by a "build/lib" subdirectory, but the files are - # the same, so we ignore import mismatches. preCheck = '' + # Import paths differ by a "build/lib" subdirectory, but the files are + # the same, so we ignore import mismatches. export PY_IGNORE_IMPORTMISMATCH=1 + # The tests need to find and call the installed staticjinja executable + export PATH="$PATH:$out/bin"; ''; meta = with lib; {