From f9bbe9049f4bec2a8ea2f27ef6c3e2cf97cacc3a Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Tue, 7 Oct 2025 10:33:15 +0000 Subject: [PATCH] ctranslate2: move to by-name --- .../default.nix => by-name/ct/ctranslate2/package.nix} | 5 +++-- pkgs/top-level/all-packages.nix | 6 ------ 2 files changed, 3 insertions(+), 8 deletions(-) rename pkgs/{development/libraries/ctranslate2/default.nix => by-name/ct/ctranslate2/package.nix} (96%) diff --git a/pkgs/development/libraries/ctranslate2/default.nix b/pkgs/by-name/ct/ctranslate2/package.nix similarity index 96% rename from pkgs/development/libraries/ctranslate2/default.nix rename to pkgs/by-name/ct/ctranslate2/package.nix index 8524bb3e16ce..8484d66f3757 100644 --- a/pkgs/development/libraries/ctranslate2/default.nix +++ b/pkgs/by-name/ct/ctranslate2/package.nix @@ -1,13 +1,14 @@ { lib, stdenv, + config, fetchFromGitHub, cmake, llvmPackages, # openmp withMkl ? false, mkl, - withCUDA ? false, - withCuDNN ? false, + withCUDA ? config.cudaSupport, + withCuDNN ? withCUDA && (cudaPackages ? cudnn), cudaPackages, # Enabling both withOneDNN and withOpenblas is broken # https://github.com/OpenNMT/CTranslate2/issues/1294 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e781d2021c05..d0559c581cee 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7140,12 +7140,6 @@ with pkgs; inherit (cosmopolitan) cosmocc; - ctranslate2 = callPackage ../development/libraries/ctranslate2 rec { - withCUDA = pkgs.config.cudaSupport; - withCuDNN = withCUDA && (cudaPackages ? cudnn); - cudaPackages = pkgs.cudaPackages; - }; - ustream-ssl = callPackage ../development/libraries/ustream-ssl { ssl_implementation = openssl; }; ustream-ssl-wolfssl = callPackage ../development/libraries/ustream-ssl {