From mboxrd@z Thu Jan 1 00:00:00 1970 From: Alex Kost Subject: [PATCH 2/2] emacs: Add 'guix-devel-build-package-definition'. Date: Tue, 22 Sep 2015 22:11:10 +0300 Message-ID: <87h9mme0c1.fsf_-_@gmail.com> References: <1437814197-6321-1-git-send-email-alezost@gmail.com> <87mvxowvs7.fsf@gnu.org> <87bne32egh.fsf@gmail.com> <878u8zhynk.fsf@gnu.org> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" Return-path: Received: from eggs.gnu.org ([2001:4830:134:3::10]:43808) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZeSy8-0000Xm-UB for guix-devel@gnu.org; Tue, 22 Sep 2015 15:11:16 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZeSy7-0007f1-2r for guix-devel@gnu.org; Tue, 22 Sep 2015 15:11:12 -0400 In-Reply-To: <878u8zhynk.fsf@gnu.org> ("Ludovic \=\?utf-8\?Q\?Court\=C3\=A8s\=22'\?\= \=\?utf-8\?Q\?s\?\= message of "Tue, 25 Aug 2015 22:59:59 +0200") List-Id: "Development of GNU Guix and the GNU System distribution." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-devel-bounces+gcggd-guix-devel=m.gmane.org@gnu.org Sender: guix-devel-bounces+gcggd-guix-devel=m.gmane.org@gnu.org To: Ludovic =?utf-8?Q?Court=C3=A8s?= Cc: guix-devel@gnu.org --=-=-= Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Ludovic Court=C3=A8s (2015-08-25 23:59 +0300) wrote: > Alex Kost skribis: > >> Ludovic Court=C3=A8s (2015-08-18 16:50 +0300) wrote: >> >>> Alex Kost skribis: >>> >>>> And finally, I'm afraid building guix package in a Geiser REPL may not >>>> be very useful because of >>>> (you have wait for the REPL command to be finished before continuing to >>>> edit .scm-file). >>> >>> Bummer, indeed. I wonder if that could be worked around by spawning a >>> new Guile server thread that would be used to build the package, and >>> opening a new Geiser REPL connected to that thread? Maybe too complex, >>> though. >> >> That's what I did for *Guix REPL*: it is a server by default, and there >> is *Guix Internal REPL* which connects to it (there is a commentary >> about it in "emacs/guix-backend.el"). >> >> But I don't think it should be done here: as a user I expect that the >> building will be performed in the current Geiser REPL, so it's up to me >> (as a user) to decide what repl it is. >> >> Also to avoid that limitation, a user can just run another Geiser REPL >> after the building begins, and can continue to edit a scheme file with >> the help of the current REPL, while the building will continue in the >> previous one. (I will mention this in the manual) > > OK, sounds good! Done. Ludovic Court=C3=A8s (2015-09-09 23:11 +0300) wrote: > Alex Kost skribis: > >> As a workaround for this issue it was proposed=C2=B9 to transform >> =E2=80=98current-build-output-port=E2=80=99 into a procedure (I have che= cked that it >> solves the problem). What do you think about it? Perhaps to make sure >> that the port will be always the same define it like this: >> >> (define current-build-output-port (memoize current-error-port)) >> >> Is it acceptable? > > No, =E2=80=98current-build-output-port=E2=80=99 should remain a SRFI-39 p= arameter so > that callers can easily rebind it. > > However, perhaps the guix.el code could do: > > (current-build-output-port (current-error-port)) > > at startup; would that be doable? Also done. The workaround appeared to be not so ugly as I thought at first, thanks for the pointer! --=-=-= Content-Type: text/x-patch; charset=utf-8 Content-Disposition: attachment; filename=0002-emacs-Add-guix-devel-build-package-definition.patch Content-Transfer-Encoding: quoted-printable >From 8011d1c62b49c309ddba933d27fc4c86eabf60a2 Mon Sep 17 00:00:00 2001 From: Alex Kost Date: Fri, 24 Jul 2015 20:31:11 +0300 Subject: [PATCH 2/2] emacs: Add 'guix-devel-build-package-definition'. MIME-Version: 1.0 Content-Type: text/plain; charset=3DUTF-8 Content-Transfer-Encoding: 8bit Suggested by Ludovic Court=C3=A8s . * emacs/guix-guile.el (guix-guile-definition-regexp): New variable. (guix-guile-current-definition, guix-guile-boolean): New functions. * emacs/guix-devel.el: Require 'guix-base'. (guix-devel-repl-processes): New variable. (guix-devel-setup-repl, guix-devel-setup-repl-maybe): New functions. (guix-devel-build-package-definition): New command. * doc/emacs.texi (Emacs Development): Document it. --- doc/emacs.texi | 24 ++++++++++++++++++++++++ emacs/guix-devel.el | 40 ++++++++++++++++++++++++++++++++++++++++ emacs/guix-guile.el | 22 ++++++++++++++++++++++ 3 files changed, 86 insertions(+) diff --git a/doc/emacs.texi b/doc/emacs.texi index d44d329..b6f2701 100644 --- a/doc/emacs.texi +++ b/doc/emacs.texi @@ -659,4 +659,28 @@ want to use a module it defines, so you switch to the = Geiser REPL and write @code{,use (some module)} there. You may just use this command instead (@code{guix-devel-use-module}). =20 +@item C-c . b +Build a package defined by the current variable definition. The +building process is run in the current Geiser REPL. If you modified the +current package definition, don't forget to reevaluate it before calling +this command---for example, with @kbd{C-M-x} (@pxref{To eval or not to +eval,,, geiser, Geiser User Manual}) +(@code{guix-devel-build-package-definition}). + @end table + +Unluckily, there is a limitation related to long-running REPL commands. +When there is a running process in a Geiser REPL, you are not supposed +to evaluate anything in a scheme buffer, because this will ``freeze'' +the REPL: it will stop producing any output (however, the evaluating +process will continue---you will just not see any progress anymore). Be +aware: even moving the point in a scheme buffer may ``break'' the REPL +if Autodoc (@pxref{Autodoc and friends,,, geiser, Geiser User Manual}) +is enabled (which is the default). + +So you have to postpone editing your scheme buffers until the running +evaluation will be finished in the REPL. + +Alternatively, to avoid this limitation, you may just run another Geiser +REPL, and while something is being evaluated in the previous REPL, you +can continue editing a scheme file with the help of the current one. diff --git a/emacs/guix-devel.el b/emacs/guix-devel.el index ed82e33..6de49be 100644 --- a/emacs/guix-devel.el +++ b/emacs/guix-devel.el @@ -27,6 +27,7 @@ (require 'guix-guile) (require 'guix-geiser) (require 'guix-utils) +(require 'guix-base) =20 (defgroup guix-devel nil "Settings for Guix development utils." @@ -55,8 +56,47 @@ Interactively, use the module defined by the current sch= eme file." (interactive) (guix-copy-as-kill (guix-guile-current-module))) =20 +(defun guix-devel-setup-repl (&optional repl) + "Setup REPL for using `guix-devel-...' commands." + (guix-devel-use-modules "(guix monad-repl)" + "(guix scripts)" + "(guix store)") + ;; Without this workaround, the build output disappears. See + ;; for details. + (guix-geiser-eval-in-repl + "(current-build-output-port (current-error-port))" + repl 'no-history 'no-display)) + +(defvar guix-devel-repl-processes nil + "List of REPL processes configured by `guix-devel-setup-repl'.") + +(defun guix-devel-setup-repl-maybe (&optional repl) + "Setup (if needed) REPL for using `guix-devel-...' commands." + (let ((process (get-buffer-process (or repl (guix-geiser-repl))))) + (when (and process + (not (memq process guix-devel-repl-processes))) + (guix-devel-setup-repl repl) + (push process guix-devel-repl-processes)))) + +(defun guix-devel-build-package-definition () + "Build a package defined by the current top-level variable definition." + (interactive) + (let ((def (guix-guile-current-definition))) + (guix-devel-setup-repl-maybe) + (guix-devel-use-modules (guix-guile-current-module)) + (when (or (not guix-operation-confirm) + (guix-operation-prompt (format "Build '%s'?" def))) + (guix-geiser-eval-in-repl + (concat ",run-in-store " + (guix-guile-make-call-expression + "build-package" def + "#:use-substitutes?" (guix-guile-boolean + guix-use-substitutes) + "#:dry-run?" (guix-guile-boolean guix-dry-run))))))) + (defvar guix-devel-keys-map (let ((map (make-sparse-keymap))) + (define-key map (kbd "b") 'guix-devel-build-package-definition) (define-key map (kbd "k") 'guix-devel-copy-module-as-kill) (define-key map (kbd "u") 'guix-devel-use-module) map) diff --git a/emacs/guix-guile.el b/emacs/guix-guile.el index c21d27f..35a97d7 100644 --- a/emacs/guix-guile.el +++ b/emacs/guix-guile.el @@ -26,6 +26,23 @@ =20 (require 'geiser-guile) =20 +(defvar guix-guile-definition-regexp + (rx bol "(define" + (zero-or-one "*") + (zero-or-one "-public") + (one-or-more space) + (zero-or-one "(") + (group (one-or-more (or word (syntax symbol))))) + "Regexp used to find the guile definition.") + +(defun guix-guile-current-definition () + "Return string with name of the current top-level guile definition." + (save-excursion + (beginning-of-defun) + (if (looking-at guix-guile-definition-regexp) + (match-string-no-properties 1) + (error "Couldn't find the current definition")))) + (defun guix-guile-current-module () "Return a string with the current guile module. Return nil, if current buffer does not define a module." @@ -37,6 +54,11 @@ Return nil, if current buffer does not define a module." (re-search-forward geiser-guile--module-re nil t)) (match-string-no-properties 1)))) =20 +(defun guix-guile-boolean (arg) + "Return a string with guile boolean value. +Transform elisp ARG (nil or non-nil) to the guile boolean (#f or #t)." + (concat "#" (prin1-to-string (if arg 't 'f)))) + (defun guix-guile-make-call-expression (proc &rest args) "Return \"(PROC ARGS ...)\" string. PROC and ARGS should be strings." --=20 2.5.0 --=-=-=--