From b86693601efc6dfbcbc185fee6eec1798408c1fc Mon Sep 17 00:00:00 2001 From: rina Date: Mon, 23 Feb 2026 15:50:42 +1000 Subject: [PATCH 1/2] bnfc-treesitter: init https://www.github.com/BNFC/bnfc/pull/533 --- overlay.nix | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/overlay.nix b/overlay.nix index 4c254c4b..b3238374 100644 --- a/overlay.nix +++ b/overlay.nix @@ -123,6 +123,21 @@ let remill = prev.callPackage ./llvm-translator/remill.nix { xed = final.xed2022; llvmPackages = final.llvmPackages_17; }; sleigh = prev.callPackage ./llvm-translator/sleigh.nix { }; + bnfc-treesitter = prev.lib.pipe prev.haskellPackages.BNFC [ + (prev.haskell.lib.compose.overrideSrc { + src = prev.fetchFromGitHub { + owner = "rina-forks"; + repo = "bnfc"; + rev = "4810a26"; + hash = "sha256-kMag8MpQPt9eT7YBXcyQSr3FkQsolvTgu5gDEUvZHVM="; + }; + version = "2.9.6.2-treesitter"; + }) + (prev.haskell.lib.compose.overrideCabal (drv: { + postPatch = "cd source"; + })) + ]; + _overlay = overlay; }; in From 301f1e4fe25d38067603c7746bcb0d86489329e0 Mon Sep 17 00:00:00 2001 From: rina Date: Mon, 23 Feb 2026 15:59:14 +1000 Subject: [PATCH 2/2] ci: add bnfc-treesitter --- .github/workflows/main.yml | 3 ++- .github/workflows/update.yml | 2 +- update.py | 1 + 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index ccda3f05..649e72da 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -38,7 +38,8 @@ jobs: retdec-uq-pac, asl-translator, gtirb-semantics, ddisasm, retdec5, remill, alive2-aslp, alive2-regehr, - aslp_web, godbolt, aslp-server, aslp_offline + aslp_web, godbolt, aslp-server, aslp_offline, + bnfc-treesitter, ] runs-on: ${{ matrix.os }} diff --git a/.github/workflows/update.yml b/.github/workflows/update.yml index f98fda6e..53c5457c 100644 --- a/.github/workflows/update.yml +++ b/.github/workflows/update.yml @@ -17,7 +17,7 @@ jobs: matrix: pkg: [asli, bap-asli-plugin, bap-primus, basil, gtirb-semantics, asl-translator, alive2-aslp, alive2-regehr, aslp_web, compiler-explorer, - aslp-cpp, aslp-server, aslp_client_server_ocaml + aslp-cpp, aslp-server, aslp_client_server_ocaml, bnfc-treesitter ] runs-on: ubuntu-24.04 diff --git a/update.py b/update.py index 1ff01aee..3ad0de40 100755 --- a/update.py +++ b/update.py @@ -96,6 +96,7 @@ class Args: Package('aslp-server', 'UQ-PAC/aslp-rpc'), Package('aslp-cpp', 'UQ-PAC/aslp-rpc'), Package('aslp_client_server_ocaml', 'UQ-PAC/aslp-rpc'), + Package('bnfc-treesitter', 'rina-forks/bnfc', 'matches-empty-merge'), Package('compiler-explorer', 'rina-forks/compiler-explorer', 'basil-new'), # XXX: not in ci! ] # NOTE: also change files in ./.github/workflows/*.yml