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

Revert "Merge pull request #30913 from LnL7/darwin-cffi"

Browse Source 
This reverts commit f20a36fcd8feed3671b4c1591dbf4a018eef4cd3, reversing
changes made to 15350df8d925a335e9004b6ce7219a6215df41d0.

I accidentally pressed the Merge button.
This commit is contained in:
Frederik Rietdijk 2017-10-29 10:12:24 +01:00
parent f20a36fcd8
commit 94c4a6c0b1
2 changed files with 2 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
pkgs/development/python-modules/cffi/clang.patch
View File

@ -1,13 +0,0 @@
diff --git a/testing/cffi1/test_recompiler.py b/testing/cffi1/test_recompiler.py
index a3277b0..0d6e2c3 100644
--- a/testing/cffi1/test_recompiler.py
+++ b/testing/cffi1/test_recompiler.py
@@ -2270,7 +2270,7 @@ def test_char16_char32_type(no_cpp=False):
char32_t foo_4bytes(char32_t);
""")
lib = verify(ffi, "test_char16_char32_type" + no_cpp * "_nocpp", """
- #if !defined(__cplusplus) || __cplusplus < 201103L
+ #if !defined(__cplusplus)
typedef uint_least16_t char16_t;
typedef uint_least32_t char32_t;
#endif

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

@ -1,4 +1,4 @@
{ stdenv, buildPythonPackage, isPy27, isPyPy, fetchPypi, libffi, pycparser, pytest }: { stdenv, buildPythonPackage, isPyPy, fetchPypi, libffi, pycparser, pytest }:
if isPyPy then null else buildPythonPackage rec { if isPyPy then null else buildPythonPackage rec {
pname = "cffi"; pname = "cffi";
@ -10,15 +10,13 @@ if isPyPy then null else buildPythonPackage rec {
sha256 = "ab87dd91c0c4073758d07334c1e5f712ce8fe48f007b86f8238773963ee700a6"; sha256 = "ab87dd91c0c4073758d07334c1e5f712ce8fe48f007b86f8238773963ee700a6";
}; };
patches = stdenv.lib.optional isPy27 ./clang.patch;
outputs = [ "out" "dev" ]; outputs = [ "out" "dev" ];
propagatedBuildInputs = [ libffi pycparser ]; propagatedBuildInputs = [ libffi pycparser ];
buildInputs = [ pytest ]; buildInputs = [ pytest ];
# 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.optional stdenv.cc.isClang "-Wno-unreachable-code";
checkPhase = '' checkPhase = ''
py.test py.test