cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

Revert "Merge pull request #117886 from risicle/ris-pygments-tests"

Browse source 
This is a pattern that should be avoided. So far hypothesis is the only
package using it if I am correct, let's not add more. Instead, we should solve the underlying issue.
That is, we build, install and test within one derivation. That we should split up.
Doing this more will only result in trouble.

This reverts commit 49e0bbb333, reversing
changes made to 2f2a55496a.
This commit is contained in:
Frederik Rietdijk 2021-04-03 17:45:02 +02:00
parent 827f7a3e43
commit dc2638276b
3 changed files with 6 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
pkgs/development/python-modules/Pygments/2_5.nix
View file

@ -3,7 +3,6 @@
, fetchPypi , fetchPypi
, fetchpatch , fetchpatch
, docutils , docutils
, pytestCheckHook
}: }:
buildPythonPackage rec { buildPythonPackage rec {
@ -26,7 +25,8 @@ buildPythonPackage rec {
propagatedBuildInputs = [ docutils ]; propagatedBuildInputs = [ docutils ];
checkInputs = [ pytestCheckHook ]; # Circular dependency with sphinx
doCheck = false;
meta = { meta = {
homepage = "https://pygments.org/"; homepage = "https://pygments.org/";

6
pkgs/development/python-modules/Pygments/default.nix
View file

@ -2,8 +2,6 @@
, buildPythonPackage , buildPythonPackage
, fetchPypi , fetchPypi
, docutils , docutils
, pytestCheckHook
, doCheck ? true
}: }:
buildPythonPackage rec { buildPythonPackage rec {
@ -17,8 +15,8 @@ buildPythonPackage rec {
propagatedBuildInputs = [ docutils ]; propagatedBuildInputs = [ docutils ];
inherit doCheck; # Circular dependency with sphinx
checkInputs = [ pytestCheckHook ]; doCheck = false;
meta = { meta = {
homepage = "https://pygments.org/"; homepage = "https://pygments.org/";

10
pkgs/top-level/python-packages.nix
View file

@ -6429,24 +6429,18 @@ in {
pytest_5 = callPackage pytest_5 = callPackage
../development/python-modules/pytest/5.nix { ../development/python-modules/pytest/5.nix {
# hypothesis & pygments tests require pytest that causes dependency cycle # hypothesis tests require pytest that causes dependency cycle
hypothesis = self.hypothesis.override { hypothesis = self.hypothesis.override {
doCheck = false; doCheck = false;
}; };
pygments = self.pygments.override {
doCheck = false;
};
}; };
pytest_6 = pytest_6 =
callPackage ../development/python-modules/pytest { callPackage ../development/python-modules/pytest {
# hypothesis & pygments tests require pytest that causes dependency cycle # hypothesis tests require pytest that causes dependency cycle
hypothesis = self.hypothesis.override { hypothesis = self.hypothesis.override {
doCheck = false; doCheck = false;
}; };
pygments = self.pygments.override {
doCheck = false;
};
}; };
pytest_6_1 = self.pytest_6.overridePythonAttrs (oldAttrs: rec { pytest_6_1 = self.pytest_6.overridePythonAttrs (oldAttrs: rec {