[bug#61762] [PATCH 0/4] Fixing emacs-julia-snail.

[bug#61762] [PATCH 0/4] Fixing emacs-julia-snail.

[Nicolas Graves via Guix-patches via]

Here are 4 patches I needed to use to be able to use emacs-julia-snail
properly.

-- 
Best regards,
Nicolas Graves

[bug#61762] [PATCH 1/4] gnu: emacs-julia-snail: Update include list.

[Nicolas Graves via Guix-patches via]

* gnu/packages/emacs-xyz.scm (emacs-julia-snail): Update include list.
---
 gnu/packages/emacs-xyz.scm | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm
index 4e40b22426..e4bf8e2102 100644
--- a/gnu/packages/emacs-xyz.scm
+++ b/gnu/packages/emacs-xyz.scm
@@ -12282,7 +12282,9 @@ (define-public emacs-julia-snail
                 "04nh37izz04lxkvkxhsig8khbrrgdl4p6pkjsv5bxymnp84zwlw7"))))
     (build-system emacs-build-system)
     (arguments
-     (list #:include #~(cons "^JuliaSnail\\.jl" %default-include)))
+     (list
+      #:include
+      #~(append (list "^JuliaSnail\\.jl" "extensions") %default-include)))
     (inputs
      (list emacs-dash emacs-s emacs-spinner emacs-xref))
     (propagated-inputs
-- 
2.39.1

[bug#61762] [PATCH 2/4] gnu: Add julia-tokenize.

[Nicolas Graves via Guix-patches via]

* gnu/packages/julia-xyz.scm (julia-tokenize): New variable.
---
 gnu/packages/julia-xyz.scm | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/gnu/packages/julia-xyz.scm b/gnu/packages/julia-xyz.scm
index 82429c957d..ea2c9aa704 100644
--- a/gnu/packages/julia-xyz.scm
+++ b/gnu/packages/julia-xyz.scm
@@ -5928,6 +5928,26 @@ (define-public julia-testimages
 package.")
     (license license:expat)))
 
+(define-public julia-tokenize
+  (package
+    (name "julia-tokenize")
+    (version "0.5.24")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/JuliaLang/Tokenize.jl")
+             (commit (string-append "v" version))))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "1l3dy6nad0viavzy26lfnhzpd3gcxgaq7yvm7h1ja280xsh60p3i"))))
+    (build-system julia-build-system)
+    (home-page "https://github.com/JuliaGPU/Tokenize.jl")
+    (synopsis "Tokenize a string or buffer containing Julia code")
+    (description "This package allows to to take a string or buffer containing
+Julia code, perform lexical analysis and return a stream of tokens.")
+    (license license:expat)))
+
 (define-public julia-tracker
   (package
     (name "julia-tracker")
-- 
2.39.1

[bug#61762] [PATCH 3/4] gnu: Add julia-cstparser.

[Nicolas Graves via Guix-patches via]

* gnu/packages/julia-xyz.scm (julia-cstparser): New variable.
---
 gnu/packages/julia-xyz.scm | 34 ++++++++++++++++++++++++++++++++++
 1 file changed, 34 insertions(+)

diff --git a/gnu/packages/julia-xyz.scm b/gnu/packages/julia-xyz.scm
index ea2c9aa704..c5ecb21d80 100644
--- a/gnu/packages/julia-xyz.scm
+++ b/gnu/packages/julia-xyz.scm
@@ -1252,6 +1252,40 @@ (define-public julia-crayons
 styles available to terminals.")
     (license license:expat)))
 
+(define-public julia-cstparser
+  (package
+    (name "julia-cstparser")
+    (version "3.3.4")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/julia-vscode/CSTParser.jl")
+             (commit (string-append "v" version))))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "162jpcdph26ybg7rajbvfcbpnngygybpzk5bry4c4ppda3m1dl1i"))))
+    (build-system julia-build-system)
+    (arguments
+     (list
+      #:phases
+      #~(modify-phases %standard-phases
+          (add-after 'unpack 'fix-or-ignore-tests
+            (lambda _
+              (substitute* "test/iterate.jl"
+                (("parser.jl")
+                 (string-append #$output "/share/julia/loadpath/CSTParser/test/parser.jl"))
+                (("../src")
+                 (string-append #$output "/share/julia/loadpath/CSTParser/src")))
+              (substitute* "test/check_base.jl"
+                (("testset.*" all)
+                 (string-append all "return\n"))))))))
+    (inputs (list julia-tokenize))
+    (home-page "https://github.com/julia-vscode/CSTParser.jl")
+    (synopsis "Parser for Julia")
+    (description "This package provides a parser for Julia code.")
+    (license license:expat)))
+
 (define-public julia-csv
   (package
     (name "julia-csv")
-- 
2.39.1

[bug#61762] [PATCH 4/4] gnu: emacs-julia-snail: Update propagated-inputs.

[Nicolas Graves via Guix-patches via]

* gnu/packages/emacs-xyz.scm (emacs-julia-snail): Update  propagated-inputs.
---
 gnu/packages/emacs-xyz.scm | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm
index e4bf8e2102..94c6c7d7ea 100644
--- a/gnu/packages/emacs-xyz.scm
+++ b/gnu/packages/emacs-xyz.scm
@@ -180,6 +180,7 @@ (define-module (gnu packages emacs-xyz)
   #:use-module (gnu packages haskell-apps)
   #:use-module (gnu packages ibus)
   #:use-module (gnu packages java)
+  #:use-module (gnu packages julia-xyz)
   #:use-module (gnu packages ncurses)
   #:use-module (gnu packages networking)
   #:use-module (gnu packages python)
@@ -12291,7 +12292,9 @@ (define-public emacs-julia-snail
      (list libvterm
            emacs-julia-mode             ;required by parser
            emacs-parsec                 ;required by parser
-           emacs-vterm))
+           emacs-vterm
+           julia-tokenize
+           julia-cstparser))
     (home-page "https://github.com/gcv/julia-snail")
     (synopsis "Development environment and REPL interaction package for Julia")
     (description "This package provides a development environment and REPL
-- 
2.39.1

bug#61762: [PATCH 1/4] gnu: emacs-julia-snail: Update include list.

[Nicolas Goaziou]

Hello,

Nicolas Graves via Guix-patches via <guix-patches@gnu.org> writes:

> * gnu/packages/emacs-xyz.scm (emacs-julia-snail): Update include list.

Applied. Thank you.

>      (arguments
> -     (list #:include #~(cons "^JuliaSnail\\.jl" %default-include)))
> +     (list
> +      #:include
> +      #~(append (list "^JuliaSnail\\.jl" "extensions")
> %default-include)))

I used cons* here.

Regards,
-- 
Nicolas Goaziou