From c41603ab1b4e3e6c4314be22080355234d6aa0f6 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" <ryantm-bot@ryantm.com> Date: Wed, 24 Oct 2018 11:32:46 -0700 Subject: [PATCH 1/3] python36Packages.dlib: 19.13 -> 19.16 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/python3.6-dlib/versions --- pkgs/development/libraries/dlib/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 = '' From ac499a345ae698d07bf240ca13bb37b4b4501c4d Mon Sep 17 00:00:00 2001 From: Maximilian Bosch <maximilian@mbosch.me> Date: Mon, 29 Oct 2018 18:18:39 +0100 Subject: [PATCH 2/3] pythonPackages.dlib: disable AVX instructions during checkPhase --- pkgs/top-level/python-packages.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 6c495cdabdee..164e7504e8bf 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -964,6 +964,10 @@ in { dlib = buildPythonPackage rec { inherit (pkgs.dlib) name src nativeBuildInputs meta buildInputs; + checkPhase = '' + ${python.interpreter} nix_run_setup test --no USE_AVX_INSTRUCTIONS + ''; + patches = [ ../development/python-modules/dlib/build-cores.patch ]; checkInputs = with self; [ pytest ]; From b7bc6e7f6ca33775643553fe046e804425c8ce5d Mon Sep 17 00:00:00 2001 From: Maximilian Bosch <maximilian@mbosch.me> Date: Mon, 29 Oct 2018 18:57:19 +0100 Subject: [PATCH 3/3] pythonPackages.dlib: move expression Initially the expression was quite small (just inherited properties from `pkgs.dlib`), but the more it grows the better it is to store it into its own file. --- pkgs/development/python-modules/dlib/default.nix | 13 +++++++++++++ pkgs/top-level/python-packages.nix | 12 ++---------- 2 files changed, 15 insertions(+), 10 deletions(-) create mode 100644 pkgs/development/python-modules/dlib/default.nix 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 164e7504e8bf..5e3a3cc21ef9 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -961,16 +961,8 @@ in { cypari2 = callPackage ../development/python-modules/cypari2 { }; - dlib = buildPythonPackage rec { - inherit (pkgs.dlib) name src nativeBuildInputs meta buildInputs; - - checkPhase = '' - ${python.interpreter} nix_run_setup test --no USE_AVX_INSTRUCTIONS - ''; - - 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 {};