From 0fb4ae72c5754761fd7666e4274f4beef0484c32 Mon Sep 17 00:00:00 2001 From: Ben Sima Date: Thu, 2 Jan 2025 16:20:21 -0500 Subject: Switch to alejandra for nix formatting I mostly wanted a formatter that would format `inherit` blocks vertically, because otherwise they are super hard to read when diffing or even just editing. Both alejandra and the new nixos/nixfmt format verically like this, but alejandra has slightly better format (I guess) and for some reason nixfmt did not respect my `GLOBIGNORE` setting when doing `nixfmt **/*.nix` so it was trying to format stuff in `_/nix`, and failed. So anyway I went with alejandra. - https://github.com/kamadorueda/alejandra - https://discourse.nixos.org/t/enforcing-nix-formatting-in-nixpkgs/49506 --- Omni/Bild/Deps/llm-ollama.nix | 27 +++++++++++++++++---------- 1 file changed, 17 insertions(+), 10 deletions(-) (limited to 'Omni/Bild/Deps/llm-ollama.nix') diff --git a/Omni/Bild/Deps/llm-ollama.nix b/Omni/Bild/Deps/llm-ollama.nix index e2b6a66..15b26cc 100644 --- a/Omni/Bild/Deps/llm-ollama.nix +++ b/Omni/Bild/Deps/llm-ollama.nix @@ -1,5 +1,13 @@ -{ buildPythonPackage, fetchFromGitHub, lib, llm, ollama, pytestCheckHook -, setuptools, pythonOlder, }: +{ + buildPythonPackage, + fetchFromGitHub, + lib, + llm, + ollama, + pytestCheckHook, + setuptools, + pythonOlder, +}: buildPythonPackage rec { pname = "llm-ollama"; version = "0.3.0"; @@ -14,27 +22,26 @@ buildPythonPackage rec { hash = "sha256-Ar0Ux8BNGY0i764CEk7+48J6jnndlRIIMPZ9tFpXiy4="; }; - nativeBuildInputs = [ setuptools ]; + nativeBuildInputs = [setuptools]; - buildInputs = [ llm ollama ]; + buildInputs = [llm ollama]; - propagatedBuildInputs = [ ollama ]; + propagatedBuildInputs = [ollama]; disabledTests = [ # wants to mkdir in the /homeless-shelter "test_registered_models" ]; - nativeCheckInputs = [ pytestCheckHook ]; + nativeCheckInputs = [pytestCheckHook]; - pythonImportsCheck = [ "llm_ollama" ]; + pythonImportsCheck = ["llm_ollama"]; meta = with lib; { homepage = "https://github.com/taketwo/llm-ollama"; - description = - "LLM plugin providing access to local Ollama models usting HTTP API"; + description = "LLM plugin providing access to local Ollama models usting HTTP API"; changelog = "https://github.com/taketwo/llm-ollama/releases/tag/${version}"; license = licenses.asl20; - maintainers = with maintainers; [ bsima ]; + maintainers = with maintainers; [bsima]; }; } -- cgit v1.2.3