git.iko.soy/typeable/nixpkgs
on master help sign in
pybind11: 2.2.2 -> 2.2.4 (#54792)
commit59379d1f4f012ed4bf26c24062282dd9005676c4 authorFlorian Franzen <Florian.Franzen@gmail.com> dateThu 14 Feb 2019, 15:04 (8 years ago) parentb7e78c2
2 files changed+21−9
pkgs/development/libraries/pybind11/default.nix+14−9 pkgs/development/libraries/pybind11/no_test_cmake_build.patch+7
pkgs/development/libraries/pybind11/default.nix+14−9
@@ -1,23 +1,29 @@
1−{ stdenv, fetchFromGitHub, cmake, python }:
1+{ stdenv, fetchFromGitHub, cmake, catch, python, eigen }:
22
33stdenv.mkDerivation rec {
44 name = "pybind-${version}";
5− version = "2.2.2";
5+ version = "2.2.4";
6+
67 src = fetchFromGitHub {
78 owner = "pybind";
89 repo = "pybind11";
910 rev = "v${version}";
10− sha256 = "0x71i1n5d02hjbdcnkscrwxs9pb8kplmdpqddhsimabfp84fip48";
11+ sha256 = "0pa79ymcasv8br5ifbx7878id5py2jpjac3i20cqxr6gs9l6ivlv";
1112 };
1213
1314 nativeBuildInputs = [ cmake ];
15+ checkInputs = with python.pkgs; [ catch eigen pytest numpy scipy ];
16+
17+ # Disable test_cmake_build test, as it fails in sandbox
18+ # https://github.com/pybind/pybind11/issues/1355
19+ patches = [ ./no_test_cmake_build.patch ];
1420
15− # disable tests as some tests (test_embed/test_interpreter) are failing at the moment
16− cmakeFlags = [
17− "-DPYTHON_EXECUTABLE=${python.interpreter}"
18− "-DPYBIND11_TEST=0"
21+ doCheck = true;
22+
23+ cmakeFlags = [
24+ "-DPYTHON_EXECUTABLE=${python.interpreter}"
25+ "-DPYBIND11_TEST=${if doCheck then "ON" else "OFF"}"
1926 ];
20− doCheck = false;
2127
2228 meta = {
2329 homepage = https://github.com/pybind/pybind11;
@@ -31,5 +37,4 @@ stdenv.mkDerivation rec {
3137 license = stdenv.lib.licenses.bsd3;
3238 maintainers = with stdenv.lib.maintainers; [ yuriaisaka ];
3339 };
34−
3540}
pkgs/development/libraries/pybind11/no_test_cmake_build.patchnew file+7
@@ -0,0 +1,7 @@
1+--- a/tests/CMakeLists.txt 2019-01-28 14:13:55.822119328 +0100
2++++ b/tests/CMakeLists.txt 2019-01-28 14:14:06.741161928 +0100
3+@@ -233,4 +233,3 @@
4+ add_subdirectory(test_embed)
5+
6+ # Test CMake build using functions and targets from subdirectory or installed location
7+-add_subdirectory(test_cmake_build)