dioxus-cli: 0.6.3 -> 0.7.1 (#407060)

This commit is contained in:
Sandro
2025-11-14 00:20:14 +00:00
committed by GitHub
2 changed files with 38 additions and 43 deletions

View File

@@ -1,11 +0,0 @@
--- a/src/build/bundle.rs
+++ b/src/build/bundle.rs
@@ -334,7 +334,7 @@ impl AppBundle {
// Only run wasm-opt if the feature is enabled
// Wasm-opt has an expensive build script that makes it annoying to keep enabled for iterative dev
// We put it behind the "wasm-opt" feature flag so that it can be disabled when iterating on the cli
- self.run_wasm_opt(&self.build.exe_dir())?;
+ self.run_wasm_opt(&self.build.wasm_bindgen_out_dir())?;
// Write the index.html file with the pre-configured contents we got from pre-rendering
std::fs::write(

View File

@@ -1,77 +1,83 @@
{ {
lib, lib,
stdenv,
fetchCrate, fetchCrate,
rustPlatform, rustPlatform,
pkg-config, pkg-config,
rustfmt,
cacert, cacert,
openssl, openssl,
rustfmt,
nix-update-script, nix-update-script,
testers, testers,
dioxus-cli, dioxus-cli,
withTelemetry ? false,
}: }:
rustPlatform.buildRustPackage rec { rustPlatform.buildRustPackage (finalAttrs: {
pname = "dioxus-cli"; pname = "dioxus-cli";
version = "0.6.3"; version = "0.7.1";
src = fetchCrate { src = fetchCrate {
inherit pname version; pname = "dioxus-cli";
hash = "sha256-wuIJq+UN1q5qYW4TXivq93C9kZiPHwBW5Ty2Vpik2oY="; version = finalAttrs.version;
hash = "sha256-tPymoJJvz64G8QObLkiVhnW0pBV/ABskMdq7g7o9f1A=";
}; };
cargoHash = "sha256-L9r/nJj0Rz41mg952dOgKxbDS5u4zGEjSA3EhUHfGIk="; cargoHash = "sha256-mgscu6mJWinB8WXLnLNq/JQnRpHRJKMQXnMwECz1vwc=";
cargoPatches = [
# TODO: Remove once https://github.com/DioxusLabs/dioxus/issues/3659 is fixed upstream.
./fix-wasm-opt-target-dir.patch
];
buildFeatures = [ buildFeatures = [
"no-downloads" "no-downloads"
"optimizations" ]
]; ++ lib.optional (!withTelemetry) "disable-telemetry";
env = {
OPENSSL_NO_VENDOR = 1;
};
nativeBuildInputs = [ nativeBuildInputs = [
pkg-config pkg-config
cacert cacert
]; ];
buildInputs = [ openssl ]; buildInputs = [
openssl
];
OPENSSL_NO_VENDOR = 1; nativeCheckInputs = [
rustfmt
# wasm-opt-sys build.rs tries to verify C++17 support, but the check appears to be faulty. ];
postPatch = ''
substituteInPlace $cargoDepsCopy/wasm-opt-sys-*/build.rs \
--replace-fail 'check_cxx17_support()?;' '// check_cxx17_support()?;'
'';
nativeCheckInputs = [ rustfmt ];
checkFlags = [ checkFlags = [
# requires network access # requires network access
"--skip=serve::proxy::test" "--skip=serve::proxy::test"
"--skip=wasm_bindgen::test" # requires monorepo structure and mobile toolchains
"--skip=test_harnesses::run_harness"
]; ];
passthru = { passthru = {
updateScript = nix-update-script { }; updateScript = nix-update-script { };
tests.version = testers.testVersion { package = dioxus-cli; }; tests = {
version = testers.testVersion {
package = dioxus-cli;
};
withTelemetry = dioxus-cli.override {
withTelemetry = true;
};
};
}; };
meta = with lib; { meta = {
homepage = "https://dioxuslabs.com"; description = "CLI for building fullstack web, desktop, and mobile apps with a single codebase.";
description = "CLI tool for developing, testing, and publishing Dioxus apps"; homepage = "https://dioxus.dev";
changelog = "https://github.com/DioxusLabs/dioxus/releases"; changelog = "https://github.com/DioxusLabs/dioxus/releases";
license = with licenses; [ license = with lib.licenses; [
mit mit
asl20 asl20
]; ];
maintainers = with maintainers; [ maintainers = with lib.maintainers; [
xanderio xanderio
cathalmullan cathalmullan
]; ];
platforms = lib.platforms.all;
mainProgram = "dx"; mainProgram = "dx";
}; };
} })