commit: 5bb365ded898242cfbe98106a7fec0a717cf125f Author: Michał Górny <mgorny <AT> gentoo <DOT> org> AuthorDate: Thu Oct 23 05:22:56 2025 +0000 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> CommitDate: Thu Oct 23 05:55:40 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5bb365de
dev-util/pixi: Remove old Signed-off-by: Michał Górny <mgorny <AT> gentoo.org> dev-util/pixi/Manifest | 2 - dev-util/pixi/files/pixi-0.56.0-test.patch | 38 -------- dev-util/pixi/pixi-0.56.0.ebuild | 146 ----------------------------- 3 files changed, 186 deletions(-) diff --git a/dev-util/pixi/Manifest b/dev-util/pixi/Manifest index 4818b3dd0e6b..f080e15c019c 100644 --- a/dev-util/pixi/Manifest +++ b/dev-util/pixi/Manifest @@ -1,5 +1,3 @@ -DIST pixi-0.56.0-crates.tar.xz 67385080 BLAKE2B 7f8226cdb0b992c32c3eef67f4032c889fd957d6a827c73a7be0d1cd9e4c7785112ff4f15873d648bab902c3fe4b302d49232067f5e875f2dbcbe2b794798554 SHA512 41613ee48d1ec443e54a5e884a44a1501c2925f6df55032f821316ea323fc2b66bd138e08abe5b167d56e789eda97a80ac40e001af1d036598f3c01c0a34c1f8 -DIST pixi-0.56.0.tar.gz 11300428 BLAKE2B 1373779c74ceff8c2b12358b03e2c4094f943d93ea0f85a320fbde80452f4f55ede7d4d752592ef833180a317376288b611bffcfad787618b375b3d54ea7f3db SHA512 a64358fe00eaa256559c736166833991d11668409840f4d000d3eb09710948c4d169843be7a7ec57967914c51742aa799d04f75bbd70b74e3ceb7b3ff4315670 DIST pixi-0.57.0-crates.tar.xz 66325124 BLAKE2B 28347ea423c673191f49928b971f350158868ea127d695dfd434723813a0480f0d70c9dd3d47bee810b335553261d50a77a16b63328eaa7b76ee83c6a9d83751 SHA512 c142af23bbb9a8963898092dd7572cb536e7f3df1d1aa3f6b9781f529e6d8beb496bffe166d8622d6fc9a8b4b8c2c393fdafeba51418b40d2497e68d416c4eba DIST pixi-0.57.0.tar.gz 11317705 BLAKE2B 93ff258dae7b47478408968762abb3a36f9759faf50089795b8cf16d10876bfc16517ed244282f7ac6aacabb8842886ba1bbc0b25ad20857418616e24d8ba906 SHA512 3b03b52a9ccfc648fd740e9f46ca262fdd5a9db4c437fba58b555f5575c19fcefc1007ddb77351d4f1e72488fdccc16c29b34a146d4d86b6039e51708559626e DIST pubgrub-06ec5a5f59ffaeb6cf5079c6cb184467da06c9db.gh.tar.gz 99881 BLAKE2B 5fcc2d1a06eb44351773081de4f616c93301eb2fe71b0c6f7b95779ec4bd9bb6cccc702a87a6399b0674711302a19de3a96fa31044660430fd74ff549000ad25 SHA512 3f0b18aecbc73fee91fc7de9f10d240ddc06c836fa2f116c1f007dd7818d099e6aea1852ca0b8d1a26ac19aac896535dba1a6298851a65515b553810c6245784 diff --git a/dev-util/pixi/files/pixi-0.56.0-test.patch b/dev-util/pixi/files/pixi-0.56.0-test.patch deleted file mode 100644 index e2a16aba182c..000000000000 --- a/dev-util/pixi/files/pixi-0.56.0-test.patch +++ /dev/null @@ -1,38 +0,0 @@ -From d3f39a7533efc0601144490cf41b8ad4867fcdf8 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <[email protected]> -Date: Tue, 16 Sep 2025 07:26:33 +0200 -Subject: [PATCH] test: Mark more online tests -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Signed-off-by: Michał Górny <[email protected]> ---- - crates/pixi/tests/integration_rust/add_tests.rs | 1 + - crates/pixi/tests/integration_rust/pypi_tests.rs | 1 + - 2 files changed, 2 insertions(+) - -diff --git a/crates/pixi/tests/integration_rust/add_tests.rs b/crates/pixi/tests/integration_rust/add_tests.rs -index bbbb54518..1649c6625 100644 ---- a/crates/pixi/tests/integration_rust/add_tests.rs -+++ b/crates/pixi/tests/integration_rust/add_tests.rs -@@ -83,6 +83,7 @@ async fn add_functionality() { - - /// Test adding a package with a specific channel - #[tokio::test] -+#[cfg_attr(not(feature = "online_tests"), ignore)] - async fn add_with_channel() { - setup_tracing(); - -diff --git a/crates/pixi/tests/integration_rust/pypi_tests.rs b/crates/pixi/tests/integration_rust/pypi_tests.rs -index 21c23ffba..086851c5a 100644 ---- a/crates/pixi/tests/integration_rust/pypi_tests.rs -+++ b/crates/pixi/tests/integration_rust/pypi_tests.rs -@@ -16,6 +16,7 @@ use crate::setup_tracing; - /// before when running `pixi list -e all`, this would have not included numpy - /// we are now explicitly testing that this works - #[tokio::test] -+#[cfg_attr(not(feature = "online_tests"), ignore)] - async fn pyproject_optional_dependencies_resolve_recursively() { - setup_tracing(); - diff --git a/dev-util/pixi/pixi-0.56.0.ebuild b/dev-util/pixi/pixi-0.56.0.ebuild deleted file mode 100644 index 1e1640cb9ff0..000000000000 --- a/dev-util/pixi/pixi-0.56.0.ebuild +++ /dev/null @@ -1,146 +0,0 @@ -# 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/astral-sh/rs-async-zip;c909fda63fcafe4af496a07bfda28a5aae97e58d;rs-async-zip-%commit%' - [pubgrub]='https://github.com/astral-sh/pubgrub;06ec5a5f59ffaeb6cf5079c6cb184467da06c9db;pubgrub-%commit%' - [reqwest-middleware]='https://github.com/astral-sh/reqwest-middleware;ad8b9d332d1773fde8b4cd008486de5973e0a3f8;reqwest-middleware-%commit%/reqwest-middleware' - [reqwest-retry]='https://github.com/astral-sh/reqwest-middleware;ad8b9d332d1773fde8b4cd008486de5973e0a3f8;reqwest-middleware-%commit%/reqwest-retry' - [tl]='https://github.com/astral-sh/tl;6e25b2ee2513d75385101a8ff9f591ef51f314ec;tl-%commit%' - [uv-auth]='https://github.com/astral-sh/uv;ce37286814dbb802c422f0926487cfab7aefd2b7;uv-%commit%/crates/uv-auth' - [uv-build-backend]='https://github.com/astral-sh/uv;ce37286814dbb802c422f0926487cfab7aefd2b7;uv-%commit%/crates/uv-build-backend' - [uv-build-frontend]='https://github.com/astral-sh/uv;ce37286814dbb802c422f0926487cfab7aefd2b7;uv-%commit%/crates/uv-build-frontend' - [uv-cache-info]='https://github.com/astral-sh/uv;ce37286814dbb802c422f0926487cfab7aefd2b7;uv-%commit%/crates/uv-cache-info' - [uv-cache-key]='https://github.com/astral-sh/uv;ce37286814dbb802c422f0926487cfab7aefd2b7;uv-%commit%/crates/uv-cache-key' - [uv-cache]='https://github.com/astral-sh/uv;ce37286814dbb802c422f0926487cfab7aefd2b7;uv-%commit%/crates/uv-cache' - [uv-client]='https://github.com/astral-sh/uv;ce37286814dbb802c422f0926487cfab7aefd2b7;uv-%commit%/crates/uv-client' - [uv-configuration]='https://github.com/astral-sh/uv;ce37286814dbb802c422f0926487cfab7aefd2b7;uv-%commit%/crates/uv-configuration' - [uv-console]='https://github.com/astral-sh/uv;ce37286814dbb802c422f0926487cfab7aefd2b7;uv-%commit%/crates/uv-console' - [uv-dirs]='https://github.com/astral-sh/uv;ce37286814dbb802c422f0926487cfab7aefd2b7;uv-%commit%/crates/uv-dirs' - [uv-dispatch]='https://github.com/astral-sh/uv;ce37286814dbb802c422f0926487cfab7aefd2b7;uv-%commit%/crates/uv-dispatch' - [uv-distribution-filename]='https://github.com/astral-sh/uv;ce37286814dbb802c422f0926487cfab7aefd2b7;uv-%commit%/crates/uv-distribution-filename' - [uv-distribution-types]='https://github.com/astral-sh/uv;ce37286814dbb802c422f0926487cfab7aefd2b7;uv-%commit%/crates/uv-distribution-types' - [uv-distribution]='https://github.com/astral-sh/uv;ce37286814dbb802c422f0926487cfab7aefd2b7;uv-%commit%/crates/uv-distribution' - [uv-extract]='https://github.com/astral-sh/uv;ce37286814dbb802c422f0926487cfab7aefd2b7;uv-%commit%/crates/uv-extract' - [uv-fs]='https://github.com/astral-sh/uv;ce37286814dbb802c422f0926487cfab7aefd2b7;uv-%commit%/crates/uv-fs' - [uv-git-types]='https://github.com/astral-sh/uv;ce37286814dbb802c422f0926487cfab7aefd2b7;uv-%commit%/crates/uv-git-types' - [uv-git]='https://github.com/astral-sh/uv;ce37286814dbb802c422f0926487cfab7aefd2b7;uv-%commit%/crates/uv-git' - [uv-globfilter]='https://github.com/astral-sh/uv;ce37286814dbb802c422f0926487cfab7aefd2b7;uv-%commit%/crates/uv-globfilter' - [uv-install-wheel]='https://github.com/astral-sh/uv;ce37286814dbb802c422f0926487cfab7aefd2b7;uv-%commit%/crates/uv-install-wheel' - [uv-installer]='https://github.com/astral-sh/uv;ce37286814dbb802c422f0926487cfab7aefd2b7;uv-%commit%/crates/uv-installer' - [uv-macros]='https://github.com/astral-sh/uv;ce37286814dbb802c422f0926487cfab7aefd2b7;uv-%commit%/crates/uv-macros' - [uv-metadata]='https://github.com/astral-sh/uv;ce37286814dbb802c422f0926487cfab7aefd2b7;uv-%commit%/crates/uv-metadata' - [uv-normalize]='https://github.com/astral-sh/uv;ce37286814dbb802c422f0926487cfab7aefd2b7;uv-%commit%/crates/uv-normalize' - [uv-once-map]='https://github.com/astral-sh/uv;ce37286814dbb802c422f0926487cfab7aefd2b7;uv-%commit%/crates/uv-once-map' - [uv-options-metadata]='https://github.com/astral-sh/uv;ce37286814dbb802c422f0926487cfab7aefd2b7;uv-%commit%/crates/uv-options-metadata' - [uv-pep440]='https://github.com/astral-sh/uv;ce37286814dbb802c422f0926487cfab7aefd2b7;uv-%commit%/crates/uv-pep440' - [uv-pep508]='https://github.com/astral-sh/uv;ce37286814dbb802c422f0926487cfab7aefd2b7;uv-%commit%/crates/uv-pep508' - [uv-platform-tags]='https://github.com/astral-sh/uv;ce37286814dbb802c422f0926487cfab7aefd2b7;uv-%commit%/crates/uv-platform-tags' - [uv-platform]='https://github.com/astral-sh/uv;ce37286814dbb802c422f0926487cfab7aefd2b7;uv-%commit%/crates/uv-platform' - [uv-pypi-types]='https://github.com/astral-sh/uv;ce37286814dbb802c422f0926487cfab7aefd2b7;uv-%commit%/crates/uv-pypi-types' - [uv-python]='https://github.com/astral-sh/uv;ce37286814dbb802c422f0926487cfab7aefd2b7;uv-%commit%/crates/uv-python' - [uv-redacted]='https://github.com/astral-sh/uv;ce37286814dbb802c422f0926487cfab7aefd2b7;uv-%commit%/crates/uv-redacted' - [uv-requirements-txt]='https://github.com/astral-sh/uv;ce37286814dbb802c422f0926487cfab7aefd2b7;uv-%commit%/crates/uv-requirements-txt' - [uv-requirements]='https://github.com/astral-sh/uv;ce37286814dbb802c422f0926487cfab7aefd2b7;uv-%commit%/crates/uv-requirements' - [uv-resolver]='https://github.com/astral-sh/uv;ce37286814dbb802c422f0926487cfab7aefd2b7;uv-%commit%/crates/uv-resolver' - [uv-shell]='https://github.com/astral-sh/uv;ce37286814dbb802c422f0926487cfab7aefd2b7;uv-%commit%/crates/uv-shell' - [uv-small-str]='https://github.com/astral-sh/uv;ce37286814dbb802c422f0926487cfab7aefd2b7;uv-%commit%/crates/uv-small-str' - [uv-state]='https://github.com/astral-sh/uv;ce37286814dbb802c422f0926487cfab7aefd2b7;uv-%commit%/crates/uv-state' - [uv-static]='https://github.com/astral-sh/uv;ce37286814dbb802c422f0926487cfab7aefd2b7;uv-%commit%/crates/uv-static' - [uv-torch]='https://github.com/astral-sh/uv;ce37286814dbb802c422f0926487cfab7aefd2b7;uv-%commit%/crates/uv-torch' - [uv-trampoline-builder]='https://github.com/astral-sh/uv;ce37286814dbb802c422f0926487cfab7aefd2b7;uv-%commit%/crates/uv-trampoline-builder' - [uv-types]='https://github.com/astral-sh/uv;ce37286814dbb802c422f0926487cfab7aefd2b7;uv-%commit%/crates/uv-types' - [uv-version]='https://github.com/astral-sh/uv;ce37286814dbb802c422f0926487cfab7aefd2b7;uv-%commit%/crates/uv-version' - [uv-virtualenv]='https://github.com/astral-sh/uv;ce37286814dbb802c422f0926487cfab7aefd2b7;uv-%commit%/crates/uv-virtualenv' - [uv-warnings]='https://github.com/astral-sh/uv;ce37286814dbb802c422f0926487cfab7aefd2b7;uv-%commit%/crates/uv-warnings' - [uv-workspace]='https://github.com/astral-sh/uv;ce37286814dbb802c422f0926487cfab7aefd2b7;uv-%commit%/crates/uv-workspace' - [version-ranges]='https://github.com/astral-sh/pubgrub;06ec5a5f59ffaeb6cf5079c6cb184467da06c9db;pubgrub-%commit%/version-ranges' -) - -RUST_MIN_VER="1.86.0" - -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 - CDLA-Permissive-2.0 ISC MIT MPL-2.0 Unicode-3.0 ZLIB BZIP2 -" -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/4595 - "${FILESDIR}/${P}-test.patch" - ) - - default - - # replace upstream crate substitution with our crate substitution, sigh - local pkg - for pkg in reqwest-middleware reqwest-retry version-ranges; do - local dep=$(grep "^${pkg}" "${ECARGO_HOME}"/config.toml || die) - sed -i -e "/\[patch\.crates-io\]/,\$s;^${pkg}.*$;${dep};" Cargo.toml || die - done - -} - -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 -} - -src_install() { - cd crates/pixi || die - cargo_src_install -}
