diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2024-04-17 12:01:02 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-04-17 12:01:02 +0000 |
| commit | bd26da84da2bae7c0d370152273602223b828e23 (patch) | |
| tree | 73e2da7f16689b3051ae3ecba45ee4c1cc4daf6a /pkgs/tools/misc | |
| parent | 73f2b40dfc3413958695ae66fca3a52ee68451d6 (diff) | |
| parent | d84b5d7735fe905a4c89548fabeb71a7abb2d548 (diff) | |
Merge master into staging-next
Diffstat (limited to 'pkgs/tools/misc')
| -rw-r--r-- | pkgs/tools/misc/esphome/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/tools/misc/ollama/default.nix | 6 |
2 files changed, 4 insertions, 6 deletions
diff --git a/pkgs/tools/misc/esphome/default.nix b/pkgs/tools/misc/esphome/default.nix index 80c5de0d5c946..972ac63e83dce 100644 --- a/pkgs/tools/misc/esphome/default.nix +++ b/pkgs/tools/misc/esphome/default.nix @@ -19,14 +19,14 @@ let in python.pkgs.buildPythonApplication rec { pname = "esphome"; - version = "2024.3.1"; + version = "2024.3.2"; pyproject = true; src = fetchFromGitHub { owner = pname; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-lWDQp3I8AJT5iTT8wMj/ZL6ykw2NNeLXdq1obnMP7Ao="; + hash = "sha256-WeTajznndw01jXIEnOiSEy9psLuMeAC6j7UmHg0+Fys="; }; nativeBuildInputs = with python.pkgs; [ diff --git a/pkgs/tools/misc/ollama/default.nix b/pkgs/tools/misc/ollama/default.nix index a377d200fbb8e..fdda6ba3f1e8c 100644 --- a/pkgs/tools/misc/ollama/default.nix +++ b/pkgs/tools/misc/ollama/default.nix @@ -100,10 +100,6 @@ let cudaPackages.cuda_cudart cudaPackages.cuda_cudart.static ]; - postBuild = '' - rm "$out/lib64" - ln -s "lib" "$out/lib64" - ''; }; runtimeLibs = lib.optionals enableRocm [ @@ -140,6 +136,8 @@ goBuild ((lib.optionalAttrs enableRocm { nativeBuildInputs = [ cmake + ] ++ lib.optionals enableRocm [ + rocmPackages.llvm.bintools ] ++ lib.optionals (enableRocm || enableCuda) [ makeWrapper ] ++ lib.optionals stdenv.isDarwin |