catboost: 1.2.5 -> 1.2.7

Diff: https://github.com/catboost/catboost/compare/v1.2.5...v1.2.7

Changelog: https://github.com/catboost/catboost/releases/tag/v1.2.7

authored by Gaetan Lepage and committed by Gaétan Lepage 8ff97cbe 5d2c1a96

+17 -9
+5 -2
pkgs/by-name/ca/catboost/package.nix
··· 23 24 stdenv.mkDerivation (finalAttrs: { 25 pname = "catboost"; 26 - version = "1.2.5"; 27 28 src = fetchFromGitHub { 29 owner = "catboost"; 30 repo = "catboost"; 31 rev = "refs/tags/v${finalAttrs.version}"; 32 - hash = "sha256-2dfCCCa0LheytkLRbYuBd25M320f1kbhBWKIVjslor0="; 33 }; 34 35 patches = [ ··· 93 ); 94 95 env = { 96 # catboost requires clang 14+ for build, but does clang 12 for cuda build. 97 # after bumping the default version of llvm, check for compatibility with the cuda backend and pin it. 98 # see https://catboost.ai/en/docs/installation/build-environment-setup-for-cmake#compilers,-linkers-and-related-tools ··· 128 library, used for ranking, classification, regression and other machine 129 learning tasks for Python, R, Java, C++. Supports computation on CPU and GPU. 130 ''; 131 license = licenses.asl20; 132 platforms = platforms.unix; 133 homepage = "https://catboost.ai";
··· 23 24 stdenv.mkDerivation (finalAttrs: { 25 pname = "catboost"; 26 + version = "1.2.7"; 27 28 src = fetchFromGitHub { 29 owner = "catboost"; 30 repo = "catboost"; 31 rev = "refs/tags/v${finalAttrs.version}"; 32 + hash = "sha256-I3geFdVQ1Pm61eRXi+ueaxel3QRb8EJV9f4zV2Q7kk4="; 33 }; 34 35 patches = [ ··· 93 ); 94 95 env = { 96 + PROGRAM_VERSION = finalAttrs.version; 97 + 98 # catboost requires clang 14+ for build, but does clang 12 for cuda build. 99 # after bumping the default version of llvm, check for compatibility with the cuda backend and pin it. 100 # see https://catboost.ai/en/docs/installation/build-environment-setup-for-cmake#compilers,-linkers-and-related-tools ··· 130 library, used for ranking, classification, regression and other machine 131 learning tasks for Python, R, Java, C++. Supports computation on CPU and GPU. 132 ''; 133 + changelog = "https://github.com/catboost/catboost/releases/tag/v${finalAttrs.version}"; 134 license = licenses.asl20; 135 platforms = platforms.unix; 136 homepage = "https://catboost.ai";
+12 -7
pkgs/by-name/ca/catboost/remove-conan.patch
··· 1 diff --git a/CMakeLists.txt b/CMakeLists.txt 2 - index ed6c53b220..5c6fb8f157 100644 3 --- a/CMakeLists.txt 4 +++ b/CMakeLists.txt 5 - @@ -29,7 +29,6 @@ include(cmake/global_flags.cmake) 6 include(cmake/global_vars.cmake) 7 include(cmake/archive.cmake) 8 include(cmake/common.cmake) 9 - -include(cmake/conan.cmake) 10 include(cmake/cuda.cmake) 11 include(cmake/cython.cmake) 12 include(cmake/fbs.cmake) 13 - @@ -38,21 +37,6 @@ include(cmake/recursive_library.cmake) 14 include(cmake/shared_libs.cmake) 15 include(cmake/swig.cmake) 16 ··· 24 - BUILD missing 25 - REMOTE conancenter 26 - SETTINGS ${settings} 27 - - ENV "CONAN_CMAKE_GENERATOR=${CMAKE_GENERATOR}" 28 - - CONF "tools.cmake.cmaketoolchain:generator=${CMAKE_GENERATOR}" 29 - ) 30 -endif() 31 - 32 if (CMAKE_SYSTEM_NAME STREQUAL "Linux" AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND NOT HAVE_CUDA) 33 include(CMakeLists.linux-x86_64.txt) 34 - elseif (CMAKE_SYSTEM_NAME STREQUAL "Linux" AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND HAVE_CUDA)
··· 1 diff --git a/CMakeLists.txt b/CMakeLists.txt 2 + index 24ffd1225a..700adcc246 100644 3 --- a/CMakeLists.txt 4 +++ b/CMakeLists.txt 5 + @@ -39,7 +39,6 @@ include(cmake/global_flags.cmake) 6 include(cmake/global_vars.cmake) 7 include(cmake/archive.cmake) 8 include(cmake/common.cmake) 9 + -include(cmake/conan1_deprecated.cmake) 10 include(cmake/cuda.cmake) 11 include(cmake/cython.cmake) 12 include(cmake/fbs.cmake) 13 + @@ -48,21 +47,6 @@ include(cmake/recursive_library.cmake) 14 include(cmake/shared_libs.cmake) 15 include(cmake/swig.cmake) 16 ··· 24 - BUILD missing 25 - REMOTE conancenter 26 - SETTINGS ${settings} 27 + - ENV "CONAN_CMAKE_GENERATOR=${CMAKE_GENERATOR}" 28 + - CONF "tools.cmake.cmaketoolchain:generator=${CMAKE_GENERATOR}" 29 - ) 30 -endif() 31 - 32 + 33 if (CMAKE_SYSTEM_NAME STREQUAL "Linux" AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND NOT HAVE_CUDA) 34 include(CMakeLists.linux-x86_64.txt) 35 + @@ -93,4 +77,3 @@ elseif (ANDROID AND CMAKE_ANDROID_ARCH STREQUAL "x86") 36 + elseif (ANDROID AND CMAKE_ANDROID_ARCH STREQUAL "x86_64") 37 + include(CMakeLists.android-x86_64.txt) 38 + endif() 39 + -