pyrox.dev / nixpkgs
lol
fork atom

Merge pull request #233270 from r-ryantm/auto-update/dlib

dlib: 19.24 -> 19.24.2

authored by Maximilian Bosch and committed by GitHub 7ce91059 c1d02f5d

+3 -22
unified split
+2 -2
pkgs/development/libraries/dlib/default.nix
··· 9 10 stdenv.mkDerivation rec { 11 pname = "dlib"; 12 - version = "19.24"; 13 14 src = fetchFromGitHub { 15 owner = "davisking"; 16 repo = "dlib"; 17 rev ="v${version}"; 18 - sha256 = "sha256-YhIjP9TIIyQF6lBj85gyVRIAAwgIodzh0ViQL8v2ACA="; 19 }; 20 21 postPatch = ''
··· 9 10 stdenv.mkDerivation rec { 11 pname = "dlib"; 12 + version = "19.24.2"; 13 14 src = fetchFromGitHub { 15 owner = "davisking"; 16 repo = "dlib"; 17 rev ="v${version}"; 18 + sha256 = "sha256-Z1fScuaIHjj2L1uqLIvsZ7ARKNjM+iaA8SAtWUTPFZk="; 19 }; 20 21 postPatch = ''
+1 -20
pkgs/development/python-modules/dlib/default.nix
··· 1 - { stdenv, buildPythonPackage, dlib, python, pytest, more-itertools, fetchpatch 2 , sse4Support ? stdenv.hostPlatform.sse4_1Support 3 , avxSupport ? stdenv.hostPlatform.avxSupport 4 }: ··· 8 9 patches = [ 10 ./build-cores.patch 11 - 12 - # Upgrade minimum CMake & C++ requirement. Nixpkgs is sufficiently up-to-date 13 - # so that is not a problem. Applied to make sure the pybind11 patch applies cleanly. 14 - (fetchpatch { 15 - url = "https://github.com/davisking/dlib/commit/29288e5d895b21f5508c15294f1303b367534a63.patch"; 16 - sha256 = "sha256-8GsGOehTFabRf+QOZK6Ek/Xgwp8yLj8UKd7kmneBpXk="; 17 - }) 18 - # Removes a bunch of broken python tests. Also useful to make sure the pybind11 19 - # patch applies cleanly. 20 - (fetchpatch { 21 - url = "https://github.com/davisking/dlib/commit/a517aaa0bbb0524a1a7be3d6637aa6300c2e1dfe.patch"; 22 - sha256 = "sha256-31/c1ViVPdJ/gQVMV22Nnr01/Yg13s9tPowfh4BedNg="; 23 - }) 24 - # Upgrade pybind11 to 2.4.0. Relevant to fix Python 3.11 support. 25 - (fetchpatch { 26 - url = "https://github.com/davisking/dlib/commit/65bce59a1512cf222dec01d3e0f29b612dd181f5.patch"; 27 - sha256 = "sha256-04TGJdn9p9YhDVZHAU9ncgCyR1vrnRxKkTRDSwOk/fw="; 28 - excludes = [ ".github/workflows/build_python.yml" ]; 29 - }) 30 ]; 31 32 nativeCheckInputs = [ pytest more-itertools ];
··· 1 + { stdenv, buildPythonPackage, dlib, python, pytest, more-itertools 2 , sse4Support ? stdenv.hostPlatform.sse4_1Support 3 , avxSupport ? stdenv.hostPlatform.avxSupport 4 }: ··· 8 9 patches = [ 10 ./build-cores.patch 11 ]; 12 13 nativeCheckInputs = [ pytest more-itertools ];