Unverified Commit 83574859 authored by dish's avatar dish Committed by GitHub
Browse files

topiary: 0.6.0 -> 0.6.1 (#435655)

parents 42a996a4 73d3b32c
Loading
Loading
Loading
Loading
+29 −7
Original line number Diff line number Diff line
@@ -8,22 +8,21 @@
  versionCheckHook,
  nix-update-script,
}:

rustPlatform.buildRustPackage rec {
  pname = "topiary";
  version = "0.6.0";
  version = "0.6.1";

  src = fetchFromGitHub {
    owner = "tweag";
    repo = "topiary";
    tag = "v${version}";
    hash = "sha256-nRVxjdEtYvgF8Vpw0w64hUd1scZh7f+NjFtbTg8L5Qc=";
    hash = "sha256-CyqZhkzAOqC3xWhwUzCpkDO0UFsO0S4/3sV7zIILiVg=";
  };

  nativeBuildInputs = [ installShellFiles ];
  nativeInstallCheckInputs = [ versionCheckHook ];

  cargoHash = "sha256-EqalIF1wx3F/5CiD21IaYsPdks6Mv1VfwL8OTRWsWaU=";
  cargoHash = "sha256-akAjn9a7dMwjPSNveDY2KJ62evjHCAWpRR3A7Ghkb5A=";

  # https://github.com/NixOS/nixpkgs/pull/359145#issuecomment-2542418786
  depsExtraArgs.postBuild = ''
@@ -42,6 +41,31 @@ rustPlatform.buildRustPackage rec {

  # Skip tests that cannot be executed in sandbox (operation not permitted)
  checkFlags = [
    "--skip=formatted_query_tester"
    "--skip=test_coverage::coverage_input_bash"
    "--skip=test_coverage::coverage_input_css"
    "--skip=test_coverage::coverage_input_json"
    "--skip=test_coverage::coverage_input_nickel"
    "--skip=test_coverage::coverage_input_ocaml"
    "--skip=test_coverage::coverage_input_ocamllex"
    "--skip=test_coverage::coverage_input_openscad"
    "--skip=test_coverage::coverage_input_sdml"
    "--skip=test_coverage::coverage_input_toml"
    "--skip=test_coverage::coverage_input_tree_sitter_query"
    "--skip=test_coverage::coverage_input_wit"
    "--skip=test_fmt::fmt_input_bash"
    "--skip=test_fmt::fmt_input_css"
    "--skip=test_fmt::fmt_input_json"
    "--skip=test_fmt::fmt_input_nickel"
    "--skip=test_fmt::fmt_input_ocaml"
    "--skip=test_fmt::fmt_input_ocaml_interface"
    "--skip=test_fmt::fmt_input_ocamllex"
    "--skip=test_fmt::fmt_input_openscad"
    "--skip=test_fmt::fmt_input_sdml"
    "--skip=test_fmt::fmt_input_toml"
    "--skip=test_fmt::fmt_input_tree_sitter_query"
    "--skip=test_fmt::fmt_input_wit"
    "--skip=test_fmt::fmt_queries"
    "--skip=test_fmt_dir"
    "--skip=test_fmt_files"
    "--skip=test_fmt_files_query_fallback"
@@ -50,9 +74,7 @@ rustPlatform.buildRustPackage rec {
    "--skip=test_fmt_stdin_query"
    "--skip=test_fmt_stdin_query_fallback"
    "--skip=test_vis"
    "--skip=formatted_query_tester"
    "--skip=input_output_tester"
    "--skip=coverage_tester"
    "--skip=test_vis_invalid"
  ];

  env.TOPIARY_LANGUAGE_DIR = "${placeholder "out"}/share/queries";