diff --git a/pkgs/by-name/wa/wash-cli/package.nix b/pkgs/by-name/wa/wash-cli/package.nix index 89375f733618..ca0455f62d50 100644 --- a/pkgs/by-name/wa/wash-cli/package.nix +++ b/pkgs/by-name/wa/wash-cli/package.nix @@ -1,51 +1,35 @@ { lib, - fetchCrate, + fetchFromGitHub, rustPlatform, - pkg-config, - openssl, - fetchurl, }: -let - wasiPreviewCommandComponentAdapter = fetchurl { - url = "https://github.com/bytecodealliance/wasmtime/releases/download/v22.0.0/wasi_snapshot_preview1.command.wasm"; - hash = "sha256-UVBFddlI0Yh1ZNs0b2jSnKsHvGGAS5U09yuwm8Q6lxw="; - }; - wasiPreviewReactorComponentAdapter = fetchurl { - url = "https://github.com/bytecodealliance/wasmtime/releases/download/v22.0.0/wasi_snapshot_preview1.reactor.wasm"; - hash = "sha256-oE53IRMZgysSWT7RhrpZJjdaIyzCRf0h4d1yjqj/PSk="; - }; - -in -rustPlatform.buildRustPackage rec { +rustPlatform.buildRustPackage (finalAttrs: { pname = "wash-cli"; - version = "0.39.0"; + version = "1.0.0-beta.10"; - src = fetchCrate { - inherit version pname; - hash = "sha256-qOxYBhwkcn4g1cUBHuF0AoecpxN4ukgTjBnzVhWtw7A="; + src = fetchFromGitHub { + owner = "wasmCloud"; + repo = "wash"; + tag = "wash-v${finalAttrs.version}"; + hash = "sha256-g1OXyxLSKicMz0mnTyHNmihtt5WMx91bNo83NhZpx9s="; }; - cargoHash = "sha256-dPHzRZh5jBxbPt+1a9wVbsBclAkfrcAXhpZgTw7e4Qo="; + cargoHash = "sha256-/Dah1F3pJBqtrCw7iVRGidQUl8rmD31Eoqva9ejc1iw="; - nativeBuildInputs = [ pkg-config ]; + checkFlags = [ + # Requires internet access + "--skip=test_end_to_end_template_to_execution" + "--skip=test_plugin_test_inspect_comprehensive" + "--skip=test_pull_and_validate_ghcr_component" + ]; - buildInputs = [ openssl ]; - - preBuild = " - export WASI_PREVIEW1_COMMAND_COMPONENT_ADAPTER=${wasiPreviewCommandComponentAdapter} - export WASI_PREVIEW1_REACTOR_COMPONENT_ADAPTER=${wasiPreviewReactorComponentAdapter} - "; - - # Tests require the internet and don't work when running in nix - doCheck = false; - - meta = with lib; { - description = "wasmCloud Shell (wash) CLI tool"; - homepage = "https://wasmcloud.com/"; + meta = { + description = "Command-line tool for developing, building, and managing WebAssembly components"; + homepage = "https://github.com/wasmCloud/wash"; + changelog = "https://github.com/wasmCloud/wash/releases/tag/wash-v${finalAttrs.version}"; mainProgram = "wash"; - license = licenses.asl20; - maintainers = with maintainers; [ bloveless ]; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ bloveless ]; }; -} +})