From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:470:142:3::10]:52908) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iqUHI-0002S5-8e for guix-patches@gnu.org; Sat, 11 Jan 2020 22:51:05 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iqUHG-0000uq-LA for guix-patches@gnu.org; Sat, 11 Jan 2020 22:51:04 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:50957) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1iqUHG-0000tS-Eo for guix-patches@gnu.org; Sat, 11 Jan 2020 22:51:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1iqUHG-0006EO-Bv for guix-patches@gnu.org; Sat, 11 Jan 2020 22:51:02 -0500 Subject: [bug#39093] [PATCH] gnu: Add emacs-vterm. Resent-Message-ID: Received: from eggs.gnu.org ([2001:470:142:3::10]:52158) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iqUGv-0002RB-RA for guix-patches@gnu.org; Sat, 11 Jan 2020 22:50:43 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iqUGt-0007nj-Nk for guix-patches@gnu.org; Sat, 11 Jan 2020 22:50:41 -0500 Received: from mx.kolabnow.com ([95.128.36.42]:4692) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1iqUGt-0007g5-6m for guix-patches@gnu.org; Sat, 11 Jan 2020 22:50:39 -0500 Received: from localhost (unknown [127.0.0.1]) by ext-mx-out001.mykolab.com (Postfix) with ESMTP id BC86C640 for ; Sun, 12 Jan 2020 04:50:35 +0100 (CET) Received: from mx.kolabnow.com ([127.0.0.1]) by localhost (ext-mx-out001.mykolab.com [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id b2VufmWZcurz for ; Sun, 12 Jan 2020 04:50:34 +0100 (CET) Received: from int-mx001.mykolab.com (unknown [10.9.13.1]) by ext-mx-out001.mykolab.com (Postfix) with ESMTPS id 87B972DF for ; Sun, 12 Jan 2020 04:50:34 +0100 (CET) Received: from ext-subm002.mykolab.com (unknown [10.9.6.2]) by int-mx001.mykolab.com (Postfix) with ESMTPS id 48A3037A for ; Sun, 12 Jan 2020 04:50:34 +0100 (CET) From: "LaFreniere\, Joseph" Date: Sat, 11 Jan 2020 21:50:26 -0600 Message-ID: <87r20549kt.fsf@lafreniere.xyz> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+kyle=kyleam.com@gnu.org Sender: "Guix-patches" To: 39093@debbugs.gnu.org --=-=-= Content-Type: text/plain; format=flowed Patch files is attached. There have not yet been any tagged releases in the source repo, so I have left the version as 0. I initially tried using a patch file instead of manually using the substitute snippet, but that was failing with an error that vterm.el was read-only. If there is a workaround, I would gladly return to using a patch file. -- Joseph LaFreniere --=-=-= Content-Type: text/x-patch; charset=utf-8 Content-Disposition: attachment; filename=0001-gnu-Add-emacs-vterm.patch Content-Transfer-Encoding: quoted-printable >From 06223ab2ed07b3fbfb2dfd95aa0a5fce1c44baf9 Mon Sep 17 00:00:00 2001 From: Joseph LaFreniere Date: Mon, 6 Jan 2020 20:56:35 -0600 Subject: [PATCH] gnu: Add emacs-vterm. * gnu/packages/emacs-xyz.scm (emacs-vterm): New variable. --- gnu/packages/emacs-xyz.scm | 67 +++++++++++++++++++++++++++++++++++++- 1 file changed, 66 insertions(+), 1 deletion(-) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 0559f0c7cc..9a0f08e16a 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -46,7 +46,7 @@ ;;; Copyright =C2=A9 2019 Brian Leung ;;; Copyright =C2=A9 2019 mikadoZero ;;; Copyright =C2=A9 2019 Gabriel Hondet -;;; Copyright =C2=A9 2019 LaFreniere, Joseph +;;; Copyright =C2=A9 2019, 2020 Joseph LaFreniere ;;; Copyright =C2=A9 2019 Amar Singh ;;; Copyright =C2=A9 2019 Baptiste Strazzulla ;;; Copyright =C2=A9 2019 Giacomo Leidi @@ -105,6 +105,7 @@ #:use-module (gnu packages python) #:use-module (gnu packages python-xyz) #:use-module (gnu packages telephony) + #:use-module (gnu packages terminals) #:use-module (gnu packages tex) #:use-module (gnu packages texinfo) #:use-module (gnu packages tcl) @@ -17401,6 +17402,70 @@ next, volume) and display and control the current = playlist as well as your stored playlists.") (license license:gpl3+))) =20 +(define-public emacs-vterm + (let ((version "0") + (revision "1") + (commit "7d7381fa8104b55b70148cf147523d9ab7f01fcd")) + (package + (name "emacs-vterm") + (version (git-version version revision commit)) + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/akermu/emacs-libvterm.git") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "04a2jlhmr20ipgzpnba3yryw3ly7qdxjgaw10dwn9wxy1yqmapz1")) + (modules '((guix build utils))) + (snippet + '(begin + (delete-file "vterm-module-make.el") + (substitute* "vterm.el" + (((string-append "\\(or \\(require 'vterm-module nil= t\\)\n" + "^.*\\(and \\(require 'vterm-module= -make\\)\n" + "^.*\\(require 'vterm-module\\)\\)\= \)")) + "(module-load \"vterm-module.so)")) + (make-file-writable "vterm.el") + #t)))) + (build-system emacs-build-system) + (arguments + `(#:modules ((guix build emacs-build-system) + ((guix build cmake-build-system) #:prefix cmake:) + (guix build utils)) + #:imported-modules (,@%emacs-build-system-modules + (guix build cmake-build-system)) + #:phases (modify-phases %standard-phases + (add-before 'add-source-to-load-path 'configure + (lambda* (#:key outputs #:allow-other-keys) + ((assoc-ref cmake:%standard-phases 'configure) + #:outputs outputs + #:out-of-source? #f + #:configure-flags '("-DUSE_SYSTEM_LIBVTERM=3DON")= ))) + (add-before 'install 'make + (lambda* (#:key (make-flags '()) #:allow-other-keys) + (apply invoke "make" "all" make-flags) + #t)) + (add-before 'make-autoloads 'move-el + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (site-lisp (string-append out "/share/emacs= /site-lisp"))) + (mkdir-p site-lisp) + (copy-file "vterm.el" (string-append site-lisp "= /vterm.el")) + (copy-file "vterm-module.so" (string-append site= -lisp "/vterm-module.so")) + #t)))) + #:tests? #f)) + (native-inputs + `(("cmake" ,cmake-minimal) + ("libtool" ,libtool) + ("libvterm" ,libvterm))) + (home-page "https://github.com/akermu/emacs-libvterm") + (synopsis "Emacs libvterm integration") + (description "This package implements a bridge to @code{libvterm} to +display a terminal in an Emacs buffer.") + (license license:gpl3+)))) + (define-public emacs-simple-mpc ;; There have been no releases. (let ((commit "bee8520e81292b4c7353e45b193f9a13b482f5b2") --=20 2.24.1 --=-=-=--