From mboxrd@z Thu Jan 1 00:00:00 1970 From: Alex Kost Subject: [PATCH 5/6] gnu: Move emacs for building from inputs to native-inputs. Date: Mon, 16 May 2016 21:20:23 +0300 Message-ID: <1463422824-7161-6-git-send-email-alezost@gmail.com> References: <1463422824-7161-1-git-send-email-alezost@gmail.com> Return-path: Received: from eggs.gnu.org ([2001:4830:134:3::10]:41538) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1b2N8F-0004NY-HZ for guix-devel@gnu.org; Mon, 16 May 2016 14:20:45 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1b2N8D-0008Hv-9t for guix-devel@gnu.org; Mon, 16 May 2016 14:20:43 -0400 Received: from mail-lb0-x22a.google.com ([2a00:1450:4010:c04::22a]:34633) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1b2N8C-0008HE-P9 for guix-devel@gnu.org; Mon, 16 May 2016 14:20:41 -0400 Received: by mail-lb0-x22a.google.com with SMTP id n11so53177504lbh.1 for ; Mon, 16 May 2016 11:20:40 -0700 (PDT) Received: from localhost.localdomain ([217.107.192.156]) by smtp.gmail.com with ESMTPSA id rs2sm5576775lbb.33.2016.05.16.11.20.39 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 16 May 2016 11:20:39 -0700 (PDT) In-Reply-To: <1463422824-7161-1-git-send-email-alezost@gmail.com> 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" To: guix-devel@gnu.org * 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/scheme.scm (scmutils): Likewise. * gnu/packages/version-control.scm (vc-dwim): Likewise. --- gnu/packages/emacs.scm | 20 ++++++++++---------- gnu/packages/mail.scm | 2 +- gnu/packages/scheme.scm | 4 ++-- gnu/packages/version-control.scm | 4 ++-- 4 files changed, 15 insertions(+), 15 deletions(-) diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm index 32e24a4..077d9af 100644 --- a/gnu/packages/emacs.scm +++ b/gnu/packages/emacs.scm @@ -262,8 +262,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 @@ -287,7 +287,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)) @@ -525,9 +525,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=" @@ -666,10 +666,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) @@ -738,8 +738,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/scheme.scm b/gnu/packages/scheme.scm index 6cf75c2..452de17 100644 --- a/gnu/packages/scheme.scm +++ b/gnu/packages/scheme.scm @@ -571,8 +571,8 @@ threads.") (base32 "10cnbm7nh78m5mrl1di85s29gny81jb1am9zd9f9yx725xb6dnfg")))) (build-system gnu-build-system) (inputs - `(("mit-scheme" ,mit-scheme) - ("emacs" ,emacs-no-x))) + `(("mit-scheme" ,mit-scheme))) + (native-inputs `(("emacs" ,emacs-no-x))) (arguments `(#:tests? #f ;; no tests-suite #:modules ((guix build gnu-build-system) diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-control.scm index d47b3e8..3e0f5b8 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