diff options
Diffstat (limited to 'dev-util/pixi')
| -rw-r--r-- | dev-util/pixi/Manifest | 8 | ||||
| -rw-r--r-- | dev-util/pixi/files/pixi-0.45.0-offline.patch | 37 | ||||
| -rw-r--r-- | dev-util/pixi/metadata.xml | 3 | ||||
| -rw-r--r-- | dev-util/pixi/pixi-0.45.0.ebuild | 130 |
4 files changed, 177 insertions, 1 deletions
diff --git a/dev-util/pixi/Manifest b/dev-util/pixi/Manifest index cdfbdb82cf58..eabfef8b4709 100644 --- a/dev-util/pixi/Manifest +++ b/dev-util/pixi/Manifest @@ -1,9 +1,15 @@ AUX pixi-0.39.5-offline-tests.patch 2761 BLAKE2B 55b23889887d9ffdc0ef00e6ae0c9fe946b8497fc3db68893303bd10665621cc3cd6537a9317006c6618193d1393019bb617e0bf76e7a7ae98e22ac384013b6b SHA512 621a5fb614567989bf50545bd5f7bf73524f4fd9862ddea5ec7d41724ded48c66a47925787f231f53b0e8774db2e2bffd010bacaa15118dff40c896678e3865c +AUX pixi-0.45.0-offline.patch 1467 BLAKE2B 0c4a46ab80a3e5c966b2c15fd3608e2ce99dc87dec5c13216ef8e2c370435dd3aed47c3fb81346af77f23958137ac11e7114ce074dc33795fdef0f730505e5b7 SHA512 9824422b24c7fe8b661da6c22c69d8d3ac2e0d226760fbd48405ab3a7ed92b90e995ef8eaeb5fb2ae8b029ae7fc32335805cde2cebbc20e404b62cc687efbb76 DIST pixi-0.39.5-crates.tar.xz 48798324 BLAKE2B 0ae0d903dab4d35cf71b9dc32c8c42213c9452472248ad01be0153914d3d4740eab2f425306c6cd5fff5730d1c5c70a138087f9d30e30452b71b354fe0163911 SHA512 509e77f7500c2ed1328ad0d27d6749bb1e46d7fc0b2eddcde3fef04b7b5d7941215724e0aa364eebd20672b2f62d5a1fc695d42450b3b2b89b77a49c4edaba5b DIST pixi-0.39.5.tar.gz 6767808 BLAKE2B f464422d99c1afb8b8c70b50a664fe473152e05bd8f5ca3013ecbe30a02b07430428d0363c31e5203ed0c1af9ec65e62d72902e62d4cd70d74754e62c8c3bbc7 SHA512 44f55a824c252903659568c57d0be644791924b867838660b546d53e2612859d76561a0a9edb02215b5dd71de837a6d799f9846e8da50e6e26471ba41b4f897a +DIST pixi-0.45.0-crates.tar.xz 72012476 BLAKE2B aaea95faa6acee1b150c62946bf8b536efe69e2cba79cb335dd077fc0099fc776e292070a49bc793d830a84a41e6af42af2f33d6c0b9fdc1a8e7b13c2c2dd552 SHA512 2d05b940d1526c70d8acc52f5e8146c91f75393a5f459778f84129610d4ff00d2455125c4fe2961ceb300a65c01d6fe2994a8f274687e412e01ada8db23679c1 +DIST pixi-0.45.0.tar.gz 7606448 BLAKE2B 67409f3438f7cceb6885712837e89ac03ff3da9d4a4e8fa07155dc5d41a85d660d8faa37028ed5ab5941449b31e7d208ff867e3a89c5e60b39fba8a912701069 SHA512 81144d3da1a137942b1f2391038cf057363e081bb2b7ac2c91aeff9a1f096bdcaaec95e1e25464b0a169148f3f31cd953fef1fb8a91ed19d8d1b7b9723dc563d DIST pubgrub-57832d0588fbb7aab824813481104761dc1c7740.gh.tar.gz 95600 BLAKE2B 8bdf971091d6816c326925c4603aa9296d6a92c2ede6a6245e0e5e64b741863e5d93aac03990004c13bd592d3d6ca2c662500e4c8d33e9959d6df9e1023a41e5 SHA512 8eae3c00928d921ca7cfdeff124962e477ae32387fb4b1ebfecd968181ec6bb2c2d96c918d8a9f521f1b9666eb6272c9f982b444d22a432f9471414f081694ee +DIST pubgrub-b70cf707aa43f21b32f3a61b8a0889b15032d5c4.gh.tar.gz 98983 BLAKE2B 08ad8a10a96ba7da3100f7658f38cb8d6fb0e1eca92ba0aaf1393778012db807084f047eec171f0a46836a6746367369e79ab95836d5cdf215211e321d2800ac SHA512 401ea5ca16e978d5407a1400e4e27cec9fcac11332067ee1ed8a3bc511901e08fc421ce875ebbb0990593ed549a4a5f4620914a71ae3490c7b8ae0f7b26b5937 DIST rs-async-zip-c909fda63fcafe4af496a07bfda28a5aae97e58d.gh.tar.gz 51763 BLAKE2B 59d053bc6692014d884a9247dea1b57a8789469ba2abbcc92ec21bb0022cbd74874afc463082156ab697aa6c80635019857a5d7e2dc150274e8b04d720518c36 SHA512 3a309566f4925b02496fcf19bc2865968edf6fb65082ca4079d2cee79e6b0353a1910c079f2afe656da0d0f6ddde5102052a221ea35a7dabc6d690a11218b20a DIST tl-6e25b2ee2513d75385101a8ff9f591ef51f314ec.gh.tar.gz 37106 BLAKE2B c30d1c33f6f52e2bc83823eb6319f8a3e462b7c7408fb6a08f995747857ef234f81db4135a04f9d183095fe473a4087f8f0cb89d8f87ef4400285d2ce034ec22 SHA512 4abbc4240ed129c92da8d616e27a6df0f24cdc85a0803acfdae588ca91f9e5b8d482e3ac88b2e657ff68917b1b43cef1e7ef3c887f624659b231fa5a13fcae68 +DIST uv-3d946027841ac949b9ecfd5ceaeec721836ee555.gh.tar.gz 3809296 BLAKE2B 48d163f5aa19dba2043f3d0a94f952e7266cabc37197253d91cb69286abd121ab588edfc312f2560a15444a59cc9b14cf8ebb4b8fdffe9935579d9152bf75cd5 SHA512 640ad76d4db5bf2f3db21a37d7cf9465ceae7282855f305d1df3c215a261f4cabc25b2297471a82bbe0cb29d088bfa56b850279daa0ed1288b843af5428fd28f DIST uv-878234ba6b9a3b143e079ca9baa4bec99af93600.gh.tar.gz 2954714 BLAKE2B 93ccda78c9f3302eacbf074ec011f476e2093e8cbe89c4d8b697fadeb00055f1e2a0fb20d7c108a53fd5e47ad12702ea230b45b61d580aebbaeadfeda2fb605a SHA512 cde1ddb6355abfa8529a32b16fb468d31066c38ebf2723e3927427c319a1782118889823e4faebd906802a67cb6b285423c59f9463d6780724751f9d1aab4ac6 EBUILD pixi-0.39.5.ebuild 6756 BLAKE2B b9b27ed4d5692c5459a166f0a9abeb123fb7079ef15d3e4b3d3dfb81c95e6b4872793ece6f6e074165aa3a5df95a6cb493d49e22e8a38e20c76897d9528320d7 SHA512 5f744a4f2c19bbe25914c2ca68d672b729529e4babcd5dd7d1d7bceb269b7e04d98283f7ad4e2b01a3d1b00d9375406962fa5209ec3f9331bc2b31c2d526da31 -MISC metadata.xml 328 BLAKE2B 8001a69030d74cd8c851c7ef8804777e130d44ea6baa989f60039a13dc00d7a94253c4d7d6d9065329ea6a4b5551b181cee24392852c4dec766584b2d944cefd SHA512 3a4c1827066c67c03612c28a0b0fa9f814c982629d8efeba2e30fd72f9e4cdaacd2bf4016990ee209114f69c26cb6b40a93868e3d6db26c2abc6f47ef3a40d0f +EBUILD pixi-0.45.0.ebuild 7725 BLAKE2B 4cb7831809036fdb479c37afd8198807aaa0182a623528ea5225e01a518a969f38d054ff9db61ca91a6215dec967e3cb989fe1fcf5ea29f4fd415506d75095aa SHA512 4e15ec28605853fae9badb6368b76fc4a221972345db4e253a7d8eef6430bcae2d632c1195ea25b0a988e9b7e5282b069c3c95a3d13a86ef2294dc906f1aded7 +MISC metadata.xml 403 BLAKE2B 2530c8d52e90a466990b73dbc8b2e5f74eae037ae2b51f9778c48416f9b0f2284deca4ca4d7dc907bff2ca55b3793a3953f8e6965ef495feef6516d3bc61cced SHA512 8c9da419abedf6ffa2e63ee066df659ac9d1aab6f5d5fd42821bc3d68772c2849918aeb376b6f28a2d3d156a358b56ae2d8a26e3d7a6f09b6eb1d601b19964ea diff --git a/dev-util/pixi/files/pixi-0.45.0-offline.patch b/dev-util/pixi/files/pixi-0.45.0-offline.patch new file mode 100644 index 000000000000..0298f22a5add --- /dev/null +++ b/dev-util/pixi/files/pixi-0.45.0-offline.patch @@ -0,0 +1,37 @@ +From 73a59e93c492389c0d7d17db3b00e21c047cb221 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org> +Date: Mon, 14 Apr 2025 09:15:50 +0200 +Subject: [PATCH] Mark `add_tests::add_pypi_git` as an online test +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Mark `add_tests::add_pypi_git` as requiring Internet, as in isolated +environment it fails with: + +``` +thread 'add_tests::add_pypi_git' panicked at tests/integration_rust/add_tests.rs:915:30: +called `Result::unwrap()` on an `Err` value: × Request failed after 3 retries + ├─▶ error sending request for url (https://prefix.dev/conda-forge/noarch/ + │ repodata_shards.msgpack.zst) + ├─▶ client error (Connect) + ├─▶ dns error: failed to lookup address information: Name or service not + │ known + ╰─▶ failed to lookup address information: Name or service not known +``` +--- + tests/integration_rust/add_tests.rs | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/tests/integration_rust/add_tests.rs b/tests/integration_rust/add_tests.rs +index 6cef9054..bb35c795 100644 +--- a/tests/integration_rust/add_tests.rs ++++ b/tests/integration_rust/add_tests.rs +@@ -895,6 +895,7 @@ preview = ['pixi-build']"#, + + /// Test adding a git dependency using ssh url + #[tokio::test] ++#[cfg_attr(not(feature = "online_tests"), ignore)] + async fn add_pypi_git() { + let pixi = PixiControl::from_manifest( + format!( diff --git a/dev-util/pixi/metadata.xml b/dev-util/pixi/metadata.xml index 8d4e3d5944d6..4c14558aee50 100644 --- a/dev-util/pixi/metadata.xml +++ b/dev-util/pixi/metadata.xml @@ -8,4 +8,7 @@ <upstream> <remote-id type="github">prefix-dev/pixi</remote-id> </upstream> + <use> + <flag name="rustls">Use Rustls instead of OpenSSL.</flag> + </use> </pkgmetadata> diff --git a/dev-util/pixi/pixi-0.45.0.ebuild b/dev-util/pixi/pixi-0.45.0.ebuild new file mode 100644 index 000000000000..48ca33f8f489 --- /dev/null +++ b/dev-util/pixi/pixi-0.45.0.ebuild @@ -0,0 +1,130 @@ +# Copyright 2025 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +CRATES=" +" + +declare -A GIT_CRATES=( + [async_zip]='https://github.com/charliermarsh/rs-async-zip;c909fda63fcafe4af496a07bfda28a5aae97e58d;rs-async-zip-%commit%' + [pubgrub]='https://github.com/astral-sh/pubgrub;b70cf707aa43f21b32f3a61b8a0889b15032d5c4;pubgrub-%commit%' + [tl]='https://github.com/astral-sh/tl;6e25b2ee2513d75385101a8ff9f591ef51f314ec;tl-%commit%' + [uv-auth]='https://github.com/astral-sh/uv;3d946027841ac949b9ecfd5ceaeec721836ee555;uv-%commit%/crates/uv-auth' + [uv-build-backend]='https://github.com/astral-sh/uv;3d946027841ac949b9ecfd5ceaeec721836ee555;uv-%commit%/crates/uv-build-backend' + [uv-build-frontend]='https://github.com/astral-sh/uv;3d946027841ac949b9ecfd5ceaeec721836ee555;uv-%commit%/crates/uv-build-frontend' + [uv-cache-info]='https://github.com/astral-sh/uv;3d946027841ac949b9ecfd5ceaeec721836ee555;uv-%commit%/crates/uv-cache-info' + [uv-cache-key]='https://github.com/astral-sh/uv;3d946027841ac949b9ecfd5ceaeec721836ee555;uv-%commit%/crates/uv-cache-key' + [uv-cache]='https://github.com/astral-sh/uv;3d946027841ac949b9ecfd5ceaeec721836ee555;uv-%commit%/crates/uv-cache' + [uv-client]='https://github.com/astral-sh/uv;3d946027841ac949b9ecfd5ceaeec721836ee555;uv-%commit%/crates/uv-client' + [uv-configuration]='https://github.com/astral-sh/uv;3d946027841ac949b9ecfd5ceaeec721836ee555;uv-%commit%/crates/uv-configuration' + [uv-console]='https://github.com/astral-sh/uv;3d946027841ac949b9ecfd5ceaeec721836ee555;uv-%commit%/crates/uv-console' + [uv-dirs]='https://github.com/astral-sh/uv;3d946027841ac949b9ecfd5ceaeec721836ee555;uv-%commit%/crates/uv-dirs' + [uv-dispatch]='https://github.com/astral-sh/uv;3d946027841ac949b9ecfd5ceaeec721836ee555;uv-%commit%/crates/uv-dispatch' + [uv-distribution-filename]='https://github.com/astral-sh/uv;3d946027841ac949b9ecfd5ceaeec721836ee555;uv-%commit%/crates/uv-distribution-filename' + [uv-distribution-types]='https://github.com/astral-sh/uv;3d946027841ac949b9ecfd5ceaeec721836ee555;uv-%commit%/crates/uv-distribution-types' + [uv-distribution]='https://github.com/astral-sh/uv;3d946027841ac949b9ecfd5ceaeec721836ee555;uv-%commit%/crates/uv-distribution' + [uv-extract]='https://github.com/astral-sh/uv;3d946027841ac949b9ecfd5ceaeec721836ee555;uv-%commit%/crates/uv-extract' + [uv-fs]='https://github.com/astral-sh/uv;3d946027841ac949b9ecfd5ceaeec721836ee555;uv-%commit%/crates/uv-fs' + [uv-git-types]='https://github.com/astral-sh/uv;3d946027841ac949b9ecfd5ceaeec721836ee555;uv-%commit%/crates/uv-git-types' + [uv-git]='https://github.com/astral-sh/uv;3d946027841ac949b9ecfd5ceaeec721836ee555;uv-%commit%/crates/uv-git' + [uv-globfilter]='https://github.com/astral-sh/uv;3d946027841ac949b9ecfd5ceaeec721836ee555;uv-%commit%/crates/uv-globfilter' + [uv-install-wheel]='https://github.com/astral-sh/uv;3d946027841ac949b9ecfd5ceaeec721836ee555;uv-%commit%/crates/uv-install-wheel' + [uv-installer]='https://github.com/astral-sh/uv;3d946027841ac949b9ecfd5ceaeec721836ee555;uv-%commit%/crates/uv-installer' + [uv-macros]='https://github.com/astral-sh/uv;3d946027841ac949b9ecfd5ceaeec721836ee555;uv-%commit%/crates/uv-macros' + [uv-metadata]='https://github.com/astral-sh/uv;3d946027841ac949b9ecfd5ceaeec721836ee555;uv-%commit%/crates/uv-metadata' + [uv-normalize]='https://github.com/astral-sh/uv;3d946027841ac949b9ecfd5ceaeec721836ee555;uv-%commit%/crates/uv-normalize' + [uv-once-map]='https://github.com/astral-sh/uv;3d946027841ac949b9ecfd5ceaeec721836ee555;uv-%commit%/crates/uv-once-map' + [uv-options-metadata]='https://github.com/astral-sh/uv;3d946027841ac949b9ecfd5ceaeec721836ee555;uv-%commit%/crates/uv-options-metadata' + [uv-pep440]='https://github.com/astral-sh/uv;3d946027841ac949b9ecfd5ceaeec721836ee555;uv-%commit%/crates/uv-pep440' + [uv-pep508]='https://github.com/astral-sh/uv;3d946027841ac949b9ecfd5ceaeec721836ee555;uv-%commit%/crates/uv-pep508' + [uv-platform-tags]='https://github.com/astral-sh/uv;3d946027841ac949b9ecfd5ceaeec721836ee555;uv-%commit%/crates/uv-platform-tags' + [uv-pypi-types]='https://github.com/astral-sh/uv;3d946027841ac949b9ecfd5ceaeec721836ee555;uv-%commit%/crates/uv-pypi-types' + [uv-python]='https://github.com/astral-sh/uv;3d946027841ac949b9ecfd5ceaeec721836ee555;uv-%commit%/crates/uv-python' + [uv-requirements-txt]='https://github.com/astral-sh/uv;3d946027841ac949b9ecfd5ceaeec721836ee555;uv-%commit%/crates/uv-requirements-txt' + [uv-requirements]='https://github.com/astral-sh/uv;3d946027841ac949b9ecfd5ceaeec721836ee555;uv-%commit%/crates/uv-requirements' + [uv-resolver]='https://github.com/astral-sh/uv;3d946027841ac949b9ecfd5ceaeec721836ee555;uv-%commit%/crates/uv-resolver' + [uv-shell]='https://github.com/astral-sh/uv;3d946027841ac949b9ecfd5ceaeec721836ee555;uv-%commit%/crates/uv-shell' + [uv-small-str]='https://github.com/astral-sh/uv;3d946027841ac949b9ecfd5ceaeec721836ee555;uv-%commit%/crates/uv-small-str' + [uv-state]='https://github.com/astral-sh/uv;3d946027841ac949b9ecfd5ceaeec721836ee555;uv-%commit%/crates/uv-state' + [uv-static]='https://github.com/astral-sh/uv;3d946027841ac949b9ecfd5ceaeec721836ee555;uv-%commit%/crates/uv-static' + [uv-torch]='https://github.com/astral-sh/uv;3d946027841ac949b9ecfd5ceaeec721836ee555;uv-%commit%/crates/uv-torch' + [uv-trampoline-builder]='https://github.com/astral-sh/uv;3d946027841ac949b9ecfd5ceaeec721836ee555;uv-%commit%/crates/uv-trampoline-builder' + [uv-types]='https://github.com/astral-sh/uv;3d946027841ac949b9ecfd5ceaeec721836ee555;uv-%commit%/crates/uv-types' + [uv-version]='https://github.com/astral-sh/uv;3d946027841ac949b9ecfd5ceaeec721836ee555;uv-%commit%/crates/uv-version' + [uv-virtualenv]='https://github.com/astral-sh/uv;3d946027841ac949b9ecfd5ceaeec721836ee555;uv-%commit%/crates/uv-virtualenv' + [uv-warnings]='https://github.com/astral-sh/uv;3d946027841ac949b9ecfd5ceaeec721836ee555;uv-%commit%/crates/uv-warnings' + [uv-workspace]='https://github.com/astral-sh/uv;3d946027841ac949b9ecfd5ceaeec721836ee555;uv-%commit%/crates/uv-workspace' + [version-ranges]='https://github.com/astral-sh/pubgrub;b70cf707aa43f21b32f3a61b8a0889b15032d5c4;pubgrub-%commit%/version-ranges' +) + +inherit cargo + +CRATE_P=${P} +DESCRIPTION="A package management and workflow tool" +HOMEPAGE=" + https://pixi.sh/ + https://github.com/prefix-dev/pixi/ +" +SRC_URI=" + https://github.com/prefix-dev/pixi/releases/download/v${PV}/source.tar.gz + -> ${P}.tar.gz + ${CARGO_CRATE_URIS} + https://github.com/gentoo-crate-dist/pixi/releases/download/v${PV}/${P}-crates.tar.xz +" + +LICENSE="BSD" +# Dependent crate licenses +LICENSE+=" + 0BSD Apache-2.0 Apache-2.0-with-LLVM-exceptions BSD-2 BSD Boost-1.0 + ISC MIT MPL-2.0 MPL-2.0 Unicode-3.0 ZLIB +" +SLOT="0" +KEYWORDS="~amd64" +IUSE="+rustls" + +RDEPEND=" + app-arch/bzip2:= + app-arch/xz-utils:= + app-arch/zstd:= + !rustls? ( dev-libs/openssl:= ) +" + +src_prepare() { + local PATCHES=( + # https://github.com/prefix-dev/pixi/pull/3586 + "${FILESDIR}/${P}-offline.patch" + ) + + default + + local vr_dep=$(grep version-ranges "${ECARGO_HOME}"/config.toml || die) + sed -i -e "/version-ranges/s;^.*$;${vr_dep};" Cargo.toml || die +} + +src_configure() { + local myfeatures=( + $(usex rustls rustls-tls native-tls) + ) + cargo_src_configure --no-default-features + + export ZSTD_SYS_USE_PKG_CONFIG=1 + + # bzip2-sys requires a pkg-config file + # https://github.com/alexcrichton/bzip2-rs/issues/104 + mkdir "${T}/pkg-config" || die + export PKG_CONFIG_PATH=${T}/pkg-config${PKG_CONFIG_PATH+:${PKG_CONFIG_PATH}} + cat >> "${T}/pkg-config/bzip2.pc" <<-EOF || die + Name: bzip2 + Version: 9999 + Description: + Libs: -lbz2 + EOF +} + +src_test() { + # tests use it to test preserving envvars, apparently assuming + # it will be always set + local -x USER=${USER} + cargo_src_test --no-fail-fast +} |