JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #49070 from r-ryantm/auto-update/python3.6-dlib

Browse Source 
python36Packages.dlib: 19.13 -> 19.16
This commit is contained in:
Frederik Rietdijk 2018-10-29 19:27:07 +01:00 committed by GitHub
commit e6c0b6ff6f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 17 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -3,14 +3,14 @@
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
version = "19.13"; version = "19.16";
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 = "11ia4pd2lm2s9hzwrdvimj3r2qcnvjdp3g4fry2j1a6z9f99zvz3"; sha256 = "0ix52npsxfm6324jli7y0zkyijl5yirv2yzfncyd4sq0r9fcwb4p";
}; };
postPatch = '' postPatch = ''

13
pkgs/development/python-modules/dlib/default.nix Normal file
View File

@ -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 ];
}

8
pkgs/top-level/python-packages.nix
View File

@ -973,12 +973,8 @@ in {
cypari2 = callPackage ../development/python-modules/cypari2 { }; cypari2 = callPackage ../development/python-modules/cypari2 { };
dlib = buildPythonPackage rec { dlib = callPackage ../development/python-modules/dlib {
inherit (pkgs.dlib) name src nativeBuildInputs meta buildInputs; inherit (pkgs) dlib;
patches = [ ../development/python-modules/dlib/build-cores.patch ];
checkInputs = with self; [ pytest ];
}; };
datadog = callPackage ../development/python-modules/datadog {}; datadog = callPackage ../development/python-modules/datadog {};