Message ID | 939be50b16ae64b86c66b5a1c91115bb5ef0ef5e.1692539095.git.hako@ultrarare.space |
---|---|
State | New |
Headers | show |
Series | Update tree-sitter{, -{bash, c{, pp, -sharp}, go, java, {java, type}script, python, rust}}, | expand |
Hilton Chain via Guix-patches via <guix-patches@gnu.org> writes: > (define-public tree-sitter-javascript > + ;; Required by tree-sitter-typescript. > + (let ((commit "7a29d06274b7cf87d643212a433d970b73969016") > + (revision "14")) I'd use revision 0 or 1 to start with. > (tree-sitter-grammar > "javascript" "JavaScript(JSX)" > - "175yrk382n2di0c2xn4gpv8y4n83x1lg4hqn04vabf0yqynlkq67" > - "0.20.0" > - #:commit "rust-0.20.0")) > + "1pk6d9g6a7bzhxmwnvfiycarcgz76wq2rgfqr0xjh7y7swfw5hvw" > + (git-version "0.20.0" revision commit) > + #:commit commit)))
On Wed, 27 Sep 2023 18:42:28 +0800, Christopher Baines wrote: > > [1 <text/plain (7bit)>] > > Hilton Chain via Guix-patches via <guix-patches@gnu.org> writes: > > > (define-public tree-sitter-javascript > > + ;; Required by tree-sitter-typescript. > > + (let ((commit "7a29d06274b7cf87d643212a433d970b73969016") > > + (revision "14")) > > I'd use revision 0 or 1 to start with. I usually obtain the revision number from the output of 'git describe --tags', I think it's fine to use it when available.
diff --git a/gnu/packages/tree-sitter.scm b/gnu/packages/tree-sitter.scm index 27ac89ed21..53e2120207 100644 --- a/gnu/packages/tree-sitter.scm +++ b/gnu/packages/tree-sitter.scm @@ -314,17 +314,20 @@ (define-public tree-sitter-html "0.19.0")) (define-public tree-sitter-javascript + ;; Required by tree-sitter-typescript. + (let ((commit "7a29d06274b7cf87d643212a433d970b73969016") + (revision "14")) (tree-sitter-grammar "javascript" "JavaScript(JSX)" - "175yrk382n2di0c2xn4gpv8y4n83x1lg4hqn04vabf0yqynlkq67" - "0.20.0" - #:commit "rust-0.20.0")) + "1pk6d9g6a7bzhxmwnvfiycarcgz76wq2rgfqr0xjh7y7swfw5hvw" + (git-version "0.20.0" revision commit) + #:commit commit))) (define-public tree-sitter-typescript (tree-sitter-grammar "typescript" "TypeScript and TSX" - "07fl9d968lal0aqj4f0n16p3n94cjkgfp54wynfr8gbdkjss5v5x" - "0.20.1" + "0934c35as3wgakqw20ilii8lvby5ns36mmqsxjwz8zg5zfsq14vj" + "0.20.2" #:inputs (list tree-sitter-javascript) #:grammar-directories '("typescript" "tsx")))