From 6c296a07b0906cf1d15abdab529aabc173ff982f Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Wed, 28 Feb 2024 04:20:00 +0000 Subject: [PATCH 1/2] uv: 0.1.11 -> 0.1.12 Diff: https://github.com/astral-sh/uv/compare/0.1.11...0.1.12 Changelog: https://github.com/astral-sh/uv/releases/tag/0.1.12 --- pkgs/by-name/uv/uv/Cargo.lock | 44 ++++++++++++++++++++-------------- pkgs/by-name/uv/uv/package.nix | 4 ++-- 2 files changed, 28 insertions(+), 20 deletions(-) diff --git a/pkgs/by-name/uv/uv/Cargo.lock b/pkgs/by-name/uv/uv/Cargo.lock index efd58e171c7d..3baa252aa5d4 100644 --- a/pkgs/by-name/uv/uv/Cargo.lock +++ b/pkgs/by-name/uv/uv/Cargo.lock @@ -75,9 +75,9 @@ checksum = "4b46cbb362ab8752921c97e041f5e366ee6297bd428a31275b9fcf1e380f7299" [[package]] name = "anstream" -version = "0.6.11" +version = "0.6.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6e2e1ebcb11de5c03c67de28a7df593d32191b44939c482e97702baaaa6ab6a5" +checksum = "96b09b5178381e0874812a9b157f7fe84982617e48f71f4e3235482775e5b540" dependencies = [ "anstyle", "anstyle-parse", @@ -147,9 +147,9 @@ checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711" [[package]] name = "assert_cmd" -version = "2.0.13" +version = "2.0.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "00ad3f3a942eee60335ab4342358c161ee296829e0d16ff42fc1d6cb07815467" +checksum = "ed72493ac66d5804837f480ab3766c72bdfab91a65e565fc54fa9e42db0073a8" dependencies = [ "anstyle", "bstr", @@ -1587,25 +1587,21 @@ dependencies = [ "data-encoding", "distribution-filename", "fs-err", - "fs2", - "goblin", "indoc", "mailparse", "once_cell", + "pathdiff", "pep440_rs", "platform-host", "platform-info", "plist", - "pyo3", "pypi-types", - "rayon", "reflink-copy", "regex", "rustc-hash", "serde", "serde_json", "sha2", - "target-lexicon", "tempfile", "thiserror", "tracing", @@ -2193,6 +2189,12 @@ version = "1.0.14" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "de3145af08024dea9fa9914f381a17b8fc6034dfb00f3a84013f7ff43f29ed4c" +[[package]] +name = "pathdiff" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8835116a5c179084a830efb3adc117ab007512b535bc1a21c991d3b32a6b44dd" + [[package]] name = "pep440_rs" version = "0.5.0" @@ -3189,18 +3191,18 @@ dependencies = [ [[package]] name = "serde" -version = "1.0.196" +version = "1.0.197" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "870026e60fa08c69f064aa766c10f10b1d62db9ccd4d0abb206472bee0ce3b32" +checksum = "3fb1c873e1b9b056a4dc4c0c198b24c3ffa059243875552b2bd0933b1aee4ce2" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.196" +version = "1.0.197" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "33c85360c95e7d137454dc81d9a4ed2b8efd8fbe19cee57357b32b9771fccb67" +checksum = "7eb0b34b42edc17f6b7cac84a52a1c5f0e1bb2227e997ca9011ea3dd34e8610b" dependencies = [ "proc-macro2", "quote", @@ -3209,9 +3211,9 @@ dependencies = [ [[package]] name = "serde_json" -version = "1.0.113" +version = "1.0.114" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "69801b70b1c3dac963ecb03a364ba0ceda9cf60c71cfe475e99864759c8b8a79" +checksum = "c5f09b1bd632ef549eaa9f60a1f8de742bdbc698e6cee2095fc84dde5f549ae0" dependencies = [ "itoa", "ryu", @@ -3496,9 +3498,9 @@ checksum = "55937e1799185b12863d447f42597ed69d9928686b8d88a1df17376a097d8369" [[package]] name = "target-lexicon" -version = "0.12.13" +version = "0.12.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "69758bda2e78f098e4ccb393021a0963bb3442eac05f135c30f61b7370bbafae" +checksum = "e1fc403891a21bcfb7c37834ba66a547a8f402146eba7265b5a6d88059c9ff2f" [[package]] name = "task-local-extensions" @@ -4131,7 +4133,7 @@ checksum = "f00cc9702ca12d3c81455259621e676d0f7251cec66a21e98fe2e9a37db93b2a" [[package]] name = "uv" -version = "0.1.11" +version = "0.1.12" dependencies = [ "anstream", "anyhow", @@ -4151,6 +4153,7 @@ dependencies = [ "fs-err", "futures", "gourgeist", + "indexmap 2.2.3", "indicatif", "indoc", "insta", @@ -4493,12 +4496,15 @@ dependencies = [ "pep508_rs", "platform-tags", "pypi-types", + "pyproject-toml", "rayon", "requirements-txt", "rustc-hash", + "serde", "tempfile", "thiserror", "tokio", + "toml", "tracing", "url", "uv-cache", @@ -4518,9 +4524,11 @@ version = "0.0.1" dependencies = [ "anyhow", "cache-key", + "configparser", "fs-err", "indoc", "insta", + "install-wheel-rs", "itertools 0.12.1", "once_cell", "pep440_rs", diff --git a/pkgs/by-name/uv/uv/package.nix b/pkgs/by-name/uv/uv/package.nix index 9a4f38355da6..7b054bcb20ba 100644 --- a/pkgs/by-name/uv/uv/package.nix +++ b/pkgs/by-name/uv/uv/package.nix @@ -15,14 +15,14 @@ python3.pkgs.buildPythonApplication rec { pname = "uv"; - version = "0.1.11"; + version = "0.1.12"; pyproject = true; src = fetchFromGitHub { owner = "astral-sh"; repo = "uv"; rev = version; - hash = "sha256-0J6m/DgalYA+GGmgjFrNoo9KAv6WgMcx+gasgqG5v1Q="; + hash = "sha256-tM8NX4BPGm8Xxlau+qpKSljTdSJutipsYFsZAdtmZuo="; }; cargoDeps = rustPlatform.importCargoLock { From 1ae75bd80548e9bd4c6939aff6d2d601a221173a Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Wed, 28 Feb 2024 04:20:00 +0000 Subject: [PATCH 2/2] uv: use buildRustPackage --- pkgs/by-name/uv/uv/package.nix | 23 ++++++----------------- 1 file changed, 6 insertions(+), 17 deletions(-) diff --git a/pkgs/by-name/uv/uv/package.nix b/pkgs/by-name/uv/uv/package.nix index 7b054bcb20ba..be273cae8916 100644 --- a/pkgs/by-name/uv/uv/package.nix +++ b/pkgs/by-name/uv/uv/package.nix @@ -1,22 +1,16 @@ { lib -, cargo , cmake , darwin , fetchFromGitHub -, libgit2 , openssl , pkg-config -, python3 , rustPlatform -, rustc , stdenv -, zlib }: -python3.pkgs.buildPythonApplication rec { +rustPlatform.buildRustPackage rec { pname = "uv"; version = "0.1.12"; - pyproject = true; src = fetchFromGitHub { owner = "astral-sh"; @@ -25,7 +19,7 @@ python3.pkgs.buildPythonApplication rec { hash = "sha256-tM8NX4BPGm8Xxlau+qpKSljTdSJutipsYFsZAdtmZuo="; }; - cargoDeps = rustPlatform.importCargoLock { + cargoLock = { lockFile = ./Cargo.lock; outputHashes = { "async_zip-0.0.16" = "sha256-M94ceTCtyQc1AtPXYrVGplShQhItqZZa/x5qLiL+gs0="; @@ -34,25 +28,20 @@ python3.pkgs.buildPythonApplication rec { }; nativeBuildInputs = [ - cargo cmake pkg-config - rustPlatform.cargoSetupHook - rustPlatform.maturinBuildHook - rustc ]; buildInputs = [ - libgit2 openssl - zlib ] ++ lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.SystemConfiguration ]; - dontUseCmakeConfigure = true; + cargoBuildFlags = [ "--package" "uv" ]; - pythonImportsCheck = [ "uv" ]; + # Tests require network access + doCheck = false; env = { OPENSSL_NO_VENDOR = true; @@ -61,7 +50,7 @@ python3.pkgs.buildPythonApplication rec { meta = with lib; { description = "An extremely fast Python package installer and resolver, written in Rust"; homepage = "https://github.com/astral-sh/uv"; - changelog = "https://github.com/astral-sh/uv/releases/tag/${version}"; + changelog = "https://github.com/astral-sh/uv/blob/${src.rev}/CHANGELOG.md"; license = with licenses; [ asl20 mit ]; maintainers = with maintainers; [ marsam ]; mainProgram = "uv";