diff options
| author | Peder Bergebakken Sundt <pbsds@hotmail.com> | 2024-06-12 11:41:03 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-06-12 11:41:03 +0200 |
| commit | eae24e47231c06306e6e9c3a98013e9e18e18404 (patch) | |
| tree | 927a45f818da50f1105ae4dc35163c1f21642a71 | |
| parent | 24c5f20298ec3dd8aced9af9e9e6c69e7505dedd (diff) | |
| parent | 3a8211a3aeef52ac68b480cf1905fe851f029602 (diff) | |
Merge pull request #316269 from g00pix/bump-dlib
dlib: 19.24.2 -> 19.24.4
| -rw-r--r-- | pkgs/development/libraries/dlib/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/development/python-modules/dlib/build-cores.patch | 8 |
2 files changed, 7 insertions, 5 deletions
diff --git a/pkgs/development/libraries/dlib/default.nix b/pkgs/development/libraries/dlib/default.nix index ca40fbb3c68db..9a9b774ad265e 100644 --- a/pkgs/development/libraries/dlib/default.nix +++ b/pkgs/development/libraries/dlib/default.nix @@ -18,13 +18,13 @@ }@inputs: (if cudaSupport then cudaPackages.backendStdenv else inputs.stdenv).mkDerivation rec { pname = "dlib"; - version = "19.24.2"; + version = "19.24.4"; src = fetchFromGitHub { owner = "davisking"; repo = "dlib"; rev = "v${version}"; - sha256 = "sha256-Z1fScuaIHjj2L1uqLIvsZ7ARKNjM+iaA8SAtWUTPFZk="; + sha256 = "sha256-1A/9u+ThtUtmmSwnFSn8S65Yavucl2X+o3bNYgew0Oc="; }; postPatch = '' diff --git a/pkgs/development/python-modules/dlib/build-cores.patch b/pkgs/development/python-modules/dlib/build-cores.patch index eebc69a330fa0..072519975c433 100644 --- a/pkgs/development/python-modules/dlib/build-cores.patch +++ b/pkgs/development/python-modules/dlib/build-cores.patch @@ -1,15 +1,17 @@ diff --git a/setup.py b/setup.py -index 0c8d8f16..565ef8ef 100644 +index 219583b..3ca5f88 100644 --- a/setup.py +++ b/setup.py -@@ -172,21 +172,7 @@ class CMakeBuild(build_ext): +@@ -170,23 +170,7 @@ class CMakeBuild(build_ext): subprocess.check_call(cmake_build, cwd=build_folder) def num_available_cpu_cores(ram_per_build_process_in_gb): - if 'TRAVIS' in os.environ and os.environ['TRAVIS']=='true': - # When building on travis-ci, just use 2 cores since travis-ci limits - # you to that regardless of what the hardware might suggest. -- return 2 +- return 2 +- elif 'CMAKE_BUILD_PARALLEL_LEVEL' in os.environ and os.environ['CMAKE_BUILD_PARALLEL_LEVEL'].isnumeric(): +- return int(os.environ['CMAKE_BUILD_PARALLEL_LEVEL']) - try: - mem_bytes = os.sysconf('SC_PAGE_SIZE') * os.sysconf('SC_PHYS_PAGES') - mem_gib = mem_bytes/(1024.**3) |