From 05c83e6a792bb35dc89932ae7eb07b9f4fd3d698 Mon Sep 17 00:00:00 2001 From: Benjamin Sparks Date: Fri, 16 May 2025 17:22:06 +0200 Subject: [PATCH 1/3] [python3Packages.]uv: Remove cmake and pkg-config as dependencies --- pkgs/by-name/uv/uv/package.nix | 14 ++------------ pkgs/development/python-modules/uv/default.nix | 4 ---- 2 files changed, 2 insertions(+), 16 deletions(-) diff --git a/pkgs/by-name/uv/uv/package.nix b/pkgs/by-name/uv/uv/package.nix index c068002c920c..9c57f911f356 100644 --- a/pkgs/by-name/uv/uv/package.nix +++ b/pkgs/by-name/uv/uv/package.nix @@ -8,9 +8,7 @@ rust-jemalloc-sys, # nativeBuildInputs - cmake, installShellFiles, - pkg-config, buildPackages, versionCheckHook, @@ -36,13 +34,7 @@ rustPlatform.buildRustPackage (finalAttrs: { rust-jemalloc-sys ]; - nativeBuildInputs = [ - cmake - installShellFiles - pkg-config - ]; - - dontUseCmakeConfigure = true; + nativeBuildInputs = [ installShellFiles ]; cargoBuildFlags = [ "--package" @@ -64,9 +56,7 @@ rustPlatform.buildRustPackage (finalAttrs: { '' ); - nativeInstallCheckInputs = [ - versionCheckHook - ]; + nativeInstallCheckInputs = [ versionCheckHook ]; versionCheckProgramArg = "--version"; doInstallCheck = true; diff --git a/pkgs/development/python-modules/uv/default.nix b/pkgs/development/python-modules/uv/default.nix index 57f9bd8238df..6d0bbdb3cd24 100644 --- a/pkgs/development/python-modules/uv/default.nix +++ b/pkgs/development/python-modules/uv/default.nix @@ -1,7 +1,6 @@ { buildPythonPackage, installShellFiles, - pkg-config, rustPlatform, pkgs, }: @@ -12,7 +11,6 @@ buildPythonPackage { version src cargoDeps - dontUseCmakeConfigure meta cargoBuildFlags postInstall @@ -25,9 +23,7 @@ buildPythonPackage { ''; nativeBuildInputs = [ - pkgs.cmake installShellFiles - pkg-config rustPlatform.cargoSetupHook rustPlatform.maturinBuildHook ]; From c185b63cd5368aa3660eb32e71e6264c2299b6d4 Mon Sep 17 00:00:00 2001 From: Benjamin Sparks Date: Fri, 16 May 2025 17:55:50 +0200 Subject: [PATCH 2/3] python3Packages.uv: add `versionCheckHook` to use inherited `versionCheckProgramArg` --- pkgs/development/python-modules/uv/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/python-modules/uv/default.nix b/pkgs/development/python-modules/uv/default.nix index 6d0bbdb3cd24..726a861372db 100644 --- a/pkgs/development/python-modules/uv/default.nix +++ b/pkgs/development/python-modules/uv/default.nix @@ -3,6 +3,7 @@ installShellFiles, rustPlatform, pkgs, + versionCheckHook, }: buildPythonPackage { @@ -28,6 +29,8 @@ buildPythonPackage { rustPlatform.maturinBuildHook ]; + nativeCheckInputs = [ versionCheckHook ]; + pyproject = true; pythonImportsCheck = [ "uv" ]; } From 6766f806cfb1dedfb524a494f743c65029e171a3 Mon Sep 17 00:00:00 2001 From: Benjamin Sparks Date: Fri, 16 May 2025 17:54:15 +0200 Subject: [PATCH 3/3] [python3Packages.]uv: add bengsparks to maintainers --- pkgs/by-name/uv/uv/package.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/by-name/uv/uv/package.nix b/pkgs/by-name/uv/uv/package.nix index 9c57f911f356..7933b8da98d7 100644 --- a/pkgs/by-name/uv/uv/package.nix +++ b/pkgs/by-name/uv/uv/package.nix @@ -74,6 +74,7 @@ rustPlatform.buildRustPackage (finalAttrs: { mit ]; maintainers = with lib.maintainers; [ + bengsparks GaetanLepage prince213 ];