Merge pull request #245819 from figsoda/component

cargo-component: unstable-2023-07-05 -> unstable-2023-07-28
This commit is contained in:
Nick Cao 2023-07-27 22:58:33 -06:00 committed by GitHub
commit 2472f040b9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 409 additions and 1634 deletions

File diff suppressed because it is too large Load Diff

View File

@ -1,47 +1,38 @@
{ lib { lib
, rustPlatform , rustPlatform
, fetchFromGitHub , fetchFromGitHub
, curl
, pkg-config , pkg-config
, libgit2
, openssl , openssl
, zlib
, stdenv , stdenv
, darwin , darwin
}: }:
rustPlatform.buildRustPackage { rustPlatform.buildRustPackage {
pname = "cargo-component"; pname = "cargo-component";
version = "unstable-2023-07-05"; version = "unstable-2023-07-28";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "bytecodealliance"; owner = "bytecodealliance";
repo = "cargo-component"; repo = "cargo-component";
rev = "84ad1dc2c383dd3335953f9d1b059aeef9a5833e"; rev = "b58f10c867f666c1c799b766fb8cd1941ede8ed7";
hash = "sha256-C066dXuGpl9bwKRh5kgN0DOjaEke84cj5ustYrM867I="; hash = "sha256-BwrbenOg+Q6BAy/Mn8AHB0VvvIZ0cYvq4r791QEFTdo=";
}; };
cargoLock = { cargoLock = {
lockFile = ./Cargo.lock; lockFile = ./Cargo.lock;
outputHashes = { outputHashes = {
"warg-api-0.1.0" = "sha256-ElLwaOv0ifi8og2SJ6XZkjZX83IXoveicAUPBok/MLE="; "warg-api-0.1.0" = "sha256-A5FQ/nbuzV8ockV6vOMKUEoJKeaId3oyZU1QeNpd1Zc=";
}; };
}; };
nativeBuildInputs = [ nativeBuildInputs = [
curl
pkg-config pkg-config
]; ];
buildInputs = [ buildInputs = [
curl
libgit2
openssl openssl
zlib
] ++ lib.optionals stdenv.isDarwin [ ] ++ lib.optionals stdenv.isDarwin [
darwin.apple_sdk.frameworks.Security darwin.apple_sdk.frameworks.Security
] ++ lib.optionals (stdenv.isDarwin && stdenv.isx86_64) [
darwin.apple_sdk.frameworks.CoreFoundation
]; ];
# requires the wasm32-wasi target # requires the wasm32-wasi target