diff options
author | Cathal Mullan <contact@cathal.dev> | 2023-08-30 14:31:57 +0100 |
---|---|---|
committer | Cathal Mullan <contact@cathal.dev> | 2023-08-30 14:31:57 +0100 |
commit | 38e5440ae42a06d0be5000d298e6c4acde176cda (patch) | |
tree | 902391d3f350417d2d2afe978cde90c4a8f27ab2 | |
parent | 53bbb203e013e8fbbcddd9f205e73674475f129a (diff) |
dioxus-cli: 0.3.2 -> 0.4.0
-rw-r--r-- | pkgs/development/tools/rust/dioxus-cli/default.nix | 40 | ||||
-rw-r--r-- | pkgs/top-level/all-packages.nix | 4 |
2 files changed, 30 insertions, 14 deletions
diff --git a/pkgs/development/tools/rust/dioxus-cli/default.nix b/pkgs/development/tools/rust/dioxus-cli/default.nix index def31b1ce4780..fbe1a6a3b7306 100644 --- a/pkgs/development/tools/rust/dioxus-cli/default.nix +++ b/pkgs/development/tools/rust/dioxus-cli/default.nix @@ -1,29 +1,47 @@ -{ lib, fetchCrate, rustPlatform, openssl, pkg-config, cacert, stdenv, CoreServices }: +{ lib +, stdenv +, fetchCrate +, rustPlatform +, pkg-config +, cacert +, openssl +, darwin +}: + rustPlatform.buildRustPackage rec { pname = "dioxus-cli"; - version = "0.3.2"; + version = "0.4.0"; src = fetchCrate { inherit pname version; - sha256 = "sha256-8S8zUOb2oiXbJQRgY/g9H2+EW+wWOQugr8+ou34CYPg="; + hash = "sha256-4BIuD/rrA398hPEoNt5PwWylPAR0fA1UKc90xyH5Fd0="; }; + cargoHash = "sha256-ok+fjvwz4k0/M5j7wut2A2AK6tuO3UfZtgoCXaCaHXY="; + nativeBuildInputs = [ pkg-config cacert ]; - buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ CoreServices ]; + buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ + darwin.apple_sdk.frameworks.CoreServices + ]; - cargoSha256 = "sha256-sCP8njwYA29XmYu2vfuog0NCL1tZlsZiupkDVImrYCE="; + OPENSSL_NO_VENDOR = 1; checkFlags = [ - # these tests require dioxous binary in PATH, - # can be removed after: https://github.com/DioxusLabs/dioxus/pull/1138 - "--skip=cli::autoformat::spawn_properly" - "--skip=cli::translate::generates_svgs" + # requires network access + "--skip=server::web::proxy::test::add_proxy" + "--skip=server::web::proxy::test::add_proxy_trailing_slash" ]; + doInstallCheck = true; + installCheckPhase = '' + $out/bin/dx --version | grep "dioxus ${version}" + ''; + meta = with lib; { - description = "CLI tool for developing, testing, and publishing Dioxus apps"; homepage = "https://dioxuslabs.com"; + description = "CLI tool for developing, testing, and publishing Dioxus apps"; license = with licenses; [ mit asl20 ]; - maintainers = with maintainers; [ xanderio ]; + maintainers = with maintainers; [ xanderio cathalmullan ]; + mainProgram = "dx"; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3e58d68f01b84..9cd44d1fb4a49 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -19177,9 +19177,7 @@ with pkgs; dive = callPackage ../development/tools/dive { }; - dioxus-cli = callPackage ../development/tools/rust/dioxus-cli { - inherit (darwin.apple_sdk.frameworks) CoreServices; - }; + dioxus-cli = callPackage ../development/tools/rust/dioxus-cli { }; doclifter = callPackage ../development/tools/misc/doclifter { }; |