From 0c27903ac04557f2a3de5b385f0fb28321079131 Mon Sep 17 00:00:00 2001 From: Daiderd Jordan Date: Mon, 22 Jan 2018 19:45:40 +0100 Subject: [PATCH 1/2] python-cffi: remove patch for clang Builds fine without it now. --- pkgs/development/python-modules/cffi/clang.patch | 13 ------------- pkgs/development/python-modules/cffi/default.nix | 2 -- 2 files changed, 15 deletions(-) delete mode 100644 pkgs/development/python-modules/cffi/clang.patch diff --git a/pkgs/development/python-modules/cffi/clang.patch b/pkgs/development/python-modules/cffi/clang.patch deleted file mode 100644 index 27674edb58b..00000000000 --- a/pkgs/development/python-modules/cffi/clang.patch +++ /dev/null @@ -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 diff --git a/pkgs/development/python-modules/cffi/default.nix b/pkgs/development/python-modules/cffi/default.nix index cc6ad6a32a7..6658b76c31e 100644 --- a/pkgs/development/python-modules/cffi/default.nix +++ b/pkgs/development/python-modules/cffi/default.nix @@ -10,8 +10,6 @@ if isPyPy then null else buildPythonPackage rec { sha256 = "df9083a992b17a28cd4251a3f5c879e0198bb26c9e808c4647e0a18739f1d11d"; }; - patches = stdenv.lib.optional (isPy27 && stdenv.cc.isClang) ./clang.patch; - outputs = [ "out" "dev" ]; propagatedBuildInputs = [ libffi pycparser ]; From 505c82efe44b2366360c22f73cce8cd72bd8ac8c Mon Sep 17 00:00:00 2001 From: Daiderd Jordan Date: Mon, 22 Jan 2018 19:55:47 +0100 Subject: [PATCH 2/2] python-cffi: add lnl7 to maintainers --- pkgs/development/python-modules/cffi/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/cffi/default.nix b/pkgs/development/python-modules/cffi/default.nix index 6658b76c31e..28d4a36aca7 100644 --- a/pkgs/development/python-modules/cffi/default.nix +++ b/pkgs/development/python-modules/cffi/default.nix @@ -37,7 +37,7 @@ if isPyPy then null else buildPythonPackage rec { ''; meta = with stdenv.lib; { - maintainers = with maintainers; [ domenkozar ]; + maintainers = with maintainers; [ domenkozar lnl7 ]; homepage = https://cffi.readthedocs.org/; license = with licenses; [ mit ]; description = "Foreign Function Interface for Python calling C code";