diff --git a/pkgs/development/python-modules/bitsandbytes/default.nix b/pkgs/development/python-modules/bitsandbytes/default.nix index c511f01d6dcf..189b8a9c6c27 100644 --- a/pkgs/development/python-modules/bitsandbytes/default.nix +++ b/pkgs/development/python-modules/bitsandbytes/default.nix @@ -12,7 +12,7 @@ let pname = "bitsandbytes"; - version = "0.41.0"; + version = "0.42.0"; inherit (torch) cudaCapabilities cudaPackages cudaSupport; inherit (cudaPackages) backendStdenv cudaVersion; @@ -43,15 +43,15 @@ let in buildPythonPackage { inherit pname version; - format = "pyproject"; + pyproject = true; disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "TimDettmers"; - repo = pname; + repo = "bitsandbytes"; rev = "refs/tags/${version}"; - hash = "sha256-e6SK2ylITookO6bhpfdRp/V4y2S9rk6Lo1PD3xXrcmM="; + hash = "sha256-PZxsFJ6WpfeQqRQrRRBZfZfNY6/TfJFLBeknX24OXcU="; }; postPatch = '' @@ -73,8 +73,16 @@ buildPythonPackage { else ''make CUDA_VERSION=CPU cpuonly''; - nativeBuildInputs = [ setuptools wheel ] ++ lib.optionals torch.cudaSupport [ cuda-native-redist ]; - buildInputs = lib.optionals torch.cudaSupport [ cuda-redist ]; + nativeBuildInputs = [ + setuptools + wheel + ] ++ lib.optionals torch.cudaSupport [ + cuda-native-redist + ]; + + buildInputs = lib.optionals torch.cudaSupport [ + cuda-redist + ]; propagatedBuildInputs = [ scipy @@ -88,8 +96,9 @@ buildPythonPackage { ]; meta = with lib; { - homepage = "https://github.com/TimDettmers/bitsandbytes"; description = "8-bit CUDA functions for PyTorch"; + homepage = "https://github.com/TimDettmers/bitsandbytes"; + changelog = "https://github.com/TimDettmers/bitsandbytes/releases/tag/${version}"; license = licenses.mit; maintainers = with maintainers; [ bcdarwin ]; }; diff --git a/pkgs/development/python-modules/openllm-client/default.nix b/pkgs/development/python-modules/openllm-client/default.nix index a1cc4fcc921e..7c0c1d80fc5b 100644 --- a/pkgs/development/python-modules/openllm-client/default.nix +++ b/pkgs/development/python-modules/openllm-client/default.nix @@ -23,6 +23,12 @@ buildPythonPackage rec { sourceRoot = "source/openllm-client"; + postPatch = '' + substituteInPlace pyproject.toml \ + --replace-fail "hatchling==1.18.0" "hatchling" \ + --replace-fail "hatch-vcs==0.3.0" "hatch-vcs" + ''; + nativeBuildInputs = [ hatch-fancy-pypi-readme hatch-vcs