From mboxrd@z Thu Jan 1 00:00:00 1970 From: Alex Kost Subject: [PATCH 4/4] gnu: Use 'emacs-minimal' instead of 'emacs-no-x'. Date: Sat, 21 May 2016 14:57:55 +0300 Message-ID: <1463831875-28373-5-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]:48458) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1b45Xs-0007RP-PY for guix-devel@gnu.org; Sat, 21 May 2016 07:58:18 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1b45Xq-0003rp-Kv for guix-devel@gnu.org; Sat, 21 May 2016 07:58:16 -0400 Received: from mail-lb0-x241.google.com ([2a00:1450:4010:c04::241]:35379) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1b45Xp-0003pa-W2 for guix-devel@gnu.org; Sat, 21 May 2016 07:58:14 -0400 Received: by mail-lb0-x241.google.com with SMTP id mx9so6873813lbb.2 for ; Sat, 21 May 2016 04:58:13 -0700 (PDT) Received: from localhost.localdomain ([217.107.192.156]) by smtp.gmail.com with ESMTPSA id j2sm4184680lfb.13.2016.05.21.04.58.11 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sat, 21 May 2016 04:58:11 -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/code.scm (cflow)[native-inputs]: Use 'emacs-minimal' instead of 'emacs-no-x'. * gnu/packages/databases.scm (recutils): Likewise. * gnu/packages/finance.scm (ledger): Likewise * gnu/packages/idutils.scm (idutils): Likewise. * gnu/packages/mail.scm (mu): Likewise. * gnu/packages/ocaml.scm (proof-general): Likewise. * gnu/packages/package-management.scm (guix-0.10.0): Likewise. * gnu/packages/plotutils.scm (asymptote): Likewise. * gnu/packages/scheme.scm (scmutils): Likewise. * gnu/packages/version-control.scm (vc-dwim): Likewise. * gnu/packages/emacs.scm (geiser): Likewise. (paredit): Likewise. (git-modes): Likewise. (magit): Likewise. (magit-svn): Likewise. (haskell-mode): Likewise. (let-alist): Likewise. (emacs-w3m): Likewise. (emacs-wget): Likewise. (emms): Likewise. (bbdb): Likewise. (emacs-mmm-mode): Likewise. (emacs-pdf-tools): Likewise. (emacs-popup)[native-inputs]: Remove as it is not needed for emacs-build-system. (emacs-rfcview): Likewise. (emacs-ffap-rfc-space): Likewise. --- gnu/packages/code.scm | 2 +- gnu/packages/databases.scm | 2 +- gnu/packages/emacs.scm | 32 +++++++++++++------------------- gnu/packages/finance.scm | 2 +- gnu/packages/idutils.scm | 2 +- gnu/packages/mail.scm | 2 +- gnu/packages/ocaml.scm | 2 +- gnu/packages/package-management.scm | 2 +- gnu/packages/plotutils.scm | 2 +- gnu/packages/scheme.scm | 2 +- gnu/packages/version-control.scm | 2 +- 11 files changed, 23 insertions(+), 29 deletions(-) diff --git a/gnu/packages/code.scm b/gnu/packages/code.scm index 7e8a361..c3efd15 100644 --- a/gnu/packages/code.scm +++ b/gnu/packages/code.scm @@ -54,7 +54,7 @@ (build-system gnu-build-system) ;; Needed to have cflow-mode.el installed. - (native-inputs `(("emacs" ,emacs-no-x))) + (native-inputs `(("emacs" ,emacs-minimal))) (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 57181f6..bd535a3 100644 --- a/gnu/packages/databases.scm +++ b/gnu/packages/databases.scm @@ -381,7 +381,7 @@ pictures, sounds, or video.") (assoc-ref %build-inputs "bash:include") "/include/bash")))) - (native-inputs `(("emacs" ,emacs-no-x) + (native-inputs `(("emacs" ,emacs-minimal) ("bc" ,bc) ("bash:include" ,bash "include") ("libuuid" ,util-linux))) diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm index 2f1bd21..b68f545 100644 --- a/gnu/packages/emacs.scm +++ b/gnu/packages/emacs.scm @@ -265,7 +265,7 @@ editor (without an X toolkit)" ) "geiser-autoloads.el"))) %standard-phases))) (inputs `(("guile" ,guile-2.0))) - (native-inputs `(("emacs" ,emacs-no-x))) + (native-inputs `(("emacs" ,emacs-minimal))) (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) - (native-inputs `(("emacs" ,emacs-no-x))) + (native-inputs `(("emacs" ,emacs-minimal))) (arguments `(#:modules ((guix build utils) (guix build emacs-utils)) @@ -390,7 +390,7 @@ when typing parentheses directly or commenting out code line by line.") (lisp (string-append out "/share/emacs/site-lisp/"))) (emacs-generate-autoloads ,name lisp))))))) - (native-inputs `(("emacs" ,emacs-no-x))) + (native-inputs `(("emacs" ,emacs-minimal))) (home-page "https://github.com/magit/git-modes") (synopsis "Emacs major modes for Git configuration files") (description @@ -437,7 +437,7 @@ on stdout instead of using a socket as the Emacsclient does.") "0im1jrqw29g5anrrjflj6b2gpyqkvpghnq8zvywxyhmjwzar4rn7")))) (build-system gnu-build-system) (native-inputs `(("texinfo" ,texinfo) - ("emacs" ,emacs-no-x))) + ("emacs" ,emacs-minimal))) (inputs `(("git" ,git))) (propagated-inputs `(("dash" ,emacs-dash) @@ -499,7 +499,7 @@ operations.") (base32 "04y88j7q9h8xjbx5dbick6n5nr1522sn9i1znp0qwk3vjb4b5mzz")))) (build-system trivial-build-system) - (native-inputs `(("emacs" ,emacs-no-x) + (native-inputs `(("emacs" ,emacs-minimal) ("tar" ,tar) ("gzip" ,gzip))) (propagated-inputs `(("dash" ,emacs-dash) @@ -558,7 +558,7 @@ support for Git-SVN.") (sha256 (base32 "1kxc2yj8vb122dv91r68h7c5ladcryx963fr16plfhg71fv7f9av")))) (native-inputs - `(("emacs" ,emacs-no-x) + `(("emacs" ,emacs-minimal) ("texinfo" ,texinfo))) (build-system gnu-build-system) (arguments @@ -639,7 +639,7 @@ programs.") (setenv "PATH" (string-append emacs "/bin")) (emacs-byte-compile-directory lispdir) #t)))) - (native-inputs `(("emacs" ,emacs-no-x))) + (native-inputs `(("emacs" ,emacs-minimal))) (home-page "http://elpa.gnu.org/packages/let-alist.html") (synopsis "Easily let-bind values of an assoc-list by their names") (description @@ -699,7 +699,7 @@ provides an optional IDE-like error list.") "0zfxmq86pwk64yv0426gnjrvhjrgrjqn08sdcdhmmjmfpmqvm79y")))) (build-system gnu-build-system) (native-inputs `(("autoconf" ,autoconf) - ("emacs" ,emacs-no-x))) + ("emacs" ,emacs-minimal))) (inputs `(("w3m" ,w3m) ("imagemagick" ,imagemagick))) (arguments @@ -771,7 +771,7 @@ provides an optional IDE-like error list.") (base32 "10byvyv9dk0ib55gfqm7bcpxmx2qbih1jd03gmihrppr2mn52nff")))) (build-system gnu-build-system) (inputs `(("wget" ,wget))) - (native-inputs `(("emacs" ,emacs-no-x))) + (native-inputs `(("emacs" ,emacs-minimal))) (arguments `(#:modules ((guix build gnu-build-system) (guix build utils) @@ -910,7 +910,7 @@ provides an optional IDE-like error list.") (chmod target #o555))) %standard-phases))) #:tests? #f)) - (native-inputs `(("emacs" ,emacs-no-x) ;for (guix build emacs-utils) + (native-inputs `(("emacs" ,emacs-minimal) ;for (guix build emacs-utils) ("texinfo" ,texinfo))) (inputs `(("alsa-utils" ,alsa-utils) ("vorbis-tools" ,vorbis-tools) @@ -960,7 +960,7 @@ light user interface.") (with-directory-excursion site (symlink "bbdb-loaddefs.el" "bbdb-autoloads.el")))) %standard-phases))) - (native-inputs `(("emacs" ,emacs-no-x))) + (native-inputs `(("emacs" ,emacs-minimal))) (home-page "http://savannah.nongnu.org/projects/bbdb/") (synopsis "Contact management utility for Emacs") (description @@ -1043,7 +1043,7 @@ or XEmacs.") (native-inputs `(("autoconf" ,autoconf) ("automake" ,automake) - ("emacs" ,emacs-no-x) + ("emacs" ,emacs-minimal) ("texinfo" ,texinfo))) (home-page "https://github.com/purcell/mmm-mode") (synopsis "Allow multiple major modes in an Emacs buffer") @@ -1107,7 +1107,7 @@ single buffer.") (native-inputs `(("autoconf" ,autoconf) ("automake" ,automake) ("pkg-config" ,pkg-config) - ("emacs" ,emacs-no-x))) + ("emacs" ,emacs-minimal))) (propagated-inputs `(("let-alist" ,let-alist))) (inputs `(("poppler" ,poppler) @@ -1519,8 +1519,6 @@ debugging, documentation lookup, and so on.") (base32 "1yrgfj8y69xmcb6kwgplhq68ndm9410qwh7sd2knnd1gchpphdc0")))) (build-system emacs-build-system) - (native-inputs - `(("emacs" ,emacs-no-x))) (home-page "https://github.com/auto-complete/popup-el") (synopsis "Visual Popup User Interface for Emacs") (description @@ -1568,8 +1566,6 @@ insertion mode. When enabled all keys are implicitly prefixed with (base32 "0ympj5rxig383zl2jf0pzdsa80nnq0dpvjiriq0ivfi98fj7kxbz")))) (build-system emacs-build-system) - (native-inputs - `(("emacs" ,emacs-no-x))) (synopsis "Prettify Request for Comments (RFC) documents") (description "The Internet Engineering Task Force (IETF) and the Internet Society (ISOC) publish various Internet-related protocols and specifications @@ -1594,8 +1590,6 @@ local directories.") (base32 "1iv61dv57a73mdps7rn6zmgz7nqh14v0ninidyrasy45b1nv6gck")))) (build-system emacs-build-system) - (native-inputs - `(("emacs" ,emacs-no-x))) (synopsis "Make ffap recognize an RFC with a space before its number") (description "The Internet Engineering Task Force (IETF) and the Internet Society (ISOC) publish various Internet-related protocols and diff --git a/gnu/packages/finance.scm b/gnu/packages/finance.scm index b511d2c..23faead 100644 --- a/gnu/packages/finance.scm +++ b/gnu/packages/finance.scm @@ -158,7 +158,7 @@ line client and a client based on Qt.") ("tzdata" ,tzdata) ("utfcpp" ,utfcpp))) (native-inputs - `(("emacs" ,emacs-no-x) + `(("emacs" ,emacs-minimal) ("groff" ,groff) ("texinfo" ,texinfo))) (home-page "http://ledger-cli.org/") diff --git a/gnu/packages/idutils.scm b/gnu/packages/idutils.scm index 7a8e1c6..63760c8 100644 --- a/gnu/packages/idutils.scm +++ b/gnu/packages/idutils.scm @@ -37,7 +37,7 @@ "1hmai3422iaqnp34kkzxdnywl7n7pvlxp11vrw66ybxn9wxg90c1")) (patches (search-patches "diffutils-gets-undeclared.patch")))) (build-system gnu-build-system) - (native-inputs `(("emacs" ,emacs-no-x))) + (native-inputs `(("emacs" ,emacs-minimal))) (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 0f476eb..39133fc 100644 --- a/gnu/packages/mail.scm +++ b/gnu/packages/mail.scm @@ -344,7 +344,7 @@ repository and Maildir/IMAP as LOCAL repository.") ("glib" ,glib "bin") ; for gtester ("autoconf" ,autoconf) ("automake" ,automake) - ("emacs" ,emacs-no-x) + ("emacs" ,emacs-minimal) ("libtool" ,libtool) ("texinfo" ,texinfo))) ;; TODO: Add webkit and gtk to build the mug GUI. diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index 434fb13..aafae51 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -386,7 +386,7 @@ It is developed using Objective Caml and Camlp5.") (build-system gnu-build-system) (native-inputs `(("which" ,which) - ("emacs" ,emacs-no-x) + ("emacs" ,emacs-minimal) ("texinfo" ,texinfo))) (inputs `(("host-emacs" ,emacs) diff --git a/gnu/packages/package-management.scm b/gnu/packages/package-management.scm index 314dc90..993808f 100644 --- a/gnu/packages/package-management.scm +++ b/gnu/packages/package-management.scm @@ -152,7 +152,7 @@ #t)))))) (native-inputs `(("pkg-config" ,pkg-config) - ("emacs" ,emacs-no-x))) ;for guix.el + ("emacs" ,emacs-minimal))) ;for guix.el (inputs (let ((boot-guile (lambda (arch hash) (origin diff --git a/gnu/packages/plotutils.scm b/gnu/packages/plotutils.scm index ef61239..5871fb0 100644 --- a/gnu/packages/plotutils.scm +++ b/gnu/packages/plotutils.scm @@ -189,7 +189,7 @@ colors, styles, options and details.") `(("gs" ,ghostscript) ;For tests ("texinfo" ,texinfo) ;For generating documentation ("texlive" ,texlive) ;For tests and documentation - ("emacs" ,emacs-no-x) + ("emacs" ,emacs-minimal) ("perl" ,perl))) (inputs `(("fftw" ,fftw) diff --git a/gnu/packages/scheme.scm b/gnu/packages/scheme.scm index 6cf75c2..42a0b8f 100644 --- a/gnu/packages/scheme.scm +++ b/gnu/packages/scheme.scm @@ -572,7 +572,7 @@ threads.") (build-system gnu-build-system) (inputs `(("mit-scheme" ,mit-scheme) - ("emacs" ,emacs-no-x))) + ("emacs" ,emacs-minimal))) (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 f00cff9..07ce534 100644 --- a/gnu/packages/version-control.scm +++ b/gnu/packages/version-control.scm @@ -852,7 +852,7 @@ masters from remote CVS hosts.") (build-system gnu-build-system) (inputs `(("perl" ,perl) ("inetutils" ,inetutils))) ; for `hostname', used in the tests - (native-inputs `(("emacs" ,emacs-no-x))) ; for `ctags' + (native-inputs `(("emacs" ,emacs-minimal))) ; for `ctags' (home-page "http://www.gnu.org/software/vc-dwim/") (synopsis "Version-control-agnostic ChangeLog diff and commit tool") (description -- 2.7.3