* [PATCH]: Add vim-full.
@ 2016-10-14 21:16 ng0
2016-10-14 21:16 ` [PATCH] gnu: " ng0
2016-10-14 21:25 ` [PATCH]: " ng0
0 siblings, 2 replies; 5+ messages in thread
From: ng0 @ 2016-10-14 21:16 UTC (permalink / raw)
To: guix-devel
[PATCH] gnu: Add vim-full.
This patch adds a variant of vim which includes most if not all optional
features. These can not be moved into separate outputs.
VIM is actually version 8.0.0002, so I added patches sequentially up to
8.0.0005 to solve this https://github.com/vim/vim/issues/1070#issuecomment-247141940 bug, tests succeed now while they failed with vim 8.0.0002 (release we package with vim).
This patch makes the previous send 'add ruby' obsolete.
^ permalink raw reply [flat|nested] 5+ messages in thread
* [PATCH] gnu: Add vim-full.
2016-10-14 21:16 [PATCH]: Add vim-full ng0
@ 2016-10-14 21:16 ` ng0
2016-10-15 18:21 ` Efraim Flashner
2016-10-14 21:25 ` [PATCH]: " ng0
1 sibling, 1 reply; 5+ messages in thread
From: ng0 @ 2016-10-14 21:16 UTC (permalink / raw)
To: guix-devel
* 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 <tipecaml@gmail.com>
;;; Copyright © 2016 Efraim Flashner <efraim@flashner.co.il>
+;;; Copyright © 2016 ng0 <ng0@we.make.ritual.n0.is>
;;;
;;; 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
^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [PATCH]: Add vim-full.
2016-10-14 21:16 [PATCH]: Add vim-full ng0
2016-10-14 21:16 ` [PATCH] gnu: " ng0
@ 2016-10-14 21:25 ` ng0
1 sibling, 0 replies; 5+ messages in thread
From: ng0 @ 2016-10-14 21:25 UTC (permalink / raw)
To: guix-devel
ng0 <ng0@we.make.ritual.n0.is> writes:
> [PATCH] gnu: Add vim-full.
>
>
> This patch adds a variant of vim which includes most if not all optional
> features. These can not be moved into separate outputs.
> VIM is actually version 8.0.0002, so I added patches sequentially up to
> 8.0.0005 to solve this https://github.com/vim/vim/issues/1070#issuecomment-247141940 bug, tests succeed now while they failed with vim 8.0.0002 (release we package with vim).
>
> This patch makes the previous send 'add ruby' obsolete.
>
>
ng0@shadowwalker ~$ vim --version
VIM - Vi IMproved 8.0 (2016 Sep 12) )
Included patches: 1-5
Compiled by nixbld@localhost
Huge version with GTK2 GUI. Features included (+) or not (-):
+acl +file_in_path +mouse_sgr +tag_old_static
+arabic +find_in_path -mouse_sysmouse -tag_any_white
+autocmd +float +mouse_urxvt +tcl
+balloon_eval +folding +mouse_xterm +termguicolors
+browse -footer +multi_byte +terminfo
++builtin_terms +fork() +multi_lang +termresponse
+byte_offset +gettext -mzscheme +textobjects
+channel -hangul_input +netbeans_intg +timers
+cindent +iconv +num64 +title
+clientserver +insert_expand +packages +toolbar
+clipboard +job +path_extra +user_commands
+cmdline_compl +jumplist +perl +vertsplit
+cmdline_hist +keymap +persistent_undo +virtualedit
+cmdline_info +lambda +postscript +visual
+comments +langmap +printer +visualextra
+conceal +libcall +profile +viminfo
+cryptv +linebreak -python +vreplace
+cscope +lispindent +python3 +wildignore
+cursorbind +listcmds +quickfix +wildmenu
+cursorshape +localmap +reltime +windows
+dialog_con_gui +lua +rightleft +writebackup
+diff +menu +ruby +X11
+digraphs +mksession +scrollbind -xfontset
+dnd +modify_fname +signs +xim
-ebcdic +mouse +smartindent +xpm
+emacs_tags +mouseshape +startuptime +xsmp_interact
+eval +mouse_dec +statusline +xterm_clipboard
+ex_extra +mouse_gpm -sun_workshop -xterm_save
+extra_search -mouse_jsbterm +syntax
+farsi +mouse_netterm +tag_binary
system vimrc file: "$VIM/vimrc"
user vimrc file: "$HOME/.vimrc"
2nd user vimrc file: "~/.vim/vimrc"
user exrc file: "$HOME/.exrc"
system gvimrc file: "$VIM/gvimrc"
user gvimrc file: "$HOME/.gvimrc"
2nd user gvimrc file: "~/.vim/gvimrc"
defaults file: "$VIMRUNTIME/defaults.vim"
system menu file: "$VIMRUNTIME/menu.vim"
fall-back for $VIM: "
/gnu/store/4ycsqihmz3kh98c0z2x2275ym94m7x7a-vim-full-8.0/share/vim"
Compilation: gcc -c -I. -Iproto -DHAVE_CONFIG_H -DFEAT_GUI_GTK -pthread -I/gnu/store/vq1fk3zi8lkjds25h44y819aa19x78i3-atk-2.20.0/include/atk-1.0 -I/gnu/store/ra7d6fva92ndwdd5kz4h8xq2qrq3lq8s-cairo-1.14.6/include/cairo -I/gnu/store/qxak8dv68cmrxj590r8db2g34bnnsdag-freetype-2.6.3/include/freetype2 -I/gnu/store/36s16c5s9c702vzm9q6g9idc7fvds2ks-libpng-1.5.26/include/libpng15 -I/gnu/store/qxak8dv68cmrxj590r8db2g34bnnsdag-freetype-2.6.3/include/freetype2 -I/gnu/store/dl1iv83q3kz632g127f4gzcmhpdxj5n0-gdk-pixbuf-2.34.0/include/gdk-pixbuf-2.0 -I/gnu/store/l1s4cw9g58hmcpd2qgbckfl228143qzx-glib-2.48.0/include/glib-2.0 -I/gnu/store/l1s4cw9g58hmcpd2qgbckfl228143qzx-glib-2.48.0/lib/glib-2.0/include -I/gnu/store/xycg7fj6gcvlvjh35w27ljzgpf8jwkvp-gtk+-2.24.30/include/gtk-2.0 -I/gnu/store/xycg7fj6gcvlvjh35w27ljzgpf8jwkvp-gtk+-2.24.30/lib/gtk-2.0/include -I/gnu/store/xp330hq98mz8qsqfwpqw0274zwb606c1-harfbuzz-1.2.4/include/harfbuzz -I/gnu/store/36s16c5s9c702vzm9q6g9idc7fvds2ks-libpng-1.5.26/include/libpng15 -I/gnu/store/rqla9asxbz3lsgf3crl6gs5i21j9kd2z-pango-1.40.1/include/pango-1.0 -I/gnu/store/d3d724jkz27w13kychb56r6p7xxbyibr-pixman-0.34.0/include/pixman-1 -g -O2 -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=1
Linking: gcc -L/gnu/store/vq1fk3zi8lkjds25h44y819aa19x78i3-atk-2.20.0/lib -L/gnu/store/ra7d6fva92ndwdd5kz4h8xq2qrq3lq8s-cairo-1.14.6/lib -L/gnu/store/1rcsqn8h2xwmgdra3zr33xv73d44wf1s-fontconfig-2.11.94/lib -L/gnu/store/qxak8dv68cmrxj590r8db2g34bnnsdag-freetype-2.6.3/lib -L/gnu/store/dl1iv83q3kz632g127f4gzcmhpdxj5n0-gdk-pixbuf-2.34.0/lib -L/gnu/store/l1s4cw9g58hmcpd2qgbckfl228143qzx-glib-2.48.0/lib -L/gnu/store/xycg7fj6gcvlvjh35w27ljzgpf8jwkvp-gtk+-2.24.30/lib -L/gnu/store/rqla9asxbz3lsgf3crl6gs5i21j9kd2z-pango-1.40.1/lib -L. -fstack-protector -rdynamic -Wl,-export-dynamic -Wl,-E -Wl,-rpath,/gnu/store/7nfjg3f2c4s0jpz3vqh3iqdn9j1c3prq-perl-5.22.1/lib/perl5/5.22.1/x86_64-linux/CORE -Wl,--as-needed -o vim -L/gnu/store/vq1fk3zi8lkjds25h44y819aa19x78i3-atk-2.20.0/lib -L/gnu/store/ra7d6fva92ndwdd5kz4h8xq2qrq3lq8s-cairo-1.14.6/lib -L/gnu/store/1rcsqn8h2xwmgdra3zr33xv73d44wf1s-fontconfig-2.11.94/lib -L/gnu/store/qxak8dv68cmrxj590r8db2g34bnnsdag-freetype-2.6.3/lib -L/gnu/store/dl1iv83q3kz632g127f4gzcmhpdxj5n0-gdk-pixbuf-2.34.0/lib -L/gnu/store/l1s4cw9g58hmcpd2qgbckfl228143qzx-glib-2.48.0/lib -L/gnu/store/xycg7fj6gcvlvjh35w27ljzgpf8jwkvp-gtk+-2.24.30/lib -L/gnu/store/rqla9asxbz3lsgf3crl6gs5i21j9kd2z-pango-1.40.1/lib -lgtk-x11-2.0 -lgdk-x11-2.0 -lpangocairo-1.0 -latk-1.0 -lcairo -lgdk_pixbuf-2.0 -lgio-2.0 -lpangoft2-1.0 -lpango-1.0 -lgobject-2.0 -lglib-2.0 -lfontconfig -lfreetype -lSM -lICE -lXpm -lXt -lX11 -lXdmcp -lSM -lICE -lm -lncurses -lnsl -lacl -lattr -lgpm -ldl -L/gnu/store/fsnl37apanfzx9f59l7aqwzqr9n6brr8-lua-5.2.4/lib -llua -Wl,-E -Wl,-rpath,/gnu/store/7nfjg3f2c4s0jpz3vqh3iqdn9j1c3prq-perl-5.22.1/lib/perl5/5.22.1/x86_64-linux/CORE -fstack-protector-strong -L/gnu/store/m9vxvhdj691bq1f85lpflvnhcvrdilih-glibc-2.23/lib -L/gnu/store/7nfjg3f2c4s0jpz3vqh3iqdn9j1c3prq-perl-5.22.1/lib/perl5/5.22.1/x86_64-linux/CORE -lperl -lpthread -lnsl -ldl -lm -lcrypt -lutil -lc -L/gnu/store/fmkdqmqx2jk3n0m6yan05w8w4k940960-python-3.4.3/lib/python3.4/config-3.4m -lpython3.4m -lpthread -ldl -lutil -lm -L/gnu/store/m5j8k9c7qhxhv3ddzrkdk1q36kvkji43-tcl-8.6.4/lib -ltcl8.6 -ldl -lpthread -lieee -lm -Wl,-R/gnu/store/550nymj8d2pcpjx3fx1980scrd0qn8j4-ruby-2.3.1/lib -L/gnu/store/550nymj8d2pcpjx3fx1980scrd0qn8j4-ruby-2.3.1/lib -lruby-static -lpthread -ldl -lcrypt -lm -L/gnu/store/550nymj8d2pcpjx3fx1980scrd0qn8j4-ruby-2.3.1/lib
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH] gnu: Add vim-full.
2016-10-14 21:16 ` [PATCH] gnu: " ng0
@ 2016-10-15 18:21 ` Efraim Flashner
2016-10-15 21:27 ` ng0
0 siblings, 1 reply; 5+ messages in thread
From: Efraim Flashner @ 2016-10-15 18:21 UTC (permalink / raw)
To: ng0; +Cc: guix-devel
[-- Attachment #1: Type: text/plain, Size: 5608 bytes --]
On Fri, Oct 14, 2016 at 09:16:15PM +0000, ng0 wrote:
> * 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 <tipecaml@gmail.com>
> ;;; Copyright © 2016 Efraim Flashner <efraim@flashner.co.il>
> +;;; Copyright © 2016 ng0 <ng0@we.make.ritual.n0.is>
> ;;;
> ;;; 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"))))
vim-7.4 went to over 2000 patches. If we do start applying patches to
our vim package then we should apply them to both versions, and it would
probably be better to use the bash patch method.
> + (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)
python-2 gets dropped if both python2 and python3 are included as inputs
> + ("ruby" ,ruby)
> + ("tcl" ,tcl)
> + ,@(package-inputs vim)))))
> --
> 2.10.1
>
>
--
Efraim Flashner <efraim@flashner.co.il> אפרים פלשנר
GPG key = A28B F40C 3E55 1372 662D 14F7 41AA E7DC CA3D 8351
Confidentiality cannot be guaranteed on emails sent or received unencrypted
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 801 bytes --]
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH] gnu: Add vim-full.
2016-10-15 18:21 ` Efraim Flashner
@ 2016-10-15 21:27 ` ng0
0 siblings, 0 replies; 5+ messages in thread
From: ng0 @ 2016-10-15 21:27 UTC (permalink / raw)
To: Efraim Flashner; +Cc: guix-devel
Efraim Flashner <efraim@flashner.co.il> writes:
> [ Unknown signature status ]
> On Fri, Oct 14, 2016 at 09:16:15PM +0000, ng0 wrote:
>> * 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 <tipecaml@gmail.com>
>> ;;; Copyright © 2016 Efraim Flashner <efraim@flashner.co.il>
>> +;;; Copyright © 2016 ng0 <ng0@we.make.ritual.n0.is>
>> ;;;
>> ;;; 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"))))
>
> vim-7.4 went to over 2000 patches. If we do start applying patches to
> our vim package then we should apply them to both versions, and it would
> probably be better to use the bash patch method.
I'vre just send in a new patch of this, I forgot the patches.
I only included the patches which are needed to make the testsuite to
succeed. This is not needed at all in the current vim we have.
I did what I can, I do not understand the bash method. Someone who does
can apply the method used in bash.scm, I won't.
>> + (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)
>
> python-2 gets dropped if both python2 and python3 are included as inputs
My bad, I forgot to remove parts of that. I removed building python2
already.
I'll update this patch tomorrow, in the new thread.
>> + ("ruby" ,ruby)
>> + ("tcl" ,tcl)
>> + ,@(package-inputs vim)))))
>> --
>> 2.10.1
>>
>>
>
> --
> Efraim Flashner <efraim@flashner.co.il> אפרים פלשנר
> GPG key = A28B F40C 3E55 1372 662D 14F7 41AA E7DC CA3D 8351
> Confidentiality cannot be guaranteed on emails sent or received unencrypted
--
♥Ⓐ ng0
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2016-10-15 21:27 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-10-14 21:16 [PATCH]: Add vim-full ng0
2016-10-14 21:16 ` [PATCH] gnu: " ng0
2016-10-15 18:21 ` Efraim Flashner
2016-10-15 21:27 ` ng0
2016-10-14 21:25 ` [PATCH]: " ng0
Code repositories for project(s) associated with this external index
https://git.savannah.gnu.org/cgit/guix.git
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.