From 8adca6200209996518695eae93af7293b4eec876 Mon Sep 17 00:00:00 2001
From: Tom Willemse <tom@ryuslash.org>
Date: Fri, 24 Jan 2025 09:07:49 -0800
Subject: [PATCH] tree-sitter-php: Upgrade to v0.21.1

---
 oni/packages/emacs.scm | 29 ++++++++++++++++++++++++++---
 1 file changed, 26 insertions(+), 3 deletions(-)

diff --git a/oni/packages/emacs.scm b/oni/packages/emacs.scm
index 3d0e3be..2d8dd23 100644
--- a/oni/packages/emacs.scm
+++ b/oni/packages/emacs.scm
@@ -11,9 +11,8 @@
   #:use-module ((gnu packages mail)
                 #:select (notmuch))
   #:use-module (gnu packages ruby)
-  #:use-module ((gnu packages tree-sitter)
-                #:select (tree-sitter-php))
-  #:use-module (rosenthal packages tree-sitter))
+  #:use-module (rosenthal packages tree-sitter)
+  #:use-module (guix build-system tree-sitter))
 
 (define-public emacs-ace-link-notmuch
   (let ((commit "fb09673881ef0f7b7ad744c576a19f578df7c51d")
@@ -666,6 +665,30 @@ new-theme for a while. I couldn't think of a name so I named it after him.")
       (description "Add TODO, FIXME, etc highlighting in comments and strings.")
       (license license:gpl3+))))
 
+(define-public tree-sitter-php
+  ;; There are a lot of additions, the last tag was placed more than 1 year ago
+  (let ((commit "29a49d3a53353444ee2226e2efa140fec69dd3e0")
+        (revision "0"))
+    (package
+      (name "tree-sitter-php")
+      (version (git-version "0.21.1" revision commit))
+      (home-page "https://github.com/tree-sitter/tree-sitter-php")
+      (source (origin
+                (method git-fetch)
+                (uri (git-reference
+                      (url "https://github.com/tree-sitter/tree-sitter-php")
+                      (commit commit)))
+                (file-name (git-file-name "tree-sitter-php" version))
+                (sha256 (base32 "1y5blblzsr6f5hvmgfk49l45fx5lzbrr1p1jsx5cxzygf03r9lnz"))
+                (snippet
+                 ((@@ (gnu packages tree-sitter) tree-sitter-delete-generated-files) '("php")))))
+      (build-system tree-sitter-build-system)
+      (arguments (list #:grammar-directories '("php")
+                       #:tests? #f))
+      (synopsis "Tree-sitter PHP grammar")
+      (description "This package provides a Tree-sitter PHP grammar for the Tree-sitter library.")
+      (license license:expat))))
+
 (define-public emacs-php-ts-mode
   (let ((commit "4e266dc4462b836b90437dc7a4d3c8f4dac89c4a")
         (revision "0"))