[PATCH] Add vim.

[PATCH] Add vim.

[Cyril Roelandt]

[-- Attachment #1: Type: text/plain, Size: 203 bytes --]

This patch adds vim (Vi IMproved), a very popular text editor based on 
vi, to the packages.

I did not specify a license, since vim uses a weird Charityware license; 
is that OK ?

WBR,
Cyril Roelandt.

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: 0001-Add-vim.patch --]
[-- Type: text/x-diff; name="0001-Add-vim.patch", Size: 3042 bytes --]

From 24d99e9b2da17d8c34014152bcaae47dc2bcd9f5 Mon Sep 17 00:00:00 2001
From: Cyril Roelandt <tipecaml@gmail.com>
Date: Fri, 18 Jan 2013 22:01:05 +0100
Subject: [PATCH] Add vim.

* gnu/packages/vim.scm: New file.
* Makefile.am (MODULES): Add it.
---
 Makefile.am          |    1 +
 gnu/packages/vim.scm |   51 ++++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 52 insertions(+)
 create mode 100644 gnu/packages/vim.scm

diff --git a/Makefile.am b/Makefile.am
index 5c58131..40286c3 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -116,6 +116,7 @@ MODULES =					\
   gnu/packages/tcl.scm				\
   gnu/packages/texinfo.scm			\
   gnu/packages/time.scm				\
+  gnu/packages/vim.scm 				\
   gnu/packages/wget.scm				\
   gnu/packages/which.scm			\
   gnu/packages/xml.scm				\
