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

Fix a couple of python modules to work in sandbox

Browse Source
This commit is contained in:
Dan Peebles 2017-10-31 12:20:22 +01:00
parent 0fe7bde3d8
commit 10220de35e
2 changed files with 16 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
pkgs/development/python-modules/cffi/default.nix
View File

@ -17,6 +17,20 @@ if isPyPy then null else buildPythonPackage rec {
propagatedBuildInputs = [ libffi pycparser ]; propagatedBuildInputs = [ libffi pycparser ];
buildInputs = [ pytest ]; buildInputs = [ pytest ];
# On Darwin, the cffi tests want to hit libm a lot, and look for it in a global
# impure search path. It's obnoxious how much repetition there is, and how difficult
# it is to get it to search somewhere else (since we do actually have a libm symlink in libSystem)
prePatch = stdenv.lib.optionalString stdenv.isDarwin ''
substituteInPlace testing/cffi0/test_parsing.py \
--replace 'lib_m = "m"' 'lib_m = "System"' \
--replace '"libm" in name' '"libSystem" in name'
substituteInPlace testing/cffi0/test_unicode_literals.py --replace 'lib_m = "m"' 'lib_m = "System"'
substituteInPlace testing/cffi0/test_zdistutils.py --replace 'self.lib_m = "m"' 'self.lib_m = "System"'
substituteInPlace testing/cffi1/test_recompiler.py --replace 'lib_m = "m"' 'lib_m = "System"'
substituteInPlace testing/cffi0/test_function.py --replace "lib_m = 'm'" "lib_m = 'System'"
substituteInPlace testing/cffi0/test_verify.py --replace "lib_m = ['m']" "lib_m = ['System']"
'';
# The tests use -Werror but with python3.6 clang detects some unreachable code. # The tests use -Werror but with python3.6 clang detects some unreachable code.
NIX_CFLAGS_COMPILE = stdenv.lib.optionals stdenv.cc.isClang [ "-Wno-unused-command-line-argument" "-Wno-unreachable-code" ]; NIX_CFLAGS_COMPILE = stdenv.lib.optionals stdenv.cc.isClang [ "-Wno-unused-command-line-argument" "-Wno-unreachable-code" ];

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

@ -14095,6 +14095,8 @@ in {
propagatedBuildInputs = with self; [ cryptography pyasn1 ]; propagatedBuildInputs = with self; [ cryptography pyasn1 ];
__darwinAllowLocalNetworking = true;
# https://github.com/paramiko/paramiko/issues/449 # https://github.com/paramiko/paramiko/issues/449
doCheck = !(isPyPy || isPy33); doCheck = !(isPyPy || isPy33);
checkPhase = '' checkPhase = ''