diff --git a/pkgs/by-name/uv/uv/Cargo.lock b/pkgs/by-name/uv/uv/Cargo.lock index 18313bd9b952..318301d86d6d 100644 --- a/pkgs/by-name/uv/uv/Cargo.lock +++ b/pkgs/by-name/uv/uv/Cargo.lock @@ -684,9 +684,9 @@ dependencies = [ [[package]] name = "clap" -version = "4.5.7" +version = "4.5.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5db83dced34638ad474f39f250d7fea9598bdd239eaced1bdf45d597da0f433f" +checksum = "84b3edb18336f4df585bc9aa31dd99c036dfa5dc5e9a2939a722a188f3a8970d" dependencies = [ "clap_builder", "clap_derive", @@ -694,9 +694,9 @@ dependencies = [ [[package]] name = "clap_builder" -version = "4.5.7" +version = "4.5.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f7e204572485eb3fbf28f871612191521df159bc3e15a9f5064c66dba3a8c05f" +checksum = "c1c09dd5ada6c6c78075d6fd0da3f90d8080651e2d6cc8eb2f1aaa4034ced708" dependencies = [ "anstream", "anstyle", @@ -748,9 +748,9 @@ dependencies = [ [[package]] name = "clap_derive" -version = "4.5.5" +version = "4.5.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c780290ccf4fb26629baa7a1081e68ced113f1d3ec302fa5948f1c381ebf06c6" +checksum = "2bac35c6dafb060fd4d275d9a4ffae97917c13a6327903a8be2153cd964f7085" dependencies = [ "heck 0.5.0", "proc-macro2", @@ -989,11 +989,12 @@ dependencies = [ [[package]] name = "dashmap" -version = "5.5.3" +version = "6.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "978747c1d849a7d2ee5e8adc0159961c48fb7e5db2f06af6723b80123bb53856" +checksum = "804c8821570c3f8b70230c2ba75ffa5c0f9a4189b9a432b6656c536712acae28" dependencies = [ "cfg-if", + "crossbeam-utils", "hashbrown 0.14.5", "lock_api", "once_cell", @@ -1145,9 +1146,9 @@ checksum = "0d6ef0072f8a535281e4876be788938b528e9a1d43900b82c2569af7da799125" [[package]] name = "either" -version = "1.12.0" +version = "1.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3dca9240753cf90908d7e4aac30f630662b02aebaa1b58a3cadabdb23385b58b" +checksum = "60b1af1c220855b6ceac025d3f6ecdd2b7c4894bfe9cd9bda4fbb4bc7c0d4cf0" [[package]] name = "encode_unicode" @@ -2073,9 +2074,9 @@ dependencies = [ [[package]] name = "memchr" -version = "2.7.2" +version = "2.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c8640c5d730cb13ebd907d8d04b52f55ac9a2eec55b440c8892f40d56c76c1d" +checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3" [[package]] name = "memmap2" @@ -2715,7 +2716,7 @@ dependencies = [ "indoc", "libc", "memoffset 0.9.1", - "parking_lot 0.12.3", + "parking_lot 0.11.2", "portable-atomic", "pyo3-build-config", "pyo3-ffi", @@ -3116,9 +3117,8 @@ dependencies = [ [[package]] name = "reqwest-middleware" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a45d100244a467870f6cb763c4484d010a6bed6bd610b3676e3825d93fb4cfbd" +version = "0.3.2" +source = "git+https://github.com/astral-sh/reqwest-middleware?rev=21ceec9a5fd2e8d6f71c3ea2999078fecbd13cbe#21ceec9a5fd2e8d6f71c3ea2999078fecbd13cbe" dependencies = [ "anyhow", "async-trait", @@ -3131,9 +3131,8 @@ dependencies = [ [[package]] name = "reqwest-retry" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "40f342894422862af74c50e1e9601cf0931accc9c6981e5eb413c46603b616b5" +version = "0.7.0" +source = "git+https://github.com/astral-sh/reqwest-middleware?rev=21ceec9a5fd2e8d6f71c3ea2999078fecbd13cbe#21ceec9a5fd2e8d6f71c3ea2999078fecbd13cbe" dependencies = [ "anyhow", "async-trait", @@ -3146,6 +3145,7 @@ dependencies = [ "reqwest", "reqwest-middleware", "retry-policies", + "thiserror", "tokio", "tracing", "wasm-timer", @@ -3172,12 +3172,10 @@ dependencies = [ [[package]] name = "retry-policies" -version = "0.3.0" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "493b4243e32d6eedd29f9a398896e35c6943a123b55eec97dcaee98310d25810" +checksum = "5875471e6cab2871bc150ecb8c727db5113c9338cc3354dc5ee3425b6aa40a1c" dependencies = [ - "anyhow", - "chrono", "rand", ] @@ -3517,9 +3515,9 @@ dependencies = [ [[package]] name = "serde_json" -version = "1.0.117" +version = "1.0.119" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "455182ea6142b14f93f4bc5320a2b31c1f266b66a4a5c858b013302a5d8cbfc3" +checksum = "e8eddb61f0697cc3989c5d64b452f5488e2b8a60fd7d5076a3045076ffef8cb0" dependencies = [ "itoa", "ryu", @@ -4427,7 +4425,7 @@ checksum = "a183cf7feeba97b4dd1c0d46788634f6221d87fa961b305bed08c851829efcc0" [[package]] name = "uv" -version = "0.2.15" +version = "0.2.21" dependencies = [ "anstream", "anyhow", @@ -4487,7 +4485,9 @@ dependencies = [ "uv-normalize", "uv-requirements", "uv-resolver", + "uv-scripts", "uv-settings", + "uv-tool", "uv-toolchain", "uv-types", "uv-virtualenv", @@ -4737,6 +4737,7 @@ dependencies = [ "anyhow", "distribution-filename", "distribution-types", + "either", "fs-err", "futures", "glob", @@ -4829,6 +4830,7 @@ dependencies = [ "dashmap", "fs-err", "reqwest", + "reqwest-middleware", "thiserror", "tokio", "tracing", @@ -4977,6 +4979,22 @@ dependencies = [ "uv-warnings", ] +[[package]] +name = "uv-scripts" +version = "0.0.1" +dependencies = [ + "fs-err", + "indoc", + "memchr", + "once_cell", + "pep440_rs", + "pep508_rs", + "pypi-types", + "serde", + "thiserror", + "toml", +] + [[package]] name = "uv-settings" version = "0.0.1" @@ -4998,6 +5016,7 @@ dependencies = [ "uv-normalize", "uv-resolver", "uv-toolchain", + "uv-warnings", ] [[package]] @@ -5009,6 +5028,31 @@ dependencies = [ "tempfile", ] +[[package]] +name = "uv-tool" +version = "0.0.1" +dependencies = [ + "dirs-sys", + "fs-err", + "install-wheel-rs", + "path-slash", + "pathdiff", + "pep440_rs", + "pep508_rs", + "pypi-types", + "serde", + "thiserror", + "toml", + "toml_edit", + "tracing", + "uv-cache", + "uv-fs", + "uv-state", + "uv-toolchain", + "uv-virtualenv", + "uv-warnings", +] + [[package]] name = "uv-toolchain" version = "0.0.1" @@ -5077,7 +5121,7 @@ dependencies = [ [[package]] name = "uv-version" -version = "0.2.15" +version = "0.2.21" [[package]] name = "uv-virtualenv" diff --git a/pkgs/by-name/uv/uv/package.nix b/pkgs/by-name/uv/uv/package.nix index 8590c1bee0e5..7fea5ed0a55e 100644 --- a/pkgs/by-name/uv/uv/package.nix +++ b/pkgs/by-name/uv/uv/package.nix @@ -4,7 +4,6 @@ , fetchFromGitHub , installShellFiles , libiconv -, openssl , pkg-config , python3Packages , rustPlatform @@ -16,14 +15,14 @@ python3Packages.buildPythonApplication rec { pname = "uv"; - version = "0.2.15"; + version = "0.2.21"; pyproject = true; src = fetchFromGitHub { owner = "astral-sh"; repo = "uv"; rev = "refs/tags/${version}"; - hash = "sha256-dHw08huVslrePcZvIXhui87bPGp5+CChiN+DtY7bLVw="; + hash = "sha256-TgE8JWXXVQxp0aK/vQ6TaSWxHge3X+RpKXjtc2ZkWpM="; }; cargoDeps = rustPlatform.importCargoLock { @@ -31,6 +30,7 @@ python3Packages.buildPythonApplication rec { outputHashes = { "async_zip-0.0.17" = "sha256-Q5fMDJrQtob54CTII3+SXHeozy5S5s3iLOzntevdGOs="; "pubgrub-0.2.1" = "sha256-6tr+HATYSn1A1uVJwmz40S4yLDOJlX8vEokOOtdFG0M="; + "reqwest-middleware-0.3.2" = "sha256-OiC8Kg+F2eKy7YNuLtgYPi95DrbxLvsIKrKEeyuzQTo="; }; }; @@ -44,7 +44,6 @@ python3Packages.buildPythonApplication rec { buildInputs = [ libiconv - openssl ] ++ lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.SystemConfiguration ]; @@ -53,10 +52,6 @@ python3Packages.buildPythonApplication rec { cargoBuildFlags = [ "--package" "uv" ]; - env = { - OPENSSL_NO_VENDOR = true; - }; - postInstall = '' export HOME=$TMPDIR installShellCompletion --cmd uv \