From mboxrd@z Thu Jan 1 00:00:00 1970 From: Christopher Allan Webber Subject: [PATCH] Add guile-emacs! Date: Wed, 13 May 2015 19:01:07 -0500 Message-ID: <873830f2m0.fsf@earlgrey.lan> References: <87r3qo5idm.fsf@earlgrey.lan> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" Return-path: Received: from eggs.gnu.org ([2001:4830:134:3::10]:54438) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Ysgb9-0008Pu-7g for guix-devel@gnu.org; Wed, 13 May 2015 20:02:00 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Ysgb5-0001d7-0Z for guix-devel@gnu.org; Wed, 13 May 2015 20:01:59 -0400 Received: from dustycloud.org ([50.116.34.160]:47719) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Ysgb4-0001cw-S2 for guix-devel@gnu.org; Wed, 13 May 2015 20:01:54 -0400 Received: from earlgrey.lan (localhost [127.0.0.1]) by dustycloud.org (Postfix) with ESMTPS id 17C2226654 for ; Wed, 13 May 2015 20:01:39 -0400 (EDT) In-reply-to: <87r3qo5idm.fsf@earlgrey.lan> 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: Guix-devel --=-=-= Content-Type: text/plain Okay, how about a version of guile-emacs that works and incorporates feedback from this thread? Yeah? Anyone? Whoooooooooo guile-emacs! :) --=-=-= Content-Type: text/x-diff; charset=utf-8 Content-Disposition: inline; filename=0001-gnu-Add-guile-emacs-and-guile-for-guile-emacs.patch Content-Transfer-Encoding: quoted-printable >From ca37077e1210c1473b87154d5495267520f92311 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-emacs: New file. * gnu-system.am (GNU_SYSTEM_MODULES): Add it. --- gnu-system.am | 1 + gnu/packages/guile-emacs.scm | 102 +++++++++++++++++++++++++++++++++++++= ++++++ 2 files changed, 103 insertions(+) create mode 100644 gnu/packages/guile-emacs.scm diff --git a/gnu-system.am b/gnu-system.am index 95378a7..d8117b8 100644 --- a/gnu-system.am +++ b/gnu-system.am @@ -143,6 +143,7 @@ GNU_SYSTEM_MODULES =3D \ gnu/packages/gstreamer.scm \ gnu/packages/gtk.scm \ gnu/packages/guile.scm \ + gnu/packages/guile-emacs.scm \ gnu/packages/guile-wm.scm \ gnu/packages/gv.scm \ gnu/packages/gxmessage.scm \ diff --git a/gnu/packages/guile-emacs.scm b/gnu/packages/guile-emacs.scm new file mode 100644 index 0000000..dee97df --- /dev/null +++ b/gnu/packages/guile-emacs.scm @@ -0,0 +1,102 @@ +;;; GNU Guix --- Functional package management for GNU +;;; Copyright =C2=A9 2015 Christopher Allan Webber +;;; +;;; This file is part of GNU Guix. +;;; +;;; GNU Guix is free software; you can redistribute it and/or modify it +;;; under the terms of the GNU General Public License as published by +;;; the Free Software Foundation; either version 3 of the License, or (a= t +;;; your option) any later version. +;;; +;;; GNU Guix is distributed in the hope that it will be useful, but +;;; WITHOUT ANY WARRANTY; without even the implied warranty of +;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +;;; GNU General Public License for more details. +;;; +;;; You should have received a copy of the GNU General Public License +;;; along with GNU Guix. If not, see . + +(define-module (gnu packages guile-emacs) + #:use-module (guix licenses) + #:use-module (guix packages) + #:use-module (guix download) + #:use-module (guix utils) + #:use-module (guix build utils) + #:use-module (guix git-download) + #:use-module (guix build-system gnu) + #:use-module (gnu packages autotools) + #:use-module (gnu packages flex) + #:use-module (gnu packages guile) + #:use-module (gnu packages emacs) + #:use-module (gnu packages gettext) + #:use-module (gnu packages texinfo)) + +(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 th= is! + #: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))))) + +(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 `(#:parallel-build? #f =20 + ;; Tests aren't passing for now. + ;; Obviously we should re-enable th= is! + #:tests? #f + ,@(package-arguments emacs)) + ((#:phases phases) + `(modify-phases ,phases + (add-after 'unpack 'autogen + (lambda _ + (zero? (system* "sh" "autogen.sh")))))))))) + --=20 2.1.4 --=-=-=--