summaryrefslogtreecommitdiff
path: root/gnu
diff options
context:
space:
mode:
Diffstat (limited to 'gnu')
-rw-r--r--gnu/packages/code.scm2
-rw-r--r--gnu/packages/databases.scm4
-rw-r--r--gnu/packages/emacs.scm14
-rw-r--r--gnu/packages/idutils.scm4
-rw-r--r--gnu/packages/mail.scm2
-rw-r--r--gnu/packages/package-management.scm2
-rw-r--r--gnu/packages/scheme.scm2
-rw-r--r--gnu/packages/version-control.scm2
8 files changed, 16 insertions, 16 deletions
diff --git a/gnu/packages/code.scm b/gnu/packages/code.scm
index 544681212b..7799e38930 100644
--- a/gnu/packages/code.scm
+++ b/gnu/packages/code.scm
@@ -45,7 +45,7 @@
(build-system gnu-build-system)
;; Needed to have cflow-mode.el installed.
- (native-inputs `(("emacs" ,emacs)))
+ (native-inputs `(("emacs" ,emacs-no-x)))
(home-page "http://www.gnu.org/software/cflow/")
(synopsis "Create a graph of control flow within a program")
diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm
index cbd170c850..29b7dbba55 100644
--- a/gnu/packages/databases.scm
+++ b/gnu/packages/databases.scm
@@ -1,5 +1,5 @@
;;; GNU Guix --- Functional package management for GNU
-;;; Copyright © 2012, 2013, 2014 Ludovic Courtès <ludo@gnu.org>
+;;; Copyright © 2012, 2013, 2014, 2015 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2012, 2014 Andreas Enge <andreas@enge.fr>
;;; Copyright © 2013 Cyril Roelandt <tipecaml@gmail.com>
;;; Copyright © 2014 David Thompson <davet@gnu.org>
@@ -192,7 +192,7 @@ pictures, sounds, or video.")
;; torture/utils.
(arguments '(#:parallel-tests? #f))
- (native-inputs `(("emacs" ,emacs)
+ (native-inputs `(("emacs" ,emacs-no-x)
("bc" ,bc)))
;; TODO: Add more optional inputs.
diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm
index 021bfb3199..297d174b5e 100644
--- a/gnu/packages/emacs.scm
+++ b/gnu/packages/emacs.scm
@@ -169,7 +169,7 @@ editor (without an X toolkit)" )
"geiser-autoloads.el")))
%standard-phases)))
(inputs `(("guile" ,guile-2.0)
- ("emacs" ,emacs)))
+ ("emacs" ,emacs-no-x)))
(home-page "http://nongnu.org/geiser/")
(synopsis "Collection of Emacs modes for Guile and Racket hacking")
(description
@@ -200,7 +200,7 @@ giving her access to live metadata.")
(sha256
(base32 "1np882jzvxckljx3cjz4absyzmc5hw65cs21sjmbic82163m9lf8"))))
(build-system trivial-build-system)
- (inputs `(("emacs" ,emacs)))
+ (inputs `(("emacs" ,emacs-no-x)))
(arguments
`(#:modules ((guix build utils)
(guix build emacs-utils))
@@ -247,7 +247,7 @@ when typing parentheses directly or commenting out code line by line.")
(base32 "1in48g5l5xdc9cf2apnpgx73mqlz2njrpi1w52dgql4qxv3kg6gr"))))
(build-system gnu-build-system)
(native-inputs `(("texinfo" ,texinfo)))
- (inputs `(("emacs" ,emacs)
+ (inputs `(("emacs" ,emacs-no-x)
("git" ,git)
("git:gui" ,git "gui")))
(arguments
@@ -310,7 +310,7 @@ operations.")
(native-inputs `(("autoconf" ,autoconf)))
(inputs `(("w3m" ,w3m)
("imagemagick" ,imagemagick)
- ("emacs" ,emacs)))
+ ("emacs" ,emacs-no-x)))
(arguments
'(#:modules ((guix build gnu-build-system)
(guix build utils)
@@ -378,7 +378,7 @@ operations.")
(base32 "10byvyv9dk0ib55gfqm7bcpxmx2qbih1jd03gmihrppr2mn52nff"))))
(build-system gnu-build-system)
(inputs `(("wget" ,wget)
- ("emacs" ,emacs)))
+ ("emacs" ,emacs-no-x)))
(arguments
'(#:modules ((guix build gnu-build-system)
(guix build utils)
@@ -519,7 +519,7 @@ operations.")
(chmod target #o555)))
%standard-phases)))
#:tests? #f))
- (native-inputs `(("emacs" ,emacs) ;for (guix build emacs-utils)
+ (native-inputs `(("emacs" ,emacs-no-x) ;for (guix build emacs-utils)
("texinfo" ,texinfo)))
(inputs `(("alsa-utils" ,alsa-utils)
("vorbis-tools" ,vorbis-tools)
@@ -569,7 +569,7 @@ light user interface.")
(with-directory-excursion site
(symlink "bbdb-loaddefs.el" "bbdb-autoloads.el"))))
%standard-phases)))
- (native-inputs `(("emacs" ,emacs)))
+ (native-inputs `(("emacs" ,emacs-no-x)))
(home-page "http://savannah.nongnu.org/projects/bbdb/")
(synopsis "Contact management utility for Emacs")
(description
diff --git a/gnu/packages/idutils.scm b/gnu/packages/idutils.scm
index d71f1271bc..3dc322f568 100644
--- a/gnu/packages/idutils.scm
+++ b/gnu/packages/idutils.scm
@@ -1,5 +1,5 @@
;;; GNU Guix --- Functional package management for GNU
-;;; Copyright © 2012, 2013 Ludovic Courtès <ludo@gnu.org>
+;;; Copyright © 2012, 2013, 2015 Ludovic Courtès <ludo@gnu.org>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -38,7 +38,7 @@
(patches (list
(search-patch "diffutils-gets-undeclared.patch")))))
(build-system gnu-build-system)
- (native-inputs `(("emacs" ,emacs)))
+ (native-inputs `(("emacs" ,emacs-no-x)))
(home-page "http://www.gnu.org/software/idutils/")
(synopsis "Identifier database utilities")
(description
diff --git a/gnu/packages/mail.scm b/gnu/packages/mail.scm
index 9963e5bf43..6d20b182cd 100644
--- a/gnu/packages/mail.scm
+++ b/gnu/packages/mail.scm
@@ -329,7 +329,7 @@ repository and Maildir/IMAP as LOCAL repository.")
;; TODO: Add webkit and gtk to build the mug GUI.
(inputs
`(("xapian" ,xapian)
- ("emacs" ,emacs)
+ ("emacs" ,emacs-no-x)
("guile" ,guile-2.0)
("glib" ,glib)
("gmime" ,gmime)
diff --git a/gnu/packages/package-management.scm b/gnu/packages/package-management.scm
index b20e7d3566..38bddef975 100644
--- a/gnu/packages/package-management.scm
+++ b/gnu/packages/package-management.scm
@@ -96,7 +96,7 @@
#t)
%standard-phases)))
(native-inputs `(("pkg-config" ,pkg-config)
- ("emacs" ,emacs))) ;for guix.el
+ ("emacs" ,emacs-no-x))) ;for guix.el
(inputs
(let ((boot-guile (lambda (arch hash)
(origin
diff --git a/gnu/packages/scheme.scm b/gnu/packages/scheme.scm
index e0eccf51ff..70eceecd80 100644
--- a/gnu/packages/scheme.scm
+++ b/gnu/packages/scheme.scm
@@ -199,7 +199,7 @@ features an integrated Emacs-like editor and a large runtime library.")
(string-append "EMACSDIR=" dir)))))
%standard-phases))))
(inputs
- `(("emacs" ,emacs)
+ `(("emacs" ,emacs-no-x)
;; Optional APIs for which Bigloo has bindings.
("avahi" ,avahi)
diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-control.scm
index 5af2905eaa..48e16a14be 100644
--- a/gnu/packages/version-control.scm
+++ b/gnu/packages/version-control.scm
@@ -619,7 +619,7 @@ RCS, PRCS, and Aegis packages.")
(build-system gnu-build-system)
(inputs `(("perl" ,perl)
("inetutils" ,inetutils) ; for `hostname', used in the tests
- ("emacs" ,emacs))) ; for `ctags'
+ ("emacs" ,emacs-no-x))) ; for `ctags'
(home-page "http://www.gnu.org/software/vc-dwim/")
(synopsis "Version-control-agnostic ChangeLog diff and commit tool")
(description