pybind11: 2.2.2 -> 2.2.4 (#54792)

This commit is contained in:
Florian Franzen 2019-02-14 15:04:32 +01:00 committed by Robert Schütz
parent b7e78c283e
commit 59379d1f4f
2 changed files with 21 additions and 9 deletions

View File

@ -1,23 +1,29 @@
{ stdenv, fetchFromGitHub, cmake, python }:
{ stdenv, fetchFromGitHub, cmake, catch, python, eigen }:
stdenv.mkDerivation rec {
name = "pybind-${version}";
version = "2.2.2";
version = "2.2.4";
src = fetchFromGitHub {
owner = "pybind";
repo = "pybind11";
rev = "v${version}";
sha256 = "0x71i1n5d02hjbdcnkscrwxs9pb8kplmdpqddhsimabfp84fip48";
sha256 = "0pa79ymcasv8br5ifbx7878id5py2jpjac3i20cqxr6gs9l6ivlv";
};
nativeBuildInputs = [ cmake ];
checkInputs = with python.pkgs; [ catch eigen pytest numpy scipy ];
# disable tests as some tests (test_embed/test_interpreter) are failing at the moment
cmakeFlags = [
"-DPYTHON_EXECUTABLE=${python.interpreter}"
"-DPYBIND11_TEST=0"
# Disable test_cmake_build test, as it fails in sandbox
# https://github.com/pybind/pybind11/issues/1355
patches = [ ./no_test_cmake_build.patch ];
doCheck = true;
cmakeFlags = [
"-DPYTHON_EXECUTABLE=${python.interpreter}"
"-DPYBIND11_TEST=${if doCheck then "ON" else "OFF"}"
];
doCheck = false;
meta = {
homepage = https://github.com/pybind/pybind11;
@ -31,5 +37,4 @@ stdenv.mkDerivation rec {
license = stdenv.lib.licenses.bsd3;
maintainers = with stdenv.lib.maintainers; [ yuriaisaka ];
};
}

View File

@ -0,0 +1,7 @@
--- a/tests/CMakeLists.txt 2019-01-28 14:13:55.822119328 +0100
+++ b/tests/CMakeLists.txt 2019-01-28 14:14:06.741161928 +0100
@@ -233,4 +233,3 @@
add_subdirectory(test_embed)
# Test CMake build using functions and targets from subdirectory or installed location
-add_subdirectory(test_cmake_build)