From b061eaf41b873f3a6bceab6ae3bbe24f854b0df1 Mon Sep 17 00:00:00 2001 From: Dawid Dziurla Date: Sat, 25 May 2024 13:42:30 +0200 Subject: [PATCH 1/2] gpt4all: 2.7.5 -> 2.8.0 --- pkgs/by-name/gp/gpt4all/package.nix | 22 +++++++++++++++++++--- 1 file changed, 19 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/gp/gpt4all/package.nix b/pkgs/by-name/gp/gpt4all/package.nix index 40fe6a88322f6..c583710d315ff 100644 --- a/pkgs/by-name/gp/gpt4all/package.nix +++ b/pkgs/by-name/gp/gpt4all/package.nix @@ -1,4 +1,5 @@ { lib +, config , stdenv , fetchFromGitHub , cmake @@ -7,15 +8,17 @@ , shaderc , vulkan-headers , wayland +, cudaSupport ? config.cudaSupport +, cudaPackages ? { } }: stdenv.mkDerivation (finalAttrs: { pname = "gpt4all"; - version = "2.7.5"; + version = "2.8.0"; src = fetchFromGitHub { fetchSubmodules = true; - hash = "sha256-i/T6gk8ICneW624008eiStgYNv5CE8w0Yx8knk57EFw="; + hash = "sha256-aSz37+1K26Xizf4cpV45a2DnSsl959VQok/ppFRk/hs="; owner = "nomic-ai"; repo = "gpt4all"; rev = "v${finalAttrs.version}"; @@ -26,6 +29,8 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ cmake qt6.wrapQtAppsHook + ] ++ lib.optionals cudaSupport [ + cudaPackages.cuda_nvcc ]; buildInputs = [ @@ -39,12 +44,23 @@ stdenv.mkDerivation (finalAttrs: { shaderc vulkan-headers wayland - ]; + ] ++ lib.optionals cudaSupport ( + with cudaPackages; + [ + cuda_cccl.dev + cuda_cudart.dev + cuda_cudart.lib + cuda_cudart.static + libcublas.dev + libcublas.lib + ]); cmakeFlags = [ "-DKOMPUTE_OPT_USE_BUILT_IN_VULKAN_HEADER=OFF" "-DKOMPUTE_OPT_DISABLE_VULKAN_VERSION_CHECK=ON" "-DKOMPUTE_OPT_USE_BUILT_IN_FMT=OFF" + ] ++ lib.optionals (!cudaSupport) [ + "-DLLMODEL_CUDA=OFF" ]; postInstall = '' From 4705acc599ae7d0bc6bb7c13504c1d149c3db7b0 Mon Sep 17 00:00:00 2001 From: Dawid Dziurla Date: Sat, 25 May 2024 13:42:52 +0200 Subject: [PATCH 2/2] all-packages: add gpt4all-cuda --- pkgs/top-level/all-packages.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e23cbe0da825f..d2c8bf4d2f06f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8556,6 +8556,10 @@ with pkgs; gparted = callPackage ../tools/misc/gparted { }; + gpt4all-cuda = gpt4all.override { + cudaSupport = true; + }; + gpt2tc = callPackage ../tools/text/gpt2tc { }; gptcommit = callPackage ../development/tools/gptcommit {