Unverified Commit 7ce91059 authored by Maximilian Bosch's avatar Maximilian Bosch Committed by GitHub
Browse files

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

dlib: 19.24 -> 19.24.2
parents c1d02f5d c93171d2

pkgs/development/libraries/dlib/default.nix

+2 −2
Original line number Diff line number Diff line
@@ -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 = ''

pkgs/development/python-modules/dlib/default.nix

+1 −20
Original line number Diff line number Diff line 
{ 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 ];