diff --git a/pkgs/development/libraries/dlib/default.nix b/pkgs/development/libraries/dlib/default.nix index 67a56855bb7..97d74e1ed3c 100644 --- a/pkgs/development/libraries/dlib/default.nix +++ b/pkgs/development/libraries/dlib/default.nix @@ -6,14 +6,14 @@ }: stdenv.mkDerivation rec { - version = "19.16"; + version = "19.17"; name = "dlib-${version}"; src = fetchFromGitHub { owner = "davisking"; repo = "dlib"; rev ="v${version}"; - sha256 = "0ix52npsxfm6324jli7y0zkyijl5yirv2yzfncyd4sq0r9fcwb4p"; + sha256 = "0g11ilma6cll3bd2ahm66j1sjb9v4rxz3xjbfkcg5pjsvb49n029"; }; postPatch = '' diff --git a/pkgs/development/python-modules/dlib/default.nix b/pkgs/development/python-modules/dlib/default.nix index c200b6959b6..d9b3bb93264 100644 --- a/pkgs/development/python-modules/dlib/default.nix +++ b/pkgs/development/python-modules/dlib/default.nix @@ -1,4 +1,4 @@ -{ buildPythonPackage, dlib, python, pytest, avxSupport ? true }: +{ buildPythonPackage, dlib, python, pytest, more-itertools, avxSupport ? true, lib }: buildPythonPackage { inherit (dlib) name src nativeBuildInputs buildInputs meta; @@ -10,9 +10,15 @@ buildPythonPackage { ${python.interpreter} nix_run_setup test --no USE_AVX_INSTRUCTIONS ''; - setupPyBuildFlags = [ "--${if avxSupport then "yes" else "no"} USE_AVX_INSTRUCTIONS" ]; + setupPyBuildFlags = lib.optional avxSupport "--no USE_AVX_INSTRUCTIONS"; patches = [ ./build-cores.patch ]; - checkInputs = [ pytest ]; + postPatch = '' + substituteInPlace setup.py \ + --replace "more-itertools<6.0.0" "more-itertools" \ + --replace "pytest==3.8" "pytest" + ''; + + checkInputs = [ pytest more-itertools ]; }