From mboxrd@z Thu Jan 1 00:00:00 1970 From: ng0 Subject: [PATCH] gnu: Add vim-full. Date: Fri, 14 Oct 2016 21:16:15 +0000 Message-ID: <20161014211615.5371-2-ng0@we.make.ritual.n0.is> References: <20161014211615.5371-1-ng0@we.make.ritual.n0.is> Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Return-path: Received: from eggs.gnu.org ([2001:4830:134:3::10]:49647) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bv9qA-0002kK-G2 for guix-devel@gnu.org; Fri, 14 Oct 2016 17:16:31 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bv9q5-0001A6-Pr for guix-devel@gnu.org; Fri, 14 Oct 2016 17:16:29 -0400 Received: from aibo.runbox.com ([91.220.196.211]:51070) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1bv9q5-00019s-Ia for guix-devel@gnu.org; Fri, 14 Oct 2016 17:16:25 -0400 Received: from [10.9.9.211] (helo=mailfront11.runbox.com) by bars.runbox.com with esmtp (Exim 4.71) (envelope-from ) id 1bv9q4-0002SM-Eu for guix-devel@gnu.org; Fri, 14 Oct 2016 23:16:24 +0200 In-Reply-To: <20161014211615.5371-1-ng0@we.make.ritual.n0.is> 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/vim.scm (vim-full): New variable. * gnu/packages/patches/vim-8.0.0003.patch: New file. * gnu/packages/patches/vim-8.0.0004.patch: New file. * gnu/packages/patches/vim-8.0.0005.patch: New file. * gnu/local.mk (dist_patch_DATA): Add patches. --- gnu/local.mk | 3 ++ gnu/packages/vim.scm | 82 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 85 insertions(+) diff --git a/gnu/local.mk b/gnu/local.mk index 526756f..79c1326 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -874,6 +874,9 @@ dist_patch_DATA = \ %D%/packages/patches/util-linux-tests.patch \ %D%/packages/patches/upower-builddir.patch \ %D%/packages/patches/valgrind-enable-arm.patch \ + %D%/packages/patches/vim-8.0.0003.patch \ + %D%/packages/patches/vim-8.0.0004.patch \ + %D%/packages/patches/vim-8.0.0005.patch \ %D%/packages/patches/vorbis-tools-CVE-2014-9638+CVE-2014-9639.patch \ %D%/packages/patches/vorbis-tools-CVE-2014-9640.patch \ %D%/packages/patches/vorbis-tools-CVE-2015-6749.patch \ diff --git a/gnu/packages/vim.scm b/gnu/packages/vim.scm index b1ee527..58ea3e1 100644 --- a/gnu/packages/vim.scm +++ b/gnu/packages/vim.scm @@ -1,6 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2013 Cyril Roelandt ;;; Copyright © 2016 Efraim Flashner +;;; Copyright © 2016 ng0 ;;; ;;; This file is part of GNU Guix. ;;; @@ -26,6 +27,21 @@ #:use-module (gnu packages gawk) #:use-module (gnu packages ncurses) #:use-module (gnu packages perl) + #:use-module (gnu packages ruby) + #:use-module (gnu packages acl) + #:use-module (gnu packages attr) + #:use-module (gnu packages fontutils) + #:use-module (gnu packages gettext) + #:use-module (gnu packages glib) + #:use-module (gnu packages gtk) + #:use-module (gnu packages image) + #:use-module (gnu packages linux) + #:use-module (gnu packages lua) + #:use-module (gnu packages pkg-config) + #:use-module (gnu packages python) + #:use-module (gnu packages tcl) + #:use-module (gnu packages xdisorg) + #:use-module (gnu packages xorg) #:use-module (gnu packages admin) ; For GNU hostname #:use-module (gnu packages shells)) @@ -79,3 +95,69 @@ that many consider it an entire IDE. It's not just for programmers, though. Vim is perfect for all kinds of text editing, from composing email to editing configuration files.") (license license:vim))) + +(define-public vim-full + (package + (inherit vim) + (name "vim-full") + (version (package-version vim)) + (source + (origin + (method url-fetch) + (uri (string-append "ftp://ftp.vim.org/pub/vim/unix/vim-" + version ".tar.bz2")) + (sha256 + (base32 + "1s34rf8089klsbdx5l0iw7vjymir0kzfrx8wb30s31wygnq29axc")) + ;; Patches need to be applied sequentially. 8.0 is the release of + ;; vim version 8.0.0002 so we start at 8.0.0003 + (patches (search-patches "vim-8.0.0003.patch" + "vim-8.0.0004.patch" + "vim-8.0.0005.patch")))) + (arguments + `(#:configure-flags + (list (string-append "--with-lua-prefix=" + (assoc-ref %build-inputs "lua")) + "--with-features=huge" + "--enable-python3interp=yes" + "--enable-perlinterp=yes" + "--enable-rubyinterp=yes" + "--enable-tclinterp=yes" + "--enable-luainterp=yes" + "--enable-cscope" + "--enable-sniff" + "--enable-multibyte" + "--enable-xim" + "--disable-selinux" + "--enable-gui") + ,@(package-arguments vim))) + (native-inputs + `(("pkg-config" ,pkg-config))) + (inputs + `(("acl" ,acl) + ("atk" ,atk) + ("attr" ,attr) + ("cairo" ,cairo) + ("fontconfig" ,fontconfig) + ("freetype" ,freetype) + ("gdk-pixbuf" ,gdk-pixbuf) + ("gettext" ,gnu-gettext) + ("glib" ,glib) + ("gpm" ,gpm) + ("gtk" ,gtk+-2) + ("harfbuzz" ,harfbuzz) + ("libice" ,libice) + ("libpng" ,libpng) + ("libsm" ,libsm) + ("libx11" ,libx11) + ("libxdmcp" ,libxdmcp) + ("libxt" ,libxt) + ("libxpm" ,libxpm) + ("lua" ,lua) + ("pango" ,pango) + ("pixman" ,pixman) + ("python" ,python-wrapper) + ("python" ,python-2) + ("ruby" ,ruby) + ("tcl" ,tcl) + ,@(package-inputs vim))))) -- 2.10.1