diff options
| author | Someone Serge <sergei.kozlukov@aalto.fi> | 2024-03-26 16:22:07 +0000 |
|---|---|---|
| committer | Someone <newkozlukov@gmail.com> | 2024-03-28 07:48:27 +0000 |
| commit | 22a462cc1f69873f7d4c6d0201bd93478afa2ecb (patch) | |
| tree | 7dfba9f4cfb54b20f9e06793c777d9fc19c7e89a | |
| parent | f6a0f5c6422200764b7929064c39dcf4bb0e9cd6 (diff) | |
nix: package: don't introduce the dependency on python
- The generic /usr/bin/env shebangs are good enough
- Python deps are provisioned in the devShells
- We need to be able to leave python out at least on windows (currently breaks eval)
| -rw-r--r-- | .devops/nix/package.nix | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/.devops/nix/package.nix b/.devops/nix/package.nix index 83858c82..490ad0cc 100644 --- a/.devops/nix/package.nix +++ b/.devops/nix/package.nix @@ -73,6 +73,9 @@ let # It'd be nice to migrate to buildPythonPackage, as well as ensure this repo # is PEP 517-compatible, and ensure the correct .dist-info is generated. # https://peps.python.org/pep-0517/ + # + # TODO: Package up each Python script or service appropriately, by making + # them into "entrypoints" llama-python = python3.withPackages ( ps: [ ps.numpy @@ -161,11 +164,6 @@ effectiveStdenv.mkDerivation ( --replace '[bundle pathForResource:@"ggml-metal" ofType:@"metal"];' "@\"$out/bin/ggml-metal.metal\";" substituteInPlace ./ggml-metal.m \ --replace '[bundle pathForResource:@"default" ofType:@"metallib"];' "@\"$out/bin/default.metallib\";" - - # TODO: Package up each Python script or service appropriately. - # If we were to migrate to buildPythonPackage and prepare the `pyproject.toml`, - # we could make those *.py into setuptools' entrypoints - substituteInPlace ./*.py --replace "/usr/bin/env python" "${llama-python}/bin/python" ''; # With PR#6015 https://github.com/ggerganov/llama.cpp/pull/6015, |