diff --git a/gnu/packages/vim.scm b/gnu/packages/vim.scm
new file mode 100644
index 0000000..ef8a0b7
--- /dev/null
+++ b/gnu/packages/vim.scm
@@ -0,0 +1,51 @@
+;;; GNU Guix --- Functional package management for GNU
+;;; Copyright © 2013 Cyril Roelandt <tipecaml@gmail.com>
+;;;
+;;; This file is part of GNU Guix.
+;;;
+;;; GNU Guix is free software; you can redistribute it and/or modify it
+;;; under the terms of the GNU General Public License as published by
+;;; the Free Software Foundation; either version 3 of the License, or (at
+;;; your option) any later version.
+;;;
+;;; GNU Guix is distributed in the hope that it will be useful, but
+;;; WITHOUT ANY WARRANTY; without even the implied warranty of
+;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;;; GNU General Public License for more details.
+;;;
+;;; You should have received a copy of the GNU General Public License
+;;; along with GNU Guix.  If not, see <http://www.gnu.org/licenses/>.
+
+(define-module (gnu packages vim)
+  #:use-module (guix packages)
+  #:use-module (guix download)
+  #:use-module (guix build-system gnu)
+  #:use-module (gnu packages)
+  #:use-module (gnu packages ncurses))
+
+(define-public vim
+  (package
+    (name "vim")
+    (version "7.3")
+    (source (origin
+             (method url-fetch)
+             (uri (string-append "ftp://ftp.vim.org/pub/vim/unix/vim-"
+                                 version ".tar.bz2"))
+             (sha256
+              (base32
+               "079201qk8g9yisrrb0dn52ch96z3lzw6z473dydw9fzi0xp5spaw"))))
+    (build-system gnu-build-system)
+    (arguments
+     `(#:tests? #f)) ; no "check" target
+    (inputs `(("ncurses", ncurses)))
+    (home-page "http://www.vim.org/")
+    (synopsis "VIM 7.3, a text editor based on vi.")
+    (description
+     "Vim is a highly configurable text editor built to enable efficient text
+editing. It is an improved version of the vi editor distributed with most UNIX
+systems.
+
+Vim is often called a \"programmer's editor,\" and so useful for programming
+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. ")))
-- 
1.7.10.4

Re: [PATCH] Add vim.

[Ludovic Courtès]

Hey!

Cyril Roelandt <tipecaml@gmail.com> skribis:

> This patch adds vim (Vi IMproved), a very popular text editor based on
> vi, to the packages.
>
> I did not specify a license, since vim uses a weird Charityware
> license; is that OK ?

No.  :-)

Can you please add it to guix/licenses.scm, using
http://www.gnu.org/philosophy/license-list.html#Vim in the third field?

Then just include (guix licenses) in vim.scm, and use it.
You’ll need a #:renamer to avoid a name clash, as is done in openssl.scm.

> +;;; Copyright ?? 2013 Cyril Roelandt <tipecaml@gmail.com>

Make sure to use UTF-8.

Other than that, looks good, thanks!

Ludo’.

Re: [PATCH] Add vim.

[Cyril Roelandt]

On 01/18/2013 10:45 PM, Ludovic Courtès wrote:
> Hey!
>
> Cyril Roelandt<tipecaml@gmail.com>  skribis:
>
>> This patch adds vim (Vi IMproved), a very popular text editor based on
>> vi, to the packages.
>>
>> I did not specify a license, since vim uses a weird Charityware
>> license; is that OK ?
>
> No.  :-)
>
> Can you please add it to guix/licenses.scm, using
> http://www.gnu.org/philosophy/license-list.html#Vim in the third field?
>
> Then just include (guix licenses) in vim.scm, and use it.
> You’ll need a #:renamer to avoid a name clash, as is done in openssl.scm.
>

Why would there be a clash ?

Just using "(license vim)" seems to work.

>> +;;; Copyright ?? 2013 Cyril Roelandt<tipecaml@gmail.com>
>
> Make sure to use UTF-8.

Is it ok to send patches using git send-email, since all mail clients suck ?

>
> Other than that, looks good, thanks!
>

You're welcome !

Cyril.

Re: [PATCH] Add vim.

[Ludovic Courtès]

Hi,

Cyril Roelandt <tipecaml@gmail.com> skribis:

> On 01/18/2013 10:45 PM, Ludovic Courtès wrote:

[...]

>> Then just include (guix licenses) in vim.scm, and use it.
>> You’ll need a #:renamer to avoid a name clash, as is done in openssl.scm.
>>
>
> Why would there be a clash ?

Because within the (gnu packages vim) module, there are two global
variables named ‘vim’: the license, and the package.

> Just using "(license vim)" seems to work.

Yes, but here it refers to the ‘vim’ variable that is bound to the
package, not the one bound to the license.

>>> +;;; Copyright ?? 2013 Cyril Roelandt<tipecaml@gmail.com>
>>
>> Make sure to use UTF-8.
>
> Is it ok to send patches using git send-email, since all mail clients suck ?

Sure.

Ludo’.

Re: [PATCH] Add vim.

[Andreas Enge]

[-- Attachment #1: Type: text/plain, Size: 783 bytes --]

Hello,

Am Freitag, 18. Januar 2013 schrieb Cyril Roelandt:
> This patch adds vim (Vi IMproved), a very popular text editor based on
> vi, to the packages.

the recipe works well for me, thanks!

> I did not specify a license, since vim uses a weird Charityware license;
> is that OK ?

The FSF references the vim license, see
   http://www.gnu.org/licenses/license-list.html#Vim and
   http://directory.fsf.org/wiki/License:Vim7.2
I just added it to guix/licenses.scm and pushed the change, so you can add 
it to the recipe.

While there is no "make check" target, there is "make test"; so you can 
replace   
   #:tests? #f
by
   #:test-target "test"
(and watch the visuals appear on the screen, it is a rather funny test 
suite).

Could you prepare a new patch?

Thanks!

Andreas

[-- Attachment #2: Type: text/html, Size: 5089 bytes --]

Re: [PATCH] Add vim.

[Cyril Roelandt]

On 01/18/2013 10:53 PM, Andreas Enge wrote:
> Hello,
>
> Am Freitag, 18. Januar 2013 schrieb Cyril Roelandt:
>> This patch adds vim (Vi IMproved), a very popular text editor based on
>> vi, to the packages.
>
> the recipe works well for me, thanks!
>
>> I did not specify a license, since vim uses a weird Charityware license;
>> is that OK ?
>
> The FSF references the vim license, see
>     http://www.gnu.org/licenses/license-list.html#Vim and
>     http://directory.fsf.org/wiki/License:Vim7.2
> I just added it to guix/licenses.scm and pushed the change, so you can add
> it to the recipe.
>

Thanks !

> While there is no "make check" target, there is "make test"; so you can
> replace
>     #:tests? #f
> by
>     #:test-target "test"
> (and watch the visuals appear on the screen, it is a rather funny test
> suite).
>

Right. I did that, and the test suite fails :

/nix/store/4mg8b8vvmava68y64qmm70gqfnhhjzmx-bash-4.2/bin/bash: /bin/sh: 
No such file or directory
make[2]: *** [test1.out] Error 127
make[2]: Leaving directory `/tmp/nix-build-vim-7.3.drv-0/vim73/src/testdir'

Seems like there have been problems with /bin/sh before 
(http://lists.gnu.org/archive/html/bug-guix/2013-01/msg00132.html), so I 
tried using bash instead :

     (arguments
       `(#:test-target "test"
         #:phases
         (alist-replace
           'check
           (lambda* (#:key #:allow-other-keys #:rest args)
            (let ((check (assoc-ref %standard-phases 'check)))
             (substitute* "src/testdir/Makefile"
               (("`/bin/sh")
               (string-append "`" (which "bash"))))
             (apply check args)))
        %standard-phases)


but I get the same error. Any idea ?

Cyril.

Re: [PATCH] Add vim.

[Andreas Enge]

[-- Attachment #1: Type: text/plain, Size: 573 bytes --]

Am Samstag, 19. Januar 2013 schrieb Cyril Roelandt:
> Right. I did that, and the test suite fails :
> /nix/store/4mg8b8vvmava68y64qmm70gqfnhhjzmx-bash-4.2/bin/bash: /bin/sh:
> No such file or directory

This is strange - as if the bash binary called /bin/sh. I actually do not 
have this nix store path; maybe it comes from nix and not from guix? And 
maybe it is a shell script instead of the bash binary? Which would be 
surprising, in any case.

Could you maybe send the patch (without the replacement of /bin/sh by 
(which "bash"), and I try it in my setting?

Andreas

[-- Attachment #2: Type: text/html, Size: 2524 bytes --]

Re: [PATCH] Add vim.

[Ludovic Courtès]

Andreas Enge <andreas@enge.fr> skribis:

> This is strange - as if the bash binary called /bin/sh. I actually do not 
> have this nix store path;

I think he’s on i686, whereas you’re on x86_64, hence the different paths.

Ludo’.

Re: [PATCH] Add vim.

[Cyril Roelandt]

On 01/19/2013 02:51 PM, Ludovic Courtès wrote:
> Andreas Enge<andreas@enge.fr>  skribis:
>
>> This is strange - as if the bash binary called /bin/sh. I actually do not
>> have this nix store path;
>
> I think he’s on i686, whereas you’re on x86_64, hence the different paths.
>

Yes.

Cyril.

[PATCH] Add vim.

[Cyril Roelandt]

* gnu/packages/vim.scm: New file.
* Makefile.am (MODULES): Add it.
---
This patch adds the vim text editor.

During compilation, I get this error message :

nix/store/4mg8b8vvmava68y64qmm70gqfnhhjzmx-bash-4.2/bin/sh: hostname: command not found

"make test" runs the test suite, but quickly fails :

/nix/store/4mg8b8vvmava68y64qmm70gqfnhhjzmx-bash-4.2/bin/bash: /bin/sh: No such file or directory
make[2]: *** [test1.out] Error 127
make[2]: Leaving directory `/tmp/nix-build-vim-7.3.drv-3/vim73/src/testdir'
make[1]: *** [test] Error 2
make[1]: Leaving directory `/tmp/nix-build-vim-7.3.drv-3/vim73/src'
make: *** [test] Error 2
phase `check' failed after 2 seconds
builder for `/nix/store/cjzd9ym2qn18s9v186p2ikqvm01xg4bq-vim-7.3.drv' failed with exit code 1
@ build-failed /nix/store/cjzd9ym2qn18s9v186p2ikqvm01xg4bq-vim-7.3.drv /nix/store/in8kp5gdnxkazmdzy2m3408xcmdgqxmw-vim-7.3 1 builder for `/nix/store/cjzd9ym2qn18s9v186p2ikqvm01xg4bq-vim-7.3.drv' failed with exit code 1
error: build failed: build of `/nix/store/cjzd9ym2qn18s9v186p2ikqvm01xg4bq-vim-7.3.drv' failed

Cyril.

 Makefile.am          |    1 +
 gnu/packages/vim.scm |   53 ++++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 54 insertions(+)
 create mode 100644 gnu/packages/vim.scm

diff --git a/Makefile.am b/Makefile.am
index fdf4987..fafcd8f 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -120,6 +120,7 @@ MODULES =					\
   gnu/packages/tcl.scm				\
   gnu/packages/texinfo.scm			\
   gnu/packages/time.scm				\
+  gnu/packages/vim.scm 				\
   gnu/packages/wget.scm				\
   gnu/packages/which.scm			\
   gnu/packages/xml.scm				\
diff --git a/gnu/packages/vim.scm b/gnu/packages/vim.scm
new file mode 100644
index 0000000..d2ae3cb
--- /dev/null
+++ b/gnu/packages/vim.scm
@@ -0,0 +1,53 @@
+;;; GNU Guix --- Functional package management for GNU
+;;; Copyright © 2013 Cyril Roelandt <tipecaml@gmail.com>
+;;;
+;;; This file is part of GNU Guix.
+;;;
+;;; GNU Guix is free software; you can redistribute it and/or modify it
+;;; under the terms of the GNU General Public License as published by
+;;; the Free Software Foundation; either version 3 of the License, or (at
+;;; your option) any later version.
+;;;
+;;; GNU Guix is distributed in the hope that it will be useful, but
+;;; WITHOUT ANY WARRANTY; without even the implied warranty of
+;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;;; GNU General Public License for more details.
+;;;
+;;; You should have received a copy of the GNU General Public License
+;;; along with GNU Guix.  If not, see <http://www.gnu.org/licenses/>.
+
+(define-module (gnu packages vim)
+  #:use-module ((guix licenses) #:renamer (symbol-prefix-proc 'license:))
+  #:use-module (guix packages)
+  #:use-module (guix download)
+  #:use-module (guix build-system gnu)
+  #:use-module (gnu packages)
+  #:use-module (gnu packages ncurses))
+
+(define-public vim
+  (package
+    (name "vim")
+    (version "7.3")
+    (source (origin
+             (method url-fetch)
+             (uri (string-append "ftp://ftp.vim.org/pub/vim/unix/vim-"
+                                 version ".tar.bz2"))
+             (sha256
+              (base32
+               "079201qk8g9yisrrb0dn52ch96z3lzw6z473dydw9fzi0xp5spaw"))))
+    (build-system gnu-build-system)
+    (arguments
+     `(#:test-target "test"))
+    (inputs `(("ncurses", ncurses)))
+    (home-page "http://www.vim.org/")
+    (synopsis "VIM 7.3, a text editor based on vi.")
+    (description
+     "Vim is a highly configurable text editor built to enable efficient text
+editing. It is an improved version of the vi editor distributed with most UNIX
+systems.
+
+Vim is often called a \"programmer's editor,\" and so useful for programming
+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)))
-- 
1.7.10.4

Re: [PATCH] Add vim.

[Andreas Enge]

[-- Attachment #1: Type: text/plain, Size: 1464 bytes --]

Am Sonntag, 20. Januar 2013 schrieb Cyril Roelandt:
> During compilation, I get this error message :
> nix/store/4mg8b8vvmava68y64qmm70gqfnhhjzmx-bash-4.2/bin/sh: hostname:
> command not found

I did not see this. However, the patch-shebangs phase complains about a 
missing interpreter "perl", so it might be good to add perl to the inputs. 
Then there are also "nawk" (this could probably be patched to "gawk") and 
"csh" (which we do not have yet).

> "make test" runs the test suite, but quickly fails :
> /nix/store/4mg8b8vvmava68y64qmm70gqfnhhjzmx-bash-4.2/bin/bash: /bin/sh:
> No such file or directory make[2]: *** [test1.out] Error 127

This is probably due to src/testdir/Makefile containing lines like this:
test1.out: test1.in
        -rm -f $*.failed tiny.vim small.vim mbyte.vim mzscheme.vim test.ok 
X* viminfo
        $(VALGRIND) $(VIMPROG) -u unix.vim -U NONE --noplugin -s dotest.in 
$*.in
        @/bin/sh -c "if diff test.out $*.ok; \

A probable solution would be to replace the /bin/sh by calls to the correct 
bash; something similar to the following lines from ghostscript.scm:

(#:phases
 (alist-replace
  'configure
  (lambda* (#:key #:allow-other-keys #:rest args)
   (let ((configure (assoc-ref %standard-phases 'configure)))
     (apply configure args)
     (substitute* "base/all-arch.mak"
       (("/bin/sh") (which "bash")))
     (substitute* "base/unixhead.mak"
       (("/bin/sh") (which "bash")))))
 %standard-phases)))

Andreas

[-- Attachment #2: Type: text/html, Size: 6671 bytes --]

[PATCH] gnu: Add vim.

[Cyril Roelandt]

* gnu/packages/vim.scm: New file.
* Makefile.am (MODULES): Add it.
---
"guix-build vim" seems to work now, even though I can't try to install it
(probably because I'm running out of inodes).

Andreas, could you please test this and push the patch if this works for you ?

Regards,
Cyril.

 Makefile.am          |    1 +
 gnu/packages/vim.scm |   73 ++++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 74 insertions(+)
 create mode 100644 gnu/packages/vim.scm

diff --git a/Makefile.am b/Makefile.am
index e44753d..50378e8 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -152,6 +152,7 @@ MODULES =					\
   gnu/packages/time.scm				\
   gnu/packages/tmux.scm 			\
   gnu/packages/tor.scm				\
+  gnu/packages/vim.scm 				\
   gnu/packages/wdiff.scm			\
   gnu/packages/wget.scm				\
   gnu/packages/which.scm			\
diff --git a/gnu/packages/vim.scm b/gnu/packages/vim.scm
new file mode 100644
index 0000000..bac6bf5
--- /dev/null
+++ b/gnu/packages/vim.scm
@@ -0,0 +1,73 @@
+;;; GNU Guix --- Functional package management for GNU
+;;; Copyright © 2013 Cyril Roelandt <tipecaml@gmail.com>
+;;;
+;;; This file is part of GNU Guix.
+;;;
+;;; GNU Guix is free software; you can redistribute it and/or modify it
+;;; under the terms of the GNU General Public License as published by
+;;; the Free Software Foundation; either version 3 of the License, or (at
+;;; your option) any later version.
+;;;
+;;; GNU Guix is distributed in the hope that it will be useful, but
+;;; WITHOUT ANY WARRANTY; without even the implied warranty of
+;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;;; GNU General Public License for more details.
+;;;
+;;; You should have received a copy of the GNU General Public License
+;;; along with GNU Guix.  If not, see <http://www.gnu.org/licenses/>.
+
+(define-module (gnu packages vim)
+  #:use-module ((guix licenses) #:renamer (symbol-prefix-proc 'license:))
+  #:use-module (guix packages)
+  #:use-module (guix download)
+  #:use-module (guix build-system gnu)
+  #:use-module (gnu packages)
+  #:use-module (gnu packages gawk)
+  #:use-module (gnu packages ncurses)
+  #:use-module (gnu packages perl)
+  #:use-module (gnu packages system) ; For GNU hostname
+  #:use-module (gnu packages tcsh))
+
+(define-public vim
+  (package
+    (name "vim")
+    (version "7.3")
+    (source (origin
+             (method url-fetch)
+             (uri (string-append "ftp://ftp.vim.org/pub/vim/unix/vim-"
+                                 version ".tar.bz2"))
+             (sha256
+              (base32
+               "079201qk8g9yisrrb0dn52ch96z3lzw6z473dydw9fzi0xp5spaw"))))
+    (build-system gnu-build-system)
+    (arguments
+     `(#:test-target "test"
+       #:phases
+        (alist-replace
+         'configure
+         (lambda* (#:key #:allow-other-keys #:rest args)
+          (let ((configure (assoc-ref %standard-phases 'configure)))
+           (apply configure args)
+           (substitute* "runtime/tools/mve.awk"
+             (("/usr/bin/nawk") (which "gawk")))
+           (substitute* "src/testdir/Makefile"
+             (("/bin/sh") (which "sh")))))
+          %standard-phases)))
+    (inputs
+     `(("gawk", gawk)
+       ("inetutils", inetutils)
+       ("ncurses", ncurses)
+       ("perl", perl)
+       ("tcsh" ,tcsh))) ; For runtime/tools/vim32
+    (home-page "http://www.vim.org/")
+    (synopsis "VIM 7.3, a text editor based on vi.")
+    (description
+     "Vim is a highly configurable text editor built to enable efficient text
+editing. It is an improved version of the vi editor distributed with most UNIX
+systems.
+
+Vim is often called a \"programmer's editor,\" and so useful for programming
+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)))
-- 
1.7.10.4

Re: [PATCH] gnu: Add vim.

[Andreas Enge]

[-- Attachment #1: Type: text/plain, Size: 453 bytes --]

Am Mittwoch, 13. Februar 2013 schrieb Cyril Roelandt:
> "guix-build vim" seems to work now, even though I can't try to install
> it (probably because I'm running out of inodes).
> 
> Andreas, could you please test this and push the patch if this works for
> you ?

The check phase fails, but it passes after disabling parallel tests. (I 
think there is a problem with swapping swap files.) So I pushed after 
making this modification.

Thanks!

Andreas

[-- Attachment #2: Type: text/html, Size: 2694 bytes --]

Re: [PATCH] gnu: Add vim.

[Andreas Enge]

[-- Attachment #1: Type: text/plain, Size: 123 bytes --]

Hm, accented characters are not displayed correctly. Does one need to add 
an additional input for utf8 encoding?

Andreas

[-- Attachment #2: Type: text/html, Size: 1043 bytes --]

Re: [PATCH] gnu: Add vim.

[Ludovic Courtès]

Andreas Enge <andreas@enge.fr> skribis:

> Hm, accented characters are not displayed correctly. Does one need to add 
> an additional input for utf8 encoding?

Our libc doesn’t install locale data, which causes this sort of
problems.  We’ll need to fix that in core-updates.

Ludo’.

Re: [PATCH] gnu: Add vim.

[Ludovic Courtès]

ludo@gnu.org (Ludovic Courtès) skribis:

> Andreas Enge <andreas@enge.fr> skribis:
>
>> Hm, accented characters are not displayed correctly. Does one need to add 
>> an additional input for utf8 encoding?
>
> Our libc doesn’t install locale data, which causes this sort of
> problems.  We’ll need to fix that in core-updates.

Done as of 7f614e49e877cbf3e909ed74b3e6822dc39eabe5.

Ludo’.