diff options
author | Maximilian Bosch <maximilian@mbosch.me> | 2019-08-22 19:53:49 +0200 |
---|---|---|
committer | Maximilian Bosch <maximilian@mbosch.me> | 2019-08-22 20:53:41 +0200 |
commit | 311516f55efc869cfb03bacc87bc3b7a0b047fae (patch) | |
tree | 41649006051a0910c2168ee6b7b411fa16ed6d5b /pkgs/development/python-modules/dlib | |
parent | 3d91781151e69ea3519d30241635f8de5d11db65 (diff) |
dlib: 19.16 -> 19.17
https://github.com/davisking/dlib/releases/tag/v19.17 Also had to change the expression for setup.py flags as 19.17 doesn't support `--yes` anymore.
Diffstat (limited to 'pkgs/development/python-modules/dlib')
-rw-r--r-- | pkgs/development/python-modules/dlib/default.nix | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/pkgs/development/python-modules/dlib/default.nix b/pkgs/development/python-modules/dlib/default.nix index c200b6959b647..d9b3bb93264e5 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 ]; } |