From: Alex Kost <alezost@gmail.com>
To: guix-devel@gnu.org
Subject: [PATCH 3/4] gnu: Move emacs for building from inputs to native-inputs.
Date: Sat, 21 May 2016 14:57:54 +0300 [thread overview]
Message-ID: <1463831875-28373-4-git-send-email-alezost@gmail.com> (raw)
In-Reply-To: <1463831875-28373-1-git-send-email-alezost@gmail.com>
* gnu/packages/emacs.scm (geiser): Move "emacs" from inputs to native-inputs.
(paredit): Likewise.
(haskell-mode): Likewise.
(emacs-w3m): Likewise.
(emacs-wget): Likewise.
* gnu/packages/mail.scm (mu): Likewise.
* gnu/packages/version-control.scm (vc-dwim): Likewise.
---
gnu/packages/emacs.scm | 20 ++++++++++----------
gnu/packages/mail.scm | 2 +-
gnu/packages/version-control.scm | 4 ++--
3 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm
index fb1a3db..2f1bd21 100644
--- a/gnu/packages/emacs.scm
+++ b/gnu/packages/emacs.scm
@@ -264,8 +264,8 @@ editor (without an X toolkit)" )
"/share/emacs/site-lisp/"
"geiser-autoloads.el")))
%standard-phases)))
- (inputs `(("guile" ,guile-2.0)
- ("emacs" ,emacs-no-x)))
+ (inputs `(("guile" ,guile-2.0)))
+ (native-inputs `(("emacs" ,emacs-no-x)))
(home-page "http://nongnu.org/geiser/")
(synopsis "Collection of Emacs modes for Guile and Racket hacking")
(description
@@ -319,7 +319,7 @@ metadata.")
(base32
"0pp3n8q6kc70blqsaw0zlzp6bc327dpgdrjr0cnh7hqg1lras7ka"))))
(build-system trivial-build-system)
- (inputs `(("emacs" ,emacs-no-x)))
+ (native-inputs `(("emacs" ,emacs-no-x)))
(arguments
`(#:modules ((guix build utils)
(guix build emacs-utils))
@@ -557,9 +557,9 @@ support for Git-SVN.")
version ".tar.gz"))
(sha256
(base32 "1kxc2yj8vb122dv91r68h7c5ladcryx963fr16plfhg71fv7f9av"))))
- (inputs `(("emacs" ,emacs-no-x)))
(native-inputs
- `(("texinfo" ,texinfo)))
+ `(("emacs" ,emacs-no-x)
+ ("texinfo" ,texinfo)))
(build-system gnu-build-system)
(arguments
`(#:make-flags (list (string-append "EMACS="
@@ -698,10 +698,10 @@ provides an optional IDE-like error list.")
(base32
"0zfxmq86pwk64yv0426gnjrvhjrgrjqn08sdcdhmmjmfpmqvm79y"))))
(build-system gnu-build-system)
- (native-inputs `(("autoconf" ,autoconf)))
+ (native-inputs `(("autoconf" ,autoconf)
+ ("emacs" ,emacs-no-x)))
(inputs `(("w3m" ,w3m)
- ("imagemagick" ,imagemagick)
- ("emacs" ,emacs-no-x)))
+ ("imagemagick" ,imagemagick)))
(arguments
`(#:modules ((guix build gnu-build-system)
(guix build utils)
@@ -770,8 +770,8 @@ provides an optional IDE-like error list.")
(sha256
(base32 "10byvyv9dk0ib55gfqm7bcpxmx2qbih1jd03gmihrppr2mn52nff"))))
(build-system gnu-build-system)
- (inputs `(("wget" ,wget)
- ("emacs" ,emacs-no-x)))
+ (inputs `(("wget" ,wget)))
+ (native-inputs `(("emacs" ,emacs-no-x)))
(arguments
`(#:modules ((guix build gnu-build-system)
(guix build utils)
diff --git a/gnu/packages/mail.scm b/gnu/packages/mail.scm
index e86afb2..0f476eb 100644
--- a/gnu/packages/mail.scm
+++ b/gnu/packages/mail.scm
@@ -344,12 +344,12 @@ repository and Maildir/IMAP as LOCAL repository.")
("glib" ,glib "bin") ; for gtester
("autoconf" ,autoconf)
("automake" ,automake)
+ ("emacs" ,emacs-no-x)
("libtool" ,libtool)
("texinfo" ,texinfo)))
;; TODO: Add webkit and gtk to build the mug GUI.
(inputs
`(("xapian" ,xapian)
- ("emacs" ,emacs-no-x)
("guile" ,guile-2.0)
("glib" ,glib)
("gmime" ,gmime)
diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-control.scm
index db3e9f1..f00cff9 100644
--- a/gnu/packages/version-control.scm
+++ b/gnu/packages/version-control.scm
@@ -851,8 +851,8 @@ masters from remote CVS hosts.")
"094pjwshvazlgagc254in2xvrp93vhcj0kb5ms17qs7sch99x9z2"))))
(build-system gnu-build-system)
(inputs `(("perl" ,perl)
- ("inetutils" ,inetutils) ; for `hostname', used in the tests
- ("emacs" ,emacs-no-x))) ; for `ctags'
+ ("inetutils" ,inetutils))) ; for `hostname', used in the tests
+ (native-inputs `(("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
--
2.7.3
next prev parent reply other threads:[~2016-05-21 11:58 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-05-21 11:57 [PATCH 0/4] v2: Use emacs-minimal to build emacs packages Alex Kost
2016-05-21 11:57 ` [PATCH 1/4] gnu: Add emacs-minimal Alex Kost
2016-05-21 11:57 ` [PATCH 2/4] build-system/emacs: Use 'emacs-minimal' by default Alex Kost
2016-05-22 20:31 ` Ludovic Courtès
2016-05-24 8:59 ` Alex Kost
2016-05-21 11:57 ` Alex Kost [this message]
2016-05-21 11:57 ` [PATCH 4/4] gnu: Use 'emacs-minimal' instead of 'emacs-no-x' Alex Kost
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://guix.gnu.org/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1463831875-28373-4-git-send-email-alezost@gmail.com \
--to=alezost@gmail.com \
--cc=guix-devel@gnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/guix.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).