From da4405bf30642d8c7e93d4ed9f1aa66c68c8e3d2 Mon Sep 17 00:00:00 2001 From: W1M0R Date: Mon, 15 Jul 2024 11:07:26 +0200 Subject: [PATCH 1/4] Add Pixi --- .prototools | 2 ++ README.md | 1 + pixi/README.md | 21 +++++++++++++++++++++ pixi/plugin.toml | 17 +++++++++++++++++ 4 files changed, 41 insertions(+) create mode 100644 pixi/README.md create mode 100644 pixi/plugin.toml diff --git a/.prototools b/.prototools index 81f18ba..da05556 100644 --- a/.prototools +++ b/.prototools @@ -25,6 +25,7 @@ ninja = "1.11.1" octopus = "2.2.1" oxlint = "0.2.12" pact_verifier_cli = "1.1.1" +pixi = "0.25.0" rattler-build = "0.13.0" ruff = "0.3.0" shellcheck = "0.10.0" @@ -61,6 +62,7 @@ ninja = "source:ninja/plugin.toml" octopus = "source:octopus/plugin.toml" oxlint = "source:oxlint/plugin.toml" pact_verifier_cli = "source:pact_verifier_cli/plugin.toml" +pixi = "source:pixi/plugin.toml" rattler-build = "source:rattler-build/plugin.toml" ruff = "source:ruff/plugin.toml" shellcheck = "source:shellcheck/plugin.toml" diff --git a/README.md b/README.md index 935ae20..3fd5681 100644 --- a/README.md +++ b/README.md @@ -28,6 +28,7 @@ A growing collection of proto TOML plugins. - [oxlint](oxlint/README.md) - [Octopus CLI](octopus/README.md) - [Pact Verifier CLI](pact_verifier_cli/README.md) +- [Pixi](pixi/README.md) - [rattler-build](rattler-build/README.md) - [Ruff](ruff/README.md) - [ShellCheck](shellcheck/README.md) diff --git a/pixi/README.md b/pixi/README.md new file mode 100644 index 0000000..d4b2cff --- /dev/null +++ b/pixi/README.md @@ -0,0 +1,21 @@ +# pixi plugin + +[pixi](https://github.com/prefix-dev/pixi) plugin for [proto](https://github.com/moonrepo/proto). + +## Installation + +This is a community plugin and is thus not built-in to proto. In order to use it, first either add it to your global or project-based `.prototools` by running: + +### Global install + +```shell +proto plugin add pixi "source:https://raw.githubusercontent.com/Phault/proto-toml-plugins/main/pixi/plugin.toml" --global +proto install pixi +``` + +### Per-project install + +```shell +proto plugin add pixi "source:https://raw.githubusercontent.com/Phault/proto-toml-plugins/main/pixi/plugin.toml" +proto pin pixi latest --resolve +``` diff --git a/pixi/plugin.toml b/pixi/plugin.toml new file mode 100644 index 0000000..f799325 --- /dev/null +++ b/pixi/plugin.toml @@ -0,0 +1,17 @@ +name = "pixi" +type = "cli" + +[resolve] +git-url = "https://github.com/prefix-dev/pixi" + +[platform.linux] +download-file = "pixi-{arch}-unknown-linux-musl.tar.gz" + +[platform.macos] +download-file = "pixi-{arch}-apple-darwin.tar.gz" + +[platform.windows] +download-file = "pixi-{arch}-pc-windows-msvc.zip" + +[install] +download-url = "https://github.com/prefix-dev/pixi/releases/download/v{version}/{download_file}" From f181e13bf3f0ae09f333975386d3fd4d7298566a Mon Sep 17 00:00:00 2001 From: W1M0R Date: Mon, 15 Jul 2024 11:15:02 +0200 Subject: [PATCH 2/4] Add Pixi libc --- pixi/plugin.toml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pixi/plugin.toml b/pixi/plugin.toml index f799325..d59c51c 100644 --- a/pixi/plugin.toml +++ b/pixi/plugin.toml @@ -5,7 +5,7 @@ type = "cli" git-url = "https://github.com/prefix-dev/pixi" [platform.linux] -download-file = "pixi-{arch}-unknown-linux-musl.tar.gz" +download-file = "pixi-{arch}-unknown-linux-{libc}.tar.gz" [platform.macos] download-file = "pixi-{arch}-apple-darwin.tar.gz" @@ -15,3 +15,7 @@ download-file = "pixi-{arch}-pc-windows-msvc.zip" [install] download-url = "https://github.com/prefix-dev/pixi/releases/download/v{version}/{download_file}" + +[install.libc] +gnu = "" +musl = "-musl" From b2a716804bfa1255bcbd0e3d89a0f1c88de00e0d Mon Sep 17 00:00:00 2001 From: W1M0R Date: Mon, 15 Jul 2024 11:16:32 +0200 Subject: [PATCH 3/4] Fix Pixi libc --- pixi/plugin.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pixi/plugin.toml b/pixi/plugin.toml index d59c51c..f6f40d3 100644 --- a/pixi/plugin.toml +++ b/pixi/plugin.toml @@ -5,7 +5,7 @@ type = "cli" git-url = "https://github.com/prefix-dev/pixi" [platform.linux] -download-file = "pixi-{arch}-unknown-linux-{libc}.tar.gz" +download-file = "pixi-{arch}-unknown-linux{libc}.tar.gz" [platform.macos] download-file = "pixi-{arch}-apple-darwin.tar.gz" From 1577a23f5fdd1e11e3d6c498df0c2e78ba9fa0b5 Mon Sep 17 00:00:00 2001 From: W1M0R Date: Mon, 15 Jul 2024 11:24:19 +0200 Subject: [PATCH 4/4] Revert Pixi libc (it only has a musl build on Linux) --- pixi/plugin.toml | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/pixi/plugin.toml b/pixi/plugin.toml index f6f40d3..f799325 100644 --- a/pixi/plugin.toml +++ b/pixi/plugin.toml @@ -5,7 +5,7 @@ type = "cli" git-url = "https://github.com/prefix-dev/pixi" [platform.linux] -download-file = "pixi-{arch}-unknown-linux{libc}.tar.gz" +download-file = "pixi-{arch}-unknown-linux-musl.tar.gz" [platform.macos] download-file = "pixi-{arch}-apple-darwin.tar.gz" @@ -15,7 +15,3 @@ download-file = "pixi-{arch}-pc-windows-msvc.zip" [install] download-url = "https://github.com/prefix-dev/pixi/releases/download/v{version}/{download_file}" - -[install.libc] -gnu = "" -musl = "-musl"