diff --git a/pkgs/development/python-modules/openllm/default.nix b/pkgs/by-name/op/openllm/package.nix similarity index 66% rename from pkgs/development/python-modules/openllm/default.nix rename to pkgs/by-name/op/openllm/package.nix index 2703284c50b7..f25286d4608b 100644 --- a/pkgs/development/python-modules/openllm/default.nix +++ b/pkgs/by-name/op/openllm/package.nix @@ -1,30 +1,29 @@ { lib, - buildPythonPackage, fetchFromGitHub, - hatch-vcs, - hatchling, - pythonOlder, - accelerate, - bentoml, - dulwich, - nvidia-ml-py, - openai, - psutil, - pyaml, - questionary, - tabulate, - typer, - uv, + python3, }: +let + python = python3.override { + self = python; + packageOverrides = _: super: { + cattrs = super.cattrs.overridePythonAttrs (oldAttrs: rec { + version = "23.1.2"; + build-system = [ super.poetry-core ]; + src = oldAttrs.src.override { + rev = "refs/tags/v${version}"; + hash = "sha256-YO4Clbo5fmXbysxwwM2qCHJwO5KwDC05VctRVFruJcw="; + }; + }); + }; + }; +in -buildPythonPackage rec { +python.pkgs.buildPythonApplication rec { pname = "openllm"; version = "0.6.10"; pyproject = true; - disabled = pythonOlder "3.9"; - src = fetchFromGitHub { owner = "bentoml"; repo = "openllm"; @@ -39,12 +38,12 @@ buildPythonPackage rec { pythonRelaxDeps = [ "openai" ]; - build-system = [ + build-system = with python.pkgs; [ hatch-vcs hatchling ]; - dependencies = [ + dependencies = with python.pkgs; [ accelerate bentoml dulwich diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix index 7d7be6829f7a..da0bc901b89a 100644 --- a/pkgs/top-level/python-aliases.nix +++ b/pkgs/top-level/python-aliases.nix @@ -354,6 +354,7 @@ mapAliases ({ openai-triton-no-cuda = triton-no-cuda; # added 2024-07-18 openapi-schema-pydantic = throw "openapi-schema-pydantic has been removed, since it is no longer maintained"; # added 2023-10-30 opencv3 = throw "opencv3 has been removed as it is obsolete"; # added 2023-10-12 + openllm = throw "openllm has moved to pkgs.openllm"; # added 2021-12-31 openllm-client = throw "openllm-client has been removed, since it is abandoned due to a change in philosophy"; # added 2024-08-24 openllm-core = throw "openllm-core has been removed, since it is abandoned due to a change in philosophy"; # added 2024-08-24 opsdroid_get_image_size = opsdroid-get-image-size; # added 2023-10-16 diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 78bc9c313130..74f685c8bc01 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4651,8 +4651,6 @@ self: super: with self; { oelint-parser = callPackage ../development/python-modules/oelint-parser { }; - openllm = callPackage ../development/python-modules/openllm { }; - openstep-parser = callPackage ../development/python-modules/openstep-parser { }; openstep-plist = callPackage ../development/python-modules/openstep-plist { };