Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

python3Packages.cffi: fix tests on FreeBSD #329076

Open
wants to merge 2 commits into
base: staging
Choose a base branch
from
+18 −43
Open

python3Packages.cffi: fix tests on FreeBSD #329076

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8c40720
python3Packages.cffi: remove some obsolete darwin patches
rhelmot Nov 18, 2024
7778790
python3Packages.cffi: disable a test on FreeBSD
rhelmot Nov 18, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 0 additions & 11 deletions pkgs/development/python-modules/cffi/clang-pointer-substraction-warning.diff
View file
Open in desktop

This file was deleted.

50 changes: 18 additions & 32 deletions pkgs/development/python-modules/cffi/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,6 @@
pycparser,
}:

let
ccVersion = lib.getVersion stdenv.cc;
in
if isPyPy then
null
else
Expand All @@ -27,35 +24,19 @@ else
hash = "sha256-HDnGAWwyvEjdVFYZUOvWg24WcPKuRhKPZ89J54nFKCQ=";
};

patches =
[
#
# Trusts the libffi library inside of nixpkgs on Apple devices.
#
# Based on some analysis I did:
#
# https://groups.google.com/g/python-cffi/c/xU0Usa8dvhk
#
# I believe that libffi already contains the code from Apple's fork that is
# deemed safe to trust in cffi.
#
./darwin-use-libffi-closures.diff
]
++ lib.optionals (stdenv.cc.isClang && (ccVersion == "boot" || lib.versionAtLeast ccVersion "13")) [
# -Wnull-pointer-subtraction is enabled with -Wextra. Suppress it to allow the following tests
# to run and pass when cffi is built with newer versions of clang (including the bootstrap tools clang on Darwin):
# - testing/cffi1/test_verify1.py::test_enum_usage
# - testing/cffi1/test_verify1.py::test_named_pointer_as_argument
./clang-pointer-substraction-warning.diff
];

postPatch = lib.optionalString stdenv.hostPlatform.isDarwin ''
# Remove setup.py impurities
substituteInPlace setup.py \
--replace "'-iwithsysroot/usr/include/ffi'" "" \
--replace "'/usr/include/ffi'," "" \
--replace '/usr/include/libffi' '${lib.getDev libffi}/include'
'';
patches = [
#
# Trusts the libffi library inside of nixpkgs on Apple devices.
#
# Based on some analysis I did:
#
# https://groups.google.com/g/python-cffi/c/xU0Usa8dvhk
#
# I believe that libffi already contains the code from Apple's fork that is
# deemed safe to trust in cffi.
#
./darwin-use-libffi-closures.diff
];

nativeBuildInputs = [ pkg-config ];

Expand All @@ -72,6 +53,11 @@ else

nativeCheckInputs = [ pytestCheckHook ];

disabledTests = lib.optionals stdenv.hostPlatform.isFreeBSD [
# https://github.com/python-cffi/cffi/pull/144
"test_dlopen_handle"
];

meta = with lib; {
changelog = "https://github.com/python-cffi/cffi/releases/tag/v${version}";
description = "Foreign Function Interface for Python calling C code";
Expand Down