Unverified Commit ca2e8e14 authored by Weijia Wang's avatar Weijia Wang Committed by GitHub
Browse files

Merge pull request #252347 from CathalMullan/dioxus-cli-v0.4.0

dioxus-cli: 0.3.2 -> 0.4.0
parents 77cb27d0 38e5440a
Loading
Loading
Loading
Loading
+29 −11
Original line number Diff line number Diff line
{ 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";
  };
}
+1 −3
Original line number Diff line number Diff line
@@ -19220,9 +19220,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 { };