From mboxrd@z Thu Jan 1 00:00:00 1970 From: Alex Kost Subject: [PATCH 3/4] gnu: Move emacs for building from inputs to native-inputs. Date: Sat, 21 May 2016 14:57:54 +0300 Message-ID: <1463831875-28373-4-git-send-email-alezost@gmail.com> References: <1463831875-28373-1-git-send-email-alezost@gmail.com> Return-path: Received: from eggs.gnu.org ([2001:4830:134:3::10]:48471) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1b45Xu-0007SW-Vx for guix-devel@gnu.org; Sat, 21 May 2016 07:58:20 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1b45Xp-0003pj-2E for guix-devel@gnu.org; Sat, 21 May 2016 07:58:19 -0400 Received: from mail-lb0-x22e.google.com ([2a00:1450:4010:c04::22e]:36389) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1b45Xo-0003od-7Z for guix-devel@gnu.org; Sat, 21 May 2016 07:58:12 -0400 Received: by mail-lb0-x22e.google.com with SMTP id h1so42767092lbj.3 for ; Sat, 21 May 2016 04:58:12 -0700 (PDT) Received: from localhost.localdomain ([217.107.192.156]) by smtp.gmail.com with ESMTPSA id j2sm4184680lfb.13.2016.05.21.04.58.10 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sat, 21 May 2016 04:58:10 -0700 (PDT) In-Reply-To: <1463831875-28373-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/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