public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #43627 from oxij/tree/simplify-depcycles

Browse Source 
treewide: simplify some dependency cycles
This commit is contained in:
Matthew Bauer 2018-07-17 21:54:43 -04:00 committed by GitHub
commit c0beb48fa7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
pkgs/development/libraries/libffi/default.nix
View File

@ -1,5 +1,6 @@
{ stdenv, fetchurl, fetchpatch, dejagnu, doCheck ? false { stdenv, fetchurl, fetchpatch
, buildPlatform, hostPlatform, autoreconfHook , buildPlatform, hostPlatform, autoreconfHook
, doCheck ? true, dejagnu
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
@ -40,8 +41,6 @@ stdenv.mkDerivation rec {
outputs = [ "out" "dev" "man" "info" ]; outputs = [ "out" "dev" "man" "info" ];
buildInputs = stdenv.lib.optional doCheck dejagnu;
nativeBuildInputs = stdenv.lib.optional hostPlatform.isRiscV autoreconfHook; nativeBuildInputs = stdenv.lib.optional hostPlatform.isRiscV autoreconfHook;
configureFlags = [ configureFlags = [
@ -54,6 +53,8 @@ stdenv.mkDerivation rec {
NIX_HARDENING_ENABLE=''${NIX_HARDENING_ENABLE/fortify/} NIX_HARDENING_ENABLE=''${NIX_HARDENING_ENABLE/fortify/}
''; '';
checkInputs = [ dejagnu ];
inherit doCheck; inherit doCheck;
dontStrip = hostPlatform != buildPlatform; # Don't run the native `strip' when cross-compiling. dontStrip = hostPlatform != buildPlatform; # Don't run the native `strip' when cross-compiling.

2
pkgs/development/python-modules/hypothesis/default.nix
View File

@ -20,9 +20,9 @@ buildPythonPackage rec {
sha256 = "063sn5m1966gvm3wrlxczdq4vw0r94h3nd9xpr94qxahpg2r4bpb"; sha256 = "063sn5m1966gvm3wrlxczdq4vw0r94h3nd9xpr94qxahpg2r4bpb";
}; };
checkInputs = [ pytest pytest_xdist flaky mock ];
propagatedBuildInputs = [ attrs coverage ] ++ lib.optional (!isPy3k) [ enum34 ]; propagatedBuildInputs = [ attrs coverage ] ++ lib.optional (!isPy3k) [ enum34 ];
checkInputs = [ pytest pytest_xdist flaky mock ];
inherit doCheck; inherit doCheck;
# https://github.com/DRMacIver/hypothesis/issues/300 # https://github.com/DRMacIver/hypothesis/issues/300

7
pkgs/top-level/python-packages.nix
View File

@ -1925,11 +1925,8 @@ in {
pytest = self.pytest_36; pytest = self.pytest_36;
pytest_36 = callPackage ../development/python-modules/pytest { pytest_36 = callPackage ../development/python-modules/pytest {
hypothesis = self.hypothesis.override { # hypothesis tests require pytest that causes dependency cycle
# hypothesis requires pytest that causes dependency cycle hypothesis = self.hypothesis.override { doCheck = false; };
doCheck = false;
pytest = null;
};
}; };
# Needed for celery # Needed for celery