summary refs log tree commit diff
diff options
context:
space:
mode:
authorAndrew Tropin <andrew@trop.in>2023-03-11 11:14:21 +0400
committerAndrew Tropin <andrew@trop.in>2023-03-12 07:53:05 +0400
commit110406dcc3946db74a01379a53c754adadc4849c (patch)
tree36768cdd290355bc748fd86637a07a28a7ffa088
parentf35519fc34b33ab21349f5de7057f70f2fe3723a (diff)
downloadguix-110406dcc3946db74a01379a53c754adadc4849c.tar.gz
gnu: emacs-next-tree-sitter: Inherit from emacs-next.
Make tree-sitter emacs available without pgtk.  It's part of ongoing
iheritance hierarchy update, tree-sitter have less implications than pgtk and
thus it should be placed earlier in inheritance chain. For more details:
https://yhetil.org/guix-devel/87r0txr99u.fsf@inventati.org/T/#u

* gnu/packages/emacs.scm (emacs-next-tree-sitter): Inherit from emacs-next.
-rw-r--r--gnu/packages/emacs.scm11
1 files changed, 5 insertions, 6 deletions
diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm
index 4e6587eef5..e93dd772e4 100644
--- a/gnu/packages/emacs.scm
+++ b/gnu/packages/emacs.scm
@@ -442,12 +442,12 @@ GTK.")))
   (let ((commit "ac7ec87a7a0db887e4ae7fe9005aea517958b778")
         (revision "0"))
     (package
-      (inherit emacs-next-pgtk)
+      (inherit emacs-next)
       (name "emacs-next-tree-sitter")
       (version (git-version "30.0.50" revision commit))
       (source
        (origin
-         (inherit (package-source emacs-next-pgtk))
+         (inherit (package-source emacs-next))
          (method git-fetch)
          (uri (git-reference
                (url "https://git.savannah.gnu.org/git/emacs.git/")
@@ -457,11 +457,10 @@ GTK.")))
           (base32
            "1akq6dbllwwqwx21wnwnv6aax1nsi2ypbd7j3i79sw62s3gf399z"))))
       (inputs
-       (modify-inputs (package-inputs emacs-next-pgtk)
+       (modify-inputs (package-inputs emacs-next)
          (prepend sqlite tree-sitter)))
-      (synopsis "Emacs text editor with @code{pgtk} and @code{tree-sitter} support")
-      (description "This Emacs build implements graphical UI purely in terms
-of GTK and supports tree-sitter."))))
+      (synopsis "Emacs text editor with @code{tree-sitter} support")
+      (description "This Emacs build supports tree-sitter."))))
 
 (define-public emacs-minimal
   ;; This is the version that you should use as an input to packages that just