Skip to content

Commit c0ece0d

Browse files
SomeoneSergehodlen
authored andcommitted
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)
1 parent 373054f commit c0ece0d

File tree

1 file changed

+3
-5
lines changed

1 file changed

+3
-5
lines changed

.devops/nix/package.nix

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -73,6 +73,9 @@ let
7373
# It'd be nice to migrate to buildPythonPackage, as well as ensure this repo
7474
# is PEP 517-compatible, and ensure the correct .dist-info is generated.
7575
# https://peps.python.org/pep-0517/
76+
#
77+
# TODO: Package up each Python script or service appropriately, by making
78+
# them into "entrypoints"
7679
llama-python = python3.withPackages (
7780
ps: [
7881
ps.numpy
@@ -161,11 +164,6 @@ effectiveStdenv.mkDerivation (
161164
--replace '[bundle pathForResource:@"ggml-metal" ofType:@"metal"];' "@\"$out/bin/ggml-metal.metal\";"
162165
substituteInPlace ./ggml-metal.m \
163166
--replace '[bundle pathForResource:@"default" ofType:@"metallib"];' "@\"$out/bin/default.metallib\";"
164-
165-
# TODO: Package up each Python script or service appropriately.
166-
# If we were to migrate to buildPythonPackage and prepare the `pyproject.toml`,
167-
# we could make those *.py into setuptools' entrypoints
168-
substituteInPlace ./*.py --replace "/usr/bin/env python" "${llama-python}/bin/python"
169167
'';
170168

171169
# With PR#6015 https://github.com/ggerganov/llama.cpp/pull/6015,

0 commit comments

Comments
 (0)