* [gentoo-commits] repo/gentoo:master commit in: dev-util/pixi/
@ 2025-04-14 8:12 Michał Górny
0 siblings, 0 replies; 2+ messages in thread
From: Michał Górny @ 2025-04-14 8:12 UTC (permalink / raw
To: gentoo-commits
commit: fe4baa0c7231b52ab0f82e33f7783b0e0191897d
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Mon Apr 14 08:12:05 2025 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Mon Apr 14 08:12:20 2025 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fe4baa0c
dev-util/pixi: Add rustls support
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
dev-util/pixi/metadata.xml | 3 +++
dev-util/pixi/pixi-0.45.0.ebuild | 5 +++--
2 files changed, 6 insertions(+), 2 deletions(-)
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
index c56237d37eec..48ca33f8f489 100644
--- a/dev-util/pixi/pixi-0.45.0.ebuild
+++ b/dev-util/pixi/pixi-0.45.0.ebuild
@@ -81,12 +81,13 @@ LICENSE+="
"
SLOT="0"
KEYWORDS="~amd64"
+IUSE="+rustls"
RDEPEND="
app-arch/bzip2:=
app-arch/xz-utils:=
app-arch/zstd:=
- dev-libs/openssl:=
+ !rustls? ( dev-libs/openssl:= )
"
src_prepare() {
@@ -103,7 +104,7 @@ src_prepare() {
src_configure() {
local myfeatures=(
- native-tls
+ $(usex rustls rustls-tls native-tls)
)
cargo_src_configure --no-default-features
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-util/pixi/
@ 2025-04-23 5:35 Michał Górny
0 siblings, 0 replies; 2+ messages in thread
From: Michał Górny @ 2025-04-23 5:35 UTC (permalink / raw
To: gentoo-commits
commit: 7380378ccd202b58deb6b35ae429f79b25ea74ed
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Wed Apr 23 05:02:27 2025 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Wed Apr 23 05:21:57 2025 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7380378c
dev-util/pixi: Bump to 0.46.0
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
dev-util/pixi/Manifest | 2 +
dev-util/pixi/pixi-0.46.0.ebuild | 125 +++++++++++++++++++++++++++++++++++++++
2 files changed, 127 insertions(+)
diff --git a/dev-util/pixi/Manifest b/dev-util/pixi/Manifest
index 0692a2e3ab23..219abb09ba2b 100644
--- a/dev-util/pixi/Manifest
+++ b/dev-util/pixi/Manifest
@@ -2,6 +2,8 @@ DIST pixi-0.39.5-crates.tar.xz 48798324 BLAKE2B 0ae0d903dab4d35cf71b9dc32c8c4221
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 pixi-0.46.0-crates.tar.xz 72079412 BLAKE2B aebe04adbff588bbb9d556561f8658829cb0a08295db10df5d4e5d33706a21ea28f779bd50cd5efc6537a08bb70d72bb6931d4609e6e7ce8df7b4382e3fa533f SHA512 27648e54e88d94a239291dd551770b508e48bc791972fc1e9b06499ae0b09cabbe868bdc2b10eea1f1b97a78812b847ee821620d070b65d7e1cb29ee649b60b1
+DIST pixi-0.46.0.tar.gz 7924657 BLAKE2B ee854a4c4abecbffd98ad28601262c399c8287f3274460131d5942790ad9ab9b6c837f5a6b4b77121eeaba50252ae66c17aa7c1401374834ad3cb30dcc6103a8 SHA512 615bbf93379129639a69a5efa235fd59619b237224a194a9418667af5716e1499ec35015444b380d20eae6fb06a8284868264887afc5bd31536adf6debaeeb5a
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
diff --git a/dev-util/pixi/pixi-0.46.0.ebuild b/dev-util/pixi/pixi-0.46.0.ebuild
new file mode 100644
index 000000000000..d1c17e6b417e
--- /dev/null
+++ b/dev-util/pixi/pixi-0.46.0.ebuild
@@ -0,0 +1,125 @@
+# 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() {
+ 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
+}
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2025-04-23 5:35 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2025-04-23 5:35 [gentoo-commits] repo/gentoo:master commit in: dev-util/pixi/ Michał Górny
-- strict thread matches above, loose matches on Subject: below --
2025-04-14 8:12 Michał Górny
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox