Merge pull request #110776 from fgaz/staticjinja/1.0.3
This commit is contained in:
commit
63b38a0972
|
@ -7,12 +7,12 @@
|
||||||
|
|
||||||
buildPythonPackage rec {
|
buildPythonPackage rec {
|
||||||
pname = "pytest-check";
|
pname = "pytest-check";
|
||||||
version = "0.3.9";
|
version = "1.0.1";
|
||||||
|
|
||||||
src = fetchPypi {
|
src = fetchPypi {
|
||||||
pname = "pytest_check";
|
pname = "pytest_check";
|
||||||
inherit version;
|
inherit version;
|
||||||
sha256 = "0asrrz0fgk6wqffsz1ffd6z9xyw314fwh5bwjzcq75w8w1g4ass9";
|
sha256 = "1i01i5ab06ic11na13gcacrlcs2ab6rmaii0yz0x06z5ynnljn6s";
|
||||||
};
|
};
|
||||||
|
|
||||||
propagatedBuildInputs = [ pytest ];
|
propagatedBuildInputs = [ pytest ];
|
||||||
|
|
|
@ -6,12 +6,16 @@
|
||||||
, easywatch
|
, easywatch
|
||||||
, jinja2
|
, jinja2
|
||||||
, pytestCheckHook
|
, pytestCheckHook
|
||||||
|
, pytest-check
|
||||||
|
, fetchPypi
|
||||||
, markdown
|
, markdown
|
||||||
|
, sphinx
|
||||||
|
, sphinx_rtd_theme
|
||||||
}:
|
}:
|
||||||
|
|
||||||
buildPythonPackage rec {
|
buildPythonPackage rec {
|
||||||
pname = "staticjinja";
|
pname = "staticjinja";
|
||||||
version = "0.4.0";
|
version = "1.0.3";
|
||||||
|
|
||||||
disabled = isPy27; # 0.4.0 drops python2 support
|
disabled = isPy27; # 0.4.0 drops python2 support
|
||||||
|
|
||||||
|
@ -21,7 +25,7 @@ buildPythonPackage rec {
|
||||||
owner = "staticjinja";
|
owner = "staticjinja";
|
||||||
repo = pname;
|
repo = pname;
|
||||||
rev = version;
|
rev = version;
|
||||||
sha256 = "0pysk8pzmcg1nfxz8m4i6bvww71w2zg6xp33zgg5vrf8yd2dfx9i";
|
sha256 = "12rpv5gv64i5j4w98wm1444xnnmarcn3pg783j3fkkzc58lk5wwj";
|
||||||
};
|
};
|
||||||
|
|
||||||
propagatedBuildInputs = [
|
propagatedBuildInputs = [
|
||||||
|
@ -32,13 +36,18 @@ buildPythonPackage rec {
|
||||||
|
|
||||||
checkInputs = [
|
checkInputs = [
|
||||||
pytestCheckHook
|
pytestCheckHook
|
||||||
|
pytest-check
|
||||||
markdown
|
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 = ''
|
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
|
export PY_IGNORE_IMPORTMISMATCH=1
|
||||||
|
# The tests need to find and call the installed staticjinja executable
|
||||||
|
export PATH="$PATH:$out/bin";
|
||||||
'';
|
'';
|
||||||
|
|
||||||
meta = with lib; {
|
meta = with lib; {
|
||||||
|
|
Loading…
Reference in New Issue