From mboxrd@z Thu Jan 1 00:00:00 1970 From: Christopher Allan Webber Subject: Re: [PATCH] Add guile-emacs! Date: Tue, 19 May 2015 14:41:25 -0500 Message-ID: <87mw10e4mr.fsf@earlgrey.lan> References: <87r3qo5idm.fsf@earlgrey.lan> <873830f2m0.fsf@earlgrey.lan> <87wq0bh70o.fsf@gmail.com> <87oalgear7.fsf@earlgrey.lan> <87617ozai9.fsf@T420.taylan> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" Return-path: Received: from eggs.gnu.org ([2001:4830:134:3::10]:53634) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YunOS-0005Pm-DC for guix-devel@gnu.org; Tue, 19 May 2015 15:41:42 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YunOM-0008Qe-EO for guix-devel@gnu.org; Tue, 19 May 2015 15:41:36 -0400 Received: from dustycloud.org ([50.116.34.160]:51389) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YunOM-0008QR-3J for guix-devel@gnu.org; Tue, 19 May 2015 15:41:30 -0400 In-reply-to: <87617ozai9.fsf@T420.taylan> 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: Taylan Ulrich =?utf-8?Q?Bay=C4=B1rl=C4=B1=2FKammer?= Cc: Guix-devel --=-=-= Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Taylan Ulrich Bay=C4=B1rl=C4=B1/Kammer writes: > Christopher Allan Webber writes: > >> + (native-inputs >> + `(("autoconf" ,autoconf) >> + ("automake" ,automake) >> + ,@(package-native-inputs emacs))) >> + (inputs >> + `(("guile" ,guile-for-guile-emacs) >> + ,@(package-inputs emacs))) > > I didn't think about this before: if Guile is used at compile-time, > e.g. to compile any .scm or .el files, then it should be in native > inputs too. Can you verify whether it's used or not? (In the future i= t > probably will be used to compile .el files, but that's still not enable= d > if I remember correctly.) It is, moved it. >> + (arguments >> + (substitute-keyword-arguments `(;; Build fails if we allow paral= lel build >> + #:parallel-build? #f > > Stylistic nitpick: sentence in comment should end with a period. Ok >> + (native-inputs >> + `(("autoconf" ,autoconf) >> + ("automake" ,automake) >> + ("libtool" ,libtool) >> + ("flex" ,flex) >> + ("texinfo" ,texinfo) >> + ,@(package-native-inputs guile-2.0))) >> + (inputs >> + `(("gettext" ,gnu-gettext) >> + ,@(package-inputs guile-2.0))))) > > I think we wanted to put Gettext in native-inputs? Done > > I'd say OK to push with those changes, thanks! :-) > > Taylan Great, I hope it's good now! --=-=-= Content-Type: text/x-diff Content-Disposition: inline; filename=0001-gnu-Add-guile-emacs-and-guile-for-guile-emacs.patch >From 46d0296e4a569cab11b5f2e3c982a2db6cb58524 Mon Sep 17 00:00:00 2001 From: Christopher Allan Webber Date: Sun, 10 May 2015 09:29:54 -0500 Subject: [PATCH] gnu: Add guile-emacs and guile-for-guile-emacs * gnu/packages/guile.scm (guile-for-guile-emacs): New variable. * gnu/packages/emacs.scm (guile-emacs): New variable. --- gnu/packages/emacs.scm | 31 +++++++++++++++++++++++++++++++ gnu/packages/guile.scm | 39 +++++++++++++++++++++++++++++++++++++++ 2 files changed, 70 insertions(+) diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm index 8d3df36..788097a 100644 --- a/gnu/packages/emacs.scm +++ b/gnu/packages/emacs.scm @@ -23,10 +23,12 @@ #:use-module ((guix licenses) #:prefix license:) #:use-module (guix packages) #:use-module (guix download) + #:use-module (guix git-download) #:use-module (guix build-system gnu) #:use-module (guix build-system glib-or-gtk) #:use-module (guix build-system trivial) #:use-module (gnu packages) + #:use-module (gnu packages guile) #:use-module (gnu packages gtk) #:use-module (gnu packages gnome) #:use-module (gnu packages ncurses) @@ -146,6 +148,35 @@ editor (without an X toolkit)" ) (arguments (append '(#:configure-flags '("--with-x-toolkit=no")) (package-arguments emacs))))) +(define-public guile-emacs + (package (inherit emacs) + (name "guile-emacs") + (version "20150512.41120e0") + (source (origin + (method git-fetch) + (uri (git-reference + (url "git://git.hcoop.net/git/bpt/emacs.git") + (commit "41120e0f595b16387eebfbf731fff70481de1b4b"))) + (sha256 + (base32 + "0lvcvsz0f4mawj04db35p1dvkffdqkz8pkhc0jzh9j9x2i63kcz6")))) + (native-inputs + `(("autoconf" ,autoconf) + ("automake" ,automake) + ("guile" ,guile-for-guile-emacs) + ,@(package-native-inputs emacs))) + (arguments + (substitute-keyword-arguments `(;; Build fails if we allow parallel build. + #:parallel-build? #f + ;; Tests aren't passing for now. + #:tests? #f + ,@(package-arguments emacs)) + ((#:phases phases) + `(modify-phases ,phases + (add-after 'unpack 'autogen + (lambda _ + (zero? (system* "sh" "autogen.sh")))))))))) + ;;; ;;; Emacs hacking. diff --git a/gnu/packages/guile.scm b/gnu/packages/guile.scm index 751002f..4446ccf 100644 --- a/gnu/packages/guile.scm +++ b/gnu/packages/guile.scm @@ -27,6 +27,7 @@ #:use-module (gnu packages gperf) #:use-module (gnu packages libffi) #:use-module (gnu packages autotools) + #:use-module (gnu packages flex) #:use-module (gnu packages libunistring) #:use-module (gnu packages m4) #:use-module (gnu packages multiprecision) @@ -35,6 +36,8 @@ #:use-module (gnu packages ncurses) #:use-module (gnu packages ed) #:use-module (gnu packages base) + #:use-module (gnu packages texinfo) + #:use-module (gnu packages gettext) #:use-module (guix packages) #:use-module (guix download) #:use-module (guix git-download) @@ -181,6 +184,42 @@ without requiring the source code to be rewritten.") ;; in the `base' module, and thus changing it entails a full rebuild. guile-2.0) +(define-public guile-for-guile-emacs + (package (inherit guile-2.0) + (name "guile-for-guile-emacs") + (version "20150510.d8d9a8d") + (source (origin + (method git-fetch) + (uri (git-reference + (url "git://git.hcoop.net/git/bpt/guile.git") + (commit "d8d9a8da05ec876acba81a559798eb5eeceb5a17"))) + (sha256 + (base32 + "00sprsshy16y8pxjy126hr2adqcvvzzz96hjyjwgg8swva1qh6b0")))) + (arguments + (substitute-keyword-arguments `(;; Tests aren't passing for now. + ;; Obviously we should re-enable this! + #:tests? #f + ,@(package-arguments guile-2.0)) + ((#:phases phases) + `(modify-phases ,phases + (add-after 'unpack 'autogen + (lambda _ + (zero? (system* "sh" "autogen.sh")))) + (add-before 'autogen 'patch-/bin/sh + (lambda _ + (substitute* "build-aux/git-version-gen" + (("#!/bin/sh") (string-append "#!" (which "sh")))) + #t)))))) + (native-inputs + `(("autoconf" ,autoconf) + ("automake" ,automake) + ("libtool" ,libtool) + ("flex" ,flex) + ("texinfo" ,texinfo) + ("gettext" ,gnu-gettext) + ,@(package-native-inputs guile-2.0))))) + ;;; ;;; Extensions. -- 2.1.4 --=-=-=--