nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-12-01 03:12:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

python3*.pkgs.dlib: remove patches that are included in the latest release

Browse Source
This commit is contained in:
Maximilian Bosch 2023-05-24 09:36:03 +02:00
parent 3dc228ff81
commit c93171d2f4
No known key found for this signature in database
GPG Key ID: 9A6EEA275CA5BE0A
1 changed files with 1 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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 , sse4Support ? stdenv.hostPlatform.sse4_1Support
, avxSupport ? stdenv.hostPlatform.avxSupport , avxSupport ? stdenv.hostPlatform.avxSupport
}: }:
@ -8,25 +8,6 @@ buildPythonPackage {
patches = [ patches = [
./build-cores.patch ./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 ]; nativeCheckInputs = [ pytest more-itertools ];