Re: [PATCH] Add guile-emacs!

[Christopher Allan Webber <cwebber@dustycloud.org>]

[-- Attachment #1: Type: text/plain, Size: 1127 bytes --]

Taylan Ulrich Kammer writes:

> Christopher Allan Webber <cwebber@dustycloud.org> writes:
>
>> Okay, how about a version of guile-emacs that works and incorporates
>> feedback from this thread?  Yeah?  Anyone?
>>
>> Whoooooooooo guile-emacs! :)
>
> Yay! :-)
>
> I would have thought these would go to guile.scm and emacs.scm.  What do
> others think?
>
>> +(define-public guile-for-guile-emacs
>> [...]
>> +    (inputs
>> +     `(("gettext" ,gnu-gettext)
>
> Sure it shouldn't be in native-inputs?  I'm guessing autogen uses it.
>
>> +(define-public guile-emacs
>> [...]
>> +     (substitute-keyword-arguments `(#:parallel-build? #f         
>
> A comment explaining why parallel builds are disabled would be good.
>
>> +                                     ;; Tests aren't passing for now.
>> +                                     ;; Obviously we should re-enable this!
>> +                                     #:tests? #f
>
> Tests should generally always be enabled so the second line of the
> comment would be redundant; just a nitpick. :-)
>
>
> Otherwise looks good to me.  Thanks!
>
> Taylan

Okay, integrated at last!


[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: 0001-gnu-Add-guile-emacs-and-guile-for-guile-emacs.patch --]
[-- Type: text/x-diff, Size: 4475 bytes --]

From 51edaeae907220ea1b7c8ef8187c444e897b9d09 Mon Sep 17 00:00:00 2001
From: Christopher Allan Webber <cwebber@dustycloud.org>
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 | 33 +++++++++++++++++++++++++++++++++
 gnu/packages/guile.scm | 38 ++++++++++++++++++++++++++++++++++++++
 2 files changed, 71 insertions(+)

diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm
index 8d3df36..9270376 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,37 @@ 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)
+       ,@(package-native-inputs emacs)))
+    (inputs
+     `(("guile" ,guile-for-guile-emacs)
+       ,@(package-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"))))))))))
+
 \f
 ;;;
 ;;; Emacs hacking.
diff --git a/gnu/packages/guile.scm b/gnu/packages/guile.scm
index 751002f..1b1cd88 100644
--- a/gnu/packages/guile.scm
+++ b/gnu/packages/guile.scm
@@ -181,6 +181,44 @@ 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)
+       ,@(package-native-inputs guile-2.0)))
+    (inputs
+     `(("gettext" ,gnu-gettext)
+       ,@(package-inputs guile-2.0)))))
+
 \f
 ;;;
 ;;; Extensions.
-- 
2.1.4