ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-09-22 04:57:56 +03:00
Code Issues Projects Releases Wiki Activity

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

Browse Source 
dlib: 19.24 -> 19.24.2
This commit is contained in:
Maximilian Bosch 2023-05-24 11:04:10 +02:00 committed by GitHub
commit 7ce91059c1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -9,13 +9,13 @@
stdenv.mkDerivation rec {
pname = "dlib";
version = "19.24";
version = "19.24.2";
src = fetchFromGitHub {
owner = "davisking";
repo = "dlib";
rev ="v${version}";
sha256 = "sha256-YhIjP9TIIyQF6lBj85gyVRIAAwgIodzh0ViQL8v2ACA=";
sha256 = "sha256-Z1fScuaIHjj2L1uqLIvsZ7ARKNjM+iaA8SAtWUTPFZk=";
};
postPatch = ''

21
pkgs/development/python-modules/dlib/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, buildPythonPackage, dlib, python, pytest, more-itertools, fetchpatch
{ stdenv, buildPythonPackage, dlib, python, pytest, more-itertools
, sse4Support ? stdenv.hostPlatform.sse4_1Support
, avxSupport ? stdenv.hostPlatform.avxSupport
}:
@ -8,25 +8,6 @@ buildPythonPackage {
patches = [
./build-cores.patch
# Upgrade minimum CMake & C++ requirement. Nixpkgs is sufficiently up-to-date
# so that is not a problem. Applied to make sure the pybind11 patch applies cleanly.
(fetchpatch {
url = "https://github.com/davisking/dlib/commit/29288e5d895b21f5508c15294f1303b367534a63.patch";
sha256 = "sha256-8GsGOehTFabRf+QOZK6Ek/Xgwp8yLj8UKd7kmneBpXk=";
})
# Removes a bunch of broken python tests. Also useful to make sure the pybind11
# patch applies cleanly.
(fetchpatch {
url = "https://github.com/davisking/dlib/commit/a517aaa0bbb0524a1a7be3d6637aa6300c2e1dfe.patch";
sha256 = "sha256-31/c1ViVPdJ/gQVMV22Nnr01/Yg13s9tPowfh4BedNg=";
})
# Upgrade pybind11 to 2.4.0. Relevant to fix Python 3.11 support.
(fetchpatch {
url = "https://github.com/davisking/dlib/commit/65bce59a1512cf222dec01d3e0f29b612dd181f5.patch";
sha256 = "sha256-04TGJdn9p9YhDVZHAU9ncgCyR1vrnRxKkTRDSwOk/fw=";
excludes = [ ".github/workflows/build_python.yml" ];
})
];
nativeCheckInputs = [ pytest more-itertools ];