nix: fix nix develop .#python-scripts (#19218)
Without this I get:
> * Getting build dependencies for wheel...
> * Building wheel...
> Successfully built gguf-0.17.1-py3-none-any.whl
> Finished creating a wheel...
> Finished executing pypaBuildPhase
> Running phase: pythonRuntimeDepsCheckHook
> Executing pythonRuntimeDepsCheck
> Checking runtime dependencies for gguf-0.17.1-py3-none-any.whl
> - requests not installed
For full logs, run:
nix log /nix/store/x0c4a251l68bvdgang9d8v2fsmqay8a4-python3.12-gguf-0.0.0.drv
I changed a bit the style to make it more terse ~> more elegant in my
opinion.
This commit is contained in:
parent
89f10baad5
commit
41ea26144e
|
|
@ -3,6 +3,7 @@
|
||||||
llamaVersion,
|
llamaVersion,
|
||||||
numpy,
|
numpy,
|
||||||
tqdm,
|
tqdm,
|
||||||
|
requests,
|
||||||
sentencepiece,
|
sentencepiece,
|
||||||
pyyaml,
|
pyyaml,
|
||||||
poetry-core,
|
poetry-core,
|
||||||
|
|
@ -20,6 +21,7 @@ buildPythonPackage {
|
||||||
tqdm
|
tqdm
|
||||||
sentencepiece
|
sentencepiece
|
||||||
pyyaml
|
pyyaml
|
||||||
|
requests
|
||||||
];
|
];
|
||||||
src = lib.cleanSource ../../gguf-py;
|
src = lib.cleanSource ../../gguf-py;
|
||||||
pythonImportsCheck = [
|
pythonImportsCheck = [
|
||||||
|
|
|
||||||
|
|
@ -7,13 +7,6 @@
|
||||||
|
|
||||||
let
|
let
|
||||||
pythonPackages = python3.pkgs;
|
pythonPackages = python3.pkgs;
|
||||||
buildPythonPackage = pythonPackages.buildPythonPackage;
|
|
||||||
numpy = pythonPackages.numpy;
|
|
||||||
tqdm = pythonPackages.tqdm;
|
|
||||||
sentencepiece = pythonPackages.sentencepiece;
|
|
||||||
pyyaml = pythonPackages.pyyaml;
|
|
||||||
poetry-core = pythonPackages.poetry-core;
|
|
||||||
pytestCheckHook = pythonPackages.pytestCheckHook;
|
|
||||||
in
|
in
|
||||||
|
|
||||||
# We're using `makeScope` instead of just writing out an attrset
|
# We're using `makeScope` instead of just writing out an attrset
|
||||||
|
|
@ -23,17 +16,18 @@ in
|
||||||
lib.makeScope newScope (self: {
|
lib.makeScope newScope (self: {
|
||||||
inherit llamaVersion;
|
inherit llamaVersion;
|
||||||
gguf-py = self.callPackage ./package-gguf-py.nix {
|
gguf-py = self.callPackage ./package-gguf-py.nix {
|
||||||
inherit
|
inherit (pythonPackages)
|
||||||
buildPythonPackage
|
|
||||||
numpy
|
numpy
|
||||||
tqdm
|
tqdm
|
||||||
sentencepiece
|
sentencepiece
|
||||||
poetry-core
|
|
||||||
pyyaml
|
pyyaml
|
||||||
pytestCheckHook
|
pytestCheckHook
|
||||||
|
requests
|
||||||
|
buildPythonPackage
|
||||||
|
poetry-core
|
||||||
;
|
;
|
||||||
};
|
};
|
||||||
python-scripts = self.callPackage ./python-scripts.nix { inherit buildPythonPackage poetry-core; };
|
python-scripts = self.callPackage ./python-scripts.nix { inherit (pythonPackages) buildPythonPackage poetry-core; };
|
||||||
llama-cpp = self.callPackage ./package.nix { };
|
llama-cpp = self.callPackage ./package.nix { };
|
||||||
docker = self.callPackage ./docker.nix { };
|
docker = self.callPackage ./docker.nix { };
|
||||||
docker-min = self.callPackage ./docker.nix { interactive = false; };
|
docker-min = self.callPackage ./docker.nix { interactive = false; };
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue