From 4182f8c22f1ca4eea453e61a90c77b790f573d8a Mon Sep 17 00:00:00 2001 From: Christopher Allan Webber Date: Sun, 10 May 2015 09:29:54 -0500 Subject: [PATCH] guilemacs attempt, failing on "make check" --- gnu/packages/guile.scm | 3 +- gnu/packages/guilemacs.scm | 83 ++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 85 insertions(+), 1 deletion(-) create mode 100644 gnu/packages/guilemacs.scm diff --git a/gnu/packages/guile.scm b/gnu/packages/guile.scm index 751002f..33d5773 100644 --- a/gnu/packages/guile.scm +++ b/gnu/packages/guile.scm @@ -41,7 +41,8 @@ #:use-module (guix build-system gnu) #:use-module (guix build-system trivial) #:use-module (guix utils) - #:use-module (ice-9 match)) + #:use-module (ice-9 match) + #:export (guile-2.0)) ;;; Commentary: ;;; diff --git a/gnu/packages/guilemacs.scm b/gnu/packages/guilemacs.scm new file mode 100644 index 0000000..c370200 --- /dev/null +++ b/gnu/packages/guilemacs.scm @@ -0,0 +1,83 @@ +;;; GNU Guix --- Functional package management for GNU +;;; Copyright © 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 (at +;;; 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 guilemacs) + #:use-module (guix licenses) + #:use-module (guix packages) + #:use-module (guix download) + #: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 guilemacs-guile + (package (inherit guile-2.0) + (name "guilemacs-guile") + (version "20150212.a930be6") + (arguments + '(#:phases + (modify-phases %standard-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"))))))))) + (native-inputs + (append + `(("autoconf" ,autoconf) + ("automake" ,automake) + ("libtool" ,libtool) + ("flex" ,flex) + ("texinfo" ,texinfo)) + (package-native-inputs guile-2.0))) + (inputs + (append + `(("gettext" ,gnu-gettext)) + (package-inputs guile-2.0))) + (source (origin + (method git-fetch) + (uri (git-reference + (url "git://git.hcoop.net/git/bpt/guile.git") + (commit "a930be6f0f0d1594873c7eb9d2316ecf926da67d"))) + (sha256 + (base32 + "1l520n482cq8h8qbkp11j5xcz5vf6fnbpc24i0xmd3ngj2ga3gh7")))))) + +(define-public guilemacs-emacs + (package (inherit emacs) + (name "guilemacs-emacs") + (version "20150212.a930be6") + (source (origin + (method git-fetch) + (uri (git-reference + (url "git://git.hcoop.net/git/bpt/emacs.git") + (commit "8f2e20304cbfdc046f4e3d3fca7b844f07e65076"))) + (sha256 + (base32 + "0f0i7ax0wi5q2w2kvr4bdzkcbzvcqvnbni0n8vdsrxc7ayl8zdi3")))) + (inputs + (cons + `("guile" ,guilemacs-guile) + (package-inputs emacs))))) -- 2.1.4