From fc3f6328310ba07aa6d8cc78c123dc06ec7048ea Mon Sep 17 00:00:00 2001 From: adisbladis Date: Mon, 9 Sep 2024 00:39:51 +1200 Subject: [PATCH] python3Packages.llm: Remove withPlugins It looks to be an ad-hoc version of withPackages which doesn't compose with overriding. --- .../python-modules/llm/default.nix | 32 +++---------------- 1 file changed, 5 insertions(+), 27 deletions(-) diff --git a/pkgs/development/python-modules/llm/default.nix b/pkgs/development/python-modules/llm/default.nix index 985e1d284cf8..7c59d7c38911 100644 --- a/pkgs/development/python-modules/llm/default.nix +++ b/pkgs/development/python-modules/llm/default.nix @@ -88,33 +88,11 @@ let }; }; - withPlugins = - plugins: - buildPythonApplication { - inherit (llm) pname version; - format = "other"; + withPlugins = throw '' + llm.withPlugins was confusing to use and has been removed. + Please migrate to using python3.withPackages(ps: [ ps.llm ]) instead. - disabled = pythonOlder "3.8"; - - dontUnpack = true; - dontBuild = true; - doCheck = false; - - nativeBuildInputs = [ makeWrapper ]; - - installPhase = '' - makeWrapper ${llm}/bin/llm $out/bin/llm \ - --prefix PYTHONPATH : "${llm}/${python.sitePackages}:$PYTHONPATH" - ln -sfv ${llm}/lib $out/lib - ''; - - propagatedBuildInputs = llm.propagatedBuildInputs ++ plugins; - - passthru = llm.passthru // { - withPlugins = morePlugins: withPlugins (morePlugins ++ plugins); - }; - - inherit (llm) meta; - }; + See https://nixos.org/manual/nixpkgs/stable/#python.withpackages-function for more usage examples. + ''; in llm