diff --git a/pkgs/development/libraries/dlib/default.nix b/pkgs/development/libraries/dlib/default.nix index e5e3c2d662c2..a88b3f1b9b68 100644 --- a/pkgs/development/libraries/dlib/default.nix +++ b/pkgs/development/libraries/dlib/default.nix @@ -3,14 +3,14 @@ }: stdenv.mkDerivation rec { - version = "19.13"; + version = "19.16"; name = "dlib-${version}"; src = fetchFromGitHub { owner = "davisking"; repo = "dlib"; rev ="v${version}"; - sha256 = "11ia4pd2lm2s9hzwrdvimj3r2qcnvjdp3g4fry2j1a6z9f99zvz3"; + sha256 = "0ix52npsxfm6324jli7y0zkyijl5yirv2yzfncyd4sq0r9fcwb4p"; }; postPatch = '' diff --git a/pkgs/development/python-modules/dlib/default.nix b/pkgs/development/python-modules/dlib/default.nix new file mode 100644 index 000000000000..90e2c526789f --- /dev/null +++ b/pkgs/development/python-modules/dlib/default.nix @@ -0,0 +1,13 @@ +{ buildPythonPackage, dlib, python, pytest }: + +buildPythonPackage { + inherit (dlib) name src nativeBuildInputs buildInputs meta; + + checkPhase = '' + ${python.interpreter} nix_run_setup test --no USE_AVX_INSTRUCTIONS + ''; + + patches = [ ./build-cores.patch ]; + + checkInputs = [ pytest ]; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 2a301f036594..b2cff4940c13 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -973,12 +973,8 @@ in { cypari2 = callPackage ../development/python-modules/cypari2 { }; - dlib = buildPythonPackage rec { - inherit (pkgs.dlib) name src nativeBuildInputs meta buildInputs; - - patches = [ ../development/python-modules/dlib/build-cores.patch ]; - - checkInputs = with self; [ pytest ]; + dlib = callPackage ../development/python-modules/dlib { + inherit (pkgs) dlib; }; datadog = callPackage ../development/python-modules/datadog {};