From 185927ab08e7b336890376c57db0cbc31aedb638 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 17 Jul 2023 03:40:39 +0000 Subject: [PATCH 1/2] ast-grep: 0.8.0 -> 0.9.0 --- pkgs/development/tools/misc/ast-grep/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/misc/ast-grep/default.nix b/pkgs/development/tools/misc/ast-grep/default.nix index 35ec0cb05ed4..e1e559dea712 100644 --- a/pkgs/development/tools/misc/ast-grep/default.nix +++ b/pkgs/development/tools/misc/ast-grep/default.nix @@ -6,16 +6,16 @@ rustPlatform.buildRustPackage rec { pname = "ast-grep"; - version = "0.8.0"; + version = "0.9.0"; src = fetchFromGitHub { owner = "ast-grep"; repo = "ast-grep"; rev = version; - hash = "sha256-jLb2xMrsBuw+ty1S4X+YdvPfiDyDUuLdJH5dw+e+9Pk="; + hash = "sha256-6gKskJbKo1mVVRzojfGuGTsGCV/r+8hw7r1v4ufSa+A="; }; - cargoHash = "sha256-ayzR0LjKPXWgtMFznjDDFJM4Ef2HW1HK8aOCcDiwvAA="; + cargoHash = "sha256-5Xj/V9XKd5neNZh9LaFrQ48Us42+e2f5UhMNA1RaQSE="; # error: linker `aarch64-linux-gnu-gcc` not found postPatch = '' From 05a98f74c7d8cc6001b95553450a44691a0f34c9 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Mon, 17 Jul 2023 04:20:00 +0000 Subject: [PATCH 2/2] ast-grep: 0.9.0 -> 0.9.1 Diff: https://github.com/ast-grep/ast-grep/compare/0.9.0...0.9.1 Changelog: https://github.com/ast-grep/ast-grep/blob/0.9.1/CHANGELOG.md --- pkgs/development/tools/misc/ast-grep/default.nix | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/pkgs/development/tools/misc/ast-grep/default.nix b/pkgs/development/tools/misc/ast-grep/default.nix index e1e559dea712..dd50ba906787 100644 --- a/pkgs/development/tools/misc/ast-grep/default.nix +++ b/pkgs/development/tools/misc/ast-grep/default.nix @@ -6,26 +6,25 @@ rustPlatform.buildRustPackage rec { pname = "ast-grep"; - version = "0.9.0"; + version = "0.9.1"; src = fetchFromGitHub { owner = "ast-grep"; repo = "ast-grep"; rev = version; - hash = "sha256-6gKskJbKo1mVVRzojfGuGTsGCV/r+8hw7r1v4ufSa+A="; + hash = "sha256-gAzO5ganbwxarqHGVhAl9PtiHEr89puoPJK+iXtrvyU="; }; - cargoHash = "sha256-5Xj/V9XKd5neNZh9LaFrQ48Us42+e2f5UhMNA1RaQSE="; + cargoHash = "sha256-SvGxDXC1nN6LitWHGcVieHJpEEuY1omqAvjaJmHPauE="; # error: linker `aarch64-linux-gnu-gcc` not found postPatch = '' rm .cargo/config.toml ''; - checkFlags = lib.optionals (stdenv.isx86_64 && stdenv.isDarwin) [ - # fails on emulated x86_64-darwin - # mach-o file, but is an incompatible architecture (have 'arm64', need 'x86_64') - "--skip=test::test_load_parser" + checkFlags = [ + # disable flaky test + "--skip=test::test_load_parser_mac" ]; meta = with lib; {