Unverified Commit ba764c11 authored by OTABI Tomoya's avatar OTABI Tomoya Committed by GitHub
Browse files

Merge pull request #314183 from Aleksanaa/uv 

uv: build with python builder to include python module
parents 5ab519cc 9d1625dd

pkgs/by-name/uv/uv/package.nix

+14 −2
Original line number Diff line number Diff line
@@ -3,16 +3,19 @@ 
, darwin

, fetchFromGitHub

, installShellFiles

, libiconv

, openssl

, pkg-config

, python3Packages

, rustPlatform

, stdenv

, nix-update-script

}:



rustPlatform.buildRustPackage rec {

python3Packages.buildPythonApplication rec {

  pname = "uv";

  version = "0.1.45";

  pyproject = true;



  src = fetchFromGitHub {

    owner = "astral-sh";
@@ -21,7 +24,7 @@ rustPlatform.buildRustPackage rec { 
    hash = "sha256-PJeUndpD7jHcpM66dMIyXpDx95Boc01rzovS0Y7io7w=";

  };



  cargoLock = {

  cargoDeps = rustPlatform.importCargoLock {

    lockFile = ./Cargo.lock;

    outputHashes = {

      "async_zip-0.0.17" = "sha256-Q5fMDJrQtob54CTII3+SXHeozy5S5s3iLOzntevdGOs=";
@@ -33,14 +36,19 @@ rustPlatform.buildRustPackage rec { 
    cmake

    installShellFiles

    pkg-config

    rustPlatform.cargoSetupHook

    rustPlatform.maturinBuildHook

  ];



  buildInputs = [

    libiconv

    openssl

  ] ++ lib.optionals stdenv.isDarwin [

    darwin.apple_sdk.frameworks.SystemConfiguration

  ];



  dontUseCmakeConfigure = true;



  cargoBuildFlags = [ "--package" "uv" ];



  # Tests require network access
@@ -58,6 +66,10 @@ rustPlatform.buildRustPackage rec { 
      --zsh <($out/bin/uv --generate-shell-completion zsh)

  '';



  pythonImportsCheck = [

    "uv"

  ];



  passthru.updateScript = nix-update-script { };



  meta = with lib; {

pkgs/top-level/python-packages.nix

+4 −0
Original line number Diff line number Diff line
@@ -16576,6 +16576,10 @@ self: super: with self; { 














  utils = callPackage ../development/python-modules/utils { };



























  uv = toPythonModule (pkgs.uv.override {













    python3Packages = self;













  });



























  uvcclient = callPackage ../development/python-modules/uvcclient { };





























  uvicorn = callPackage ../development/python-modules/uvicorn { };