From patchwork Sat May 21 11:57:54 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alex Kost X-Patchwork-Id: 12443 Received: (qmail 27347 invoked by uid 89); 21 May 2016 11:58:56 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Checked: by ClamAV 0.99.1 on sourceware.org X-Virus-Found: No X-Spam-SWARE-Status: No, score=-3.3 required=5.0 tests=BAYES_00, FREEMAIL_FROM, RP_MATCHES_RCVD, SPF_PASS autolearn=ham version=3.3.2 spammy=8518, 2648 X-Spam-Status: No, score=-3.3 required=5.0 tests=BAYES_00, FREEMAIL_FROM, RP_MATCHES_RCVD, SPF_PASS autolearn=ham version=3.3.2 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on sourceware.org X-Spam-Level: X-HELO: lists.gnu.org Received: from lists.gnu.org (HELO lists.gnu.org) (208.118.235.17) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with (AES256-SHA encrypted) ESMTPS; Sat, 21 May 2016 11:58:45 +0000 Received: from localhost ([::1]:40134 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1b45YJ-0007lo-NW for patchwork@sourceware.org; Sat, 21 May 2016 07:58:43 -0400 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) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:subject:date:message-id:in-reply-to:references; bh=kl9XekZ8bAJciaAA7Ym0e91C26vjCM4+1Ce+B2frN2Y=; b=FHyb7cpdcuvDqGIcXolJmfyTF1M/l1vX0yOBnUSDKAtFiGFdP5KBDVGc1jnG2Iyx+r c8WtC9AN3yVt4BlTJ7dpErv6J2+f4JAt6tGB+7FxE39LkOY5bkhy7vURt5YU3XONBk8A R4RvHS/Z0+poAZABVYRWtG0N7rE6CWKhea3UeMUUnMRJmtrS6RNSwo6P6XMQ6eqEie+c XJ9+9guYDYcQKv6MeIx6YXu87FwY79umO9nQ2mmJtJQ3n0k6JjmW0jJ2xY0JMPa7d6Ky aOGjyBzdt+1jPDPPYIku4x8E+DKU6YeXmgEmVlTgcv6yTVK/3DZ7NcDuZ0almT9BhVjx WWGA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references; bh=kl9XekZ8bAJciaAA7Ym0e91C26vjCM4+1Ce+B2frN2Y=; b=jw/ptVo0Ukc5wJfUu+RvKDZOzw3aM8fxYZVmUblkXW5A5PKoYFPXK1m0KsngUkHSoY 3UoZtcgoRPPsjt8gy0/J7Sb0kPliScYBWuxrosdVvCdMfhWpT+7iZ6bvVHCYplxgfuVK wQJ7Foni7bCCyZlnRdGlmIlFzvEEpttFVYOpK4KZNVGXUier1Ht+n+/QCjVFy5tW5x4A GvQKpgsLlw5ImrC84ie1fBCs1IB2cNaf0otCGql1HGhMxXmeTlux6p7f2gtGqjpYJEc2 C2KXmLKqVrDP7ynwMEuJWLN4Lol5pSjDG8kMttiSVPT3ueJZujsRPt1NoRAiAgBMX7Z3 zzYg== X-Gm-Message-State: AOPr4FUSyq5YgB2x4MpVC097OdUo6Y2MaQxmxLtBL0qFRsxz4aFXyr2D42XHof2NPxqUgQ== X-Received: by 10.112.160.170 with SMTP id xl10mr2335884lbb.103.1463831891285; Sat, 21 May 2016 04:58:11 -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) From: Alex Kost 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 Message-Id: <1463831875-28373-4-git-send-email-alezost@gmail.com> X-Mailer: git-send-email 2.7.3 In-Reply-To: <1463831875-28373-1-git-send-email-alezost@gmail.com> References: <1463831875-28373-1-git-send-email-alezost@gmail.com> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 2a00:1450:4010:c04::22e X-BeenThere: guix-devel@gnu.org X-Mailman-Version: 2.1.21 Precedence: list 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+patchwork=sourceware.org@gnu.org Sender: "Guix-devel" * 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