From c93171d2f4e024313c907f1cd8ccb29b448e2211 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Wed, 24 May 2023 09:36:03 +0200 Subject: [PATCH] python3*.pkgs.dlib: remove patches that are included in the latest release --- .../python-modules/dlib/default.nix | 21 +------------------ 1 file changed, 1 insertion(+), 20 deletions(-) diff --git a/pkgs/development/python-modules/dlib/default.nix b/pkgs/development/python-modules/dlib/default.nix index cadb85f0405e..0a52d78c824f 100644 --- a/pkgs/development/python-modules/dlib/default.nix +++ b/pkgs/development/python-modules/dlib/default.nix @@ -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 ];