Merge pull request #43627 from oxij/tree/simplify-depcycles
treewide: simplify some dependency cycles
This commit is contained in:
commit
c0beb48fa7
|
@ -1,5 +1,6 @@
|
|||
{ stdenv, fetchurl, fetchpatch, dejagnu, doCheck ? false
|
||||
{ stdenv, fetchurl, fetchpatch
|
||||
, buildPlatform, hostPlatform, autoreconfHook
|
||||
, doCheck ? true, dejagnu
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
|
@ -40,8 +41,6 @@ stdenv.mkDerivation rec {
|
|||
|
||||
outputs = [ "out" "dev" "man" "info" ];
|
||||
|
||||
buildInputs = stdenv.lib.optional doCheck dejagnu;
|
||||
|
||||
nativeBuildInputs = stdenv.lib.optional hostPlatform.isRiscV autoreconfHook;
|
||||
|
||||
configureFlags = [
|
||||
|
@ -54,6 +53,8 @@ stdenv.mkDerivation rec {
|
|||
NIX_HARDENING_ENABLE=''${NIX_HARDENING_ENABLE/fortify/}
|
||||
'';
|
||||
|
||||
checkInputs = [ dejagnu ];
|
||||
|
||||
inherit doCheck;
|
||||
|
||||
dontStrip = hostPlatform != buildPlatform; # Don't run the native `strip' when cross-compiling.
|
||||
|
|
|
@ -20,9 +20,9 @@ buildPythonPackage rec {
|
|||
sha256 = "063sn5m1966gvm3wrlxczdq4vw0r94h3nd9xpr94qxahpg2r4bpb";
|
||||
};
|
||||
|
||||
checkInputs = [ pytest pytest_xdist flaky mock ];
|
||||
propagatedBuildInputs = [ attrs coverage ] ++ lib.optional (!isPy3k) [ enum34 ];
|
||||
|
||||
checkInputs = [ pytest pytest_xdist flaky mock ];
|
||||
inherit doCheck;
|
||||
|
||||
# https://github.com/DRMacIver/hypothesis/issues/300
|
||||
|
|
|
@ -1925,11 +1925,8 @@ in {
|
|||
pytest = self.pytest_36;
|
||||
|
||||
pytest_36 = callPackage ../development/python-modules/pytest {
|
||||
hypothesis = self.hypothesis.override {
|
||||
# hypothesis requires pytest that causes dependency cycle
|
||||
doCheck = false;
|
||||
pytest = null;
|
||||
};
|
||||
# hypothesis tests require pytest that causes dependency cycle
|
||||
hypothesis = self.hypothesis.override { doCheck = false; };
|
||||
};
|
||||
|
||||
# Needed for celery
|
||||
|
|
Loading…
Reference in a new issue