diff --git a/pkgs/by-name/ca/catboost/package.nix b/pkgs/by-name/ca/catboost/package.nix index f8dc6d272ed5..dae453510a5c 100644 --- a/pkgs/by-name/ca/catboost/package.nix +++ b/pkgs/by-name/ca/catboost/package.nix @@ -15,7 +15,6 @@ gitUpdater, cudaSupport ? config.cudaSupport, cudaPackages ? { }, - llvmPackagesCuda ? llvmPackages, pythonSupport ? false, }: let @@ -91,7 +90,7 @@ stdenv.mkDerivation (finalAttrs: { # catboost requires clang 14+ for build, but does clang 12 for cuda build. # after bumping the default version of llvm, check for compatibility with the cuda backend and pin it. # see https://catboost.ai/en/docs/installation/build-environment-setup-for-cmake#compilers,-linkers-and-related-tools - CUDAHOSTCXX = lib.optionalString cudaSupport "${llvmPackagesCuda.stdenv.cc}/bin/cc"; + CUDAHOSTCXX = lib.optionalString cudaSupport "${stdenv.cc}/bin/cc"; NIX_CFLAGS_LINK = lib.optionalString stdenv.hostPlatform.isLinux "-fuse-ld=lld"; NIX_LDFLAGS = "-lc -lm"; NIX_CFLAGS_COMPILE = toString ( @@ -139,7 +138,10 @@ stdenv.mkDerivation (finalAttrs: { natsukium ]; mainProgram = "catboost"; - # /nix/store/hzxiynjmmj35fpy3jla7vcqwmzj9i449-Libsystem-1238.60.2/include/sys/_types/_mbstate_t.h:31:9: error: unknown type name '__darwin_mbstate_t' - broken = stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64; + broken = + # See: + cudaSupport + # /nix/store/hzxiynjmmj35fpy3jla7vcqwmzj9i449-Libsystem-1238.60.2/include/sys/_types/_mbstate_t.h:31:9: error: unknown type name '__darwin_mbstate_t' + || (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64); }; }) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d14840a5369a..16cc47ed1aa2 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7594,12 +7594,6 @@ with pkgs; ormolu = lib.getBin (haskell.lib.compose.justStaticExecutables haskellPackages.ormolu); - catboost = callPackage ../by-name/ca/catboost/package.nix { - # https://github.com/catboost/catboost/issues/2540 - cudaPackages = cudaPackages_11; - llvmPackagesCuda = llvmPackages_14; - }; - cctag = callPackage ../development/libraries/cctag { stdenv = clangStdenv; tbb = tbb_2021;