mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-12-05 12:02:47 +00:00
Merge pull request #117886 from risicle/ris-pygments-tests
This commit is contained in:
commit
49e0bbb333
|
@ -3,6 +3,7 @@
|
|||
, fetchPypi
|
||||
, fetchpatch
|
||||
, docutils
|
||||
, pytestCheckHook
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
|
@ -25,8 +26,7 @@ buildPythonPackage rec {
|
|||
|
||||
propagatedBuildInputs = [ docutils ];
|
||||
|
||||
# Circular dependency with sphinx
|
||||
doCheck = false;
|
||||
checkInputs = [ pytestCheckHook ];
|
||||
|
||||
meta = {
|
||||
homepage = "https://pygments.org/";
|
||||
|
|
|
@ -2,6 +2,8 @@
|
|||
, buildPythonPackage
|
||||
, fetchPypi
|
||||
, docutils
|
||||
, pytestCheckHook
|
||||
, doCheck ? true
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
|
@ -15,8 +17,8 @@ buildPythonPackage rec {
|
|||
|
||||
propagatedBuildInputs = [ docutils ];
|
||||
|
||||
# Circular dependency with sphinx
|
||||
doCheck = false;
|
||||
inherit doCheck;
|
||||
checkInputs = [ pytestCheckHook ];
|
||||
|
||||
meta = {
|
||||
homepage = "https://pygments.org/";
|
||||
|
|
|
@ -6417,18 +6417,24 @@ in {
|
|||
|
||||
pytest_5 = callPackage
|
||||
../development/python-modules/pytest/5.nix {
|
||||
# hypothesis tests require pytest that causes dependency cycle
|
||||
# hypothesis & pygments tests require pytest that causes dependency cycle
|
||||
hypothesis = self.hypothesis.override {
|
||||
doCheck = false;
|
||||
};
|
||||
pygments = self.pygments.override {
|
||||
doCheck = false;
|
||||
};
|
||||
};
|
||||
|
||||
pytest_6 =
|
||||
callPackage ../development/python-modules/pytest {
|
||||
# hypothesis tests require pytest that causes dependency cycle
|
||||
# hypothesis & pygments tests require pytest that causes dependency cycle
|
||||
hypothesis = self.hypothesis.override {
|
||||
doCheck = false;
|
||||
};
|
||||
pygments = self.pygments.override {
|
||||
doCheck = false;
|
||||
};
|
||||
};
|
||||
|
||||
pytest_6_1 = self.pytest_6.overridePythonAttrs (oldAttrs: rec {
|
||||
|
|
Loading…
Reference in a new issue