From 23d8f65ac008671580caf4e05872836fa704d814 Mon Sep 17 00:00:00 2001 From: Someone Serge Date: Wed, 28 Aug 2024 11:29:28 +0000 Subject: [PATCH 1/2] nix: fix regression: asking for deprecated autoAddOpenGLRunpath --- .devops/nix/package.nix | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/.devops/nix/package.nix b/.devops/nix/package.nix index a87423c713079..cc3bbc30342d4 100644 --- a/.devops/nix/package.nix +++ b/.devops/nix/package.nix @@ -1,5 +1,6 @@ { lib, + autoAddDriverRunpath, glibc, config, stdenv, @@ -192,10 +193,7 @@ effectiveStdenv.mkDerivation ( ] ++ optionals useCuda [ cudaPackages.cuda_nvcc - - # TODO: Replace with autoAddDriverRunpath - # once https://github.com/NixOS/nixpkgs/pull/275241 has been merged - cudaPackages.autoAddOpenGLRunpathHook + autoAddDriverRunpath ] ++ optionals (effectiveStdenv.hostPlatform.isGnu && enableStatic) [ glibc.static From 48507397d0d7277407ddd39e914c583f69bdf048 Mon Sep 17 00:00:00 2001 From: Someone Serge Date: Wed, 28 Aug 2024 11:36:32 +0000 Subject: [PATCH 2/2] nix: fix: mpi-cuda should include cuda support... --- flake.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/flake.nix b/flake.nix index c69637d111784..a5617d37a19e8 100644 --- a/flake.nix +++ b/flake.nix @@ -162,7 +162,7 @@ cuda = config.legacyPackages.llamaPackagesCuda.llama-cpp; mpi-cpu = config.packages.default.override { useMpi = true; }; - mpi-cuda = config.packages.default.override { useMpi = true; }; + mpi-cuda = config.packages.cuda.override { useMpi = true; }; } // lib.optionalAttrs (system == "x86_64-linux") { rocm = config.legacyPackages.llamaPackagesRocm.llama-cpp;