BoomMicrophone/nixpkgs-suyu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #67290 from Ma27/bump-dlib

Browse source 
dlib: 19.16 -> 19.17
This commit is contained in:
Marek Mahut 2019-08-25 14:15:31 +02:00 committed by GitHub
commit 7bdda407bb
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 11 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
pkgs/development/libraries/dlib/default.nix
View file

@ -6,14 +6,14 @@
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
version = "19.16"; version = "19.17";
name = "dlib-${version}"; name = "dlib-${version}";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "davisking"; owner = "davisking";
repo = "dlib"; repo = "dlib";
rev ="v${version}"; rev ="v${version}";
sha256 = "0ix52npsxfm6324jli7y0zkyijl5yirv2yzfncyd4sq0r9fcwb4p"; sha256 = "0g11ilma6cll3bd2ahm66j1sjb9v4rxz3xjbfkcg5pjsvb49n029";
}; };
postPatch = '' postPatch = ''

12
pkgs/development/python-modules/dlib/default.nix
View file

@ -1,4 +1,4 @@
{ buildPythonPackage, dlib, python, pytest, avxSupport ? true }: { buildPythonPackage, dlib, python, pytest, more-itertools, avxSupport ? true, lib }:
buildPythonPackage { buildPythonPackage {
inherit (dlib) name src nativeBuildInputs buildInputs meta; inherit (dlib) name src nativeBuildInputs buildInputs meta;
@ -10,9 +10,15 @@ buildPythonPackage {
${python.interpreter} nix_run_setup test --no USE_AVX_INSTRUCTIONS ${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 ]; 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 ];
} }