[PATCH 6/6] gnu: Add emacs-slime.

[PATCH 6/6] gnu: Add emacs-slime.

[Federico Beffa]

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



[-- Attachment #2: 0006-gnu-Add-emacs-slime.patch --]
[-- Type: text/x-diff, Size: 3525 bytes --]

From 14703a61bb5f95134b86ceaab0144ffcb23d1a3b Mon Sep 17 00:00:00 2001
From: Federico Beffa <beffa@fbengineering.ch>
Date: Wed, 30 Dec 2015 00:47:29 +0100
Subject: [PATCH 6/6] gnu: Add emacs-slime.

* gnu/packages/emacs.scm (emacs-slime): New variable.
---
 gnu/packages/emacs.scm | 61 ++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 61 insertions(+)

diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm
index cc6fd85..e12accb 100644
--- a/gnu/packages/emacs.scm
+++ b/gnu/packages/emacs.scm
@@ -39,6 +39,7 @@
   #:use-module (gnu packages gnome)
   #:use-module (gnu packages ncurses)
   #:use-module (gnu packages texinfo)
+  #:use-module (gnu packages texlive)
   #:use-module (gnu packages tls)
   #:use-module (gnu packages pkg-config)
   #:use-module (gnu packages xorg)
@@ -1286,3 +1287,63 @@ identifiers in the MIT-Scheme documentation.")
      "This package provides functions for inserting the definition of natural
 constants and units into an Emacs buffer.")
     (license license:gpl2+)))
+
+(define-public emacs-slime
+  (package
+    (name "emacs-slime")
+    (version "2.15")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (string-append
+             "https://github.com/slime/slime/archive/v"
+             version ".tar.gz"))
+       (sha256
+        (base32
+         "0l2z6l2xm78mhh0nczkrmzh2ddb1n911ij9xb6q40zwvx4f8blds"))))
+    (build-system emacs-build-system)
+    (inputs
+     `(("texlive" ,texlive)
+       ("texinfo" ,texinfo)))
+    (arguments
+     `(#:phases
+       (modify-phases %standard-phases
+         (add-before 'install 'configure
+           (lambda* _
+             (substitute* "slime.el"
+               (("inferior-lisp-program \"lisp\"")
+                "inferior-lisp-program \"sbcl\""))
+             #t))
+         (add-before 'install 'install-doc
+           (lambda* (#:key outputs #:allow-other-keys)
+             (let* ((out (assoc-ref outputs "out"))
+                    (info-dir (string-append out "/share/info"))
+                    (doc-dir (string-append out "/share/doc/"
+                                            ,name "-" ,version))
+                    (doc-files '("doc/slime.pdf" "doc/slime-refcard.pdf"
+                                 "README.md" "NEWS" "PROBLEMS"
+                                 "CONTRIBUTING.md")))
+               (with-directory-excursion "doc"
+                 (substitute* "Makefile"
+                   (("infodir=/usr/local/info")
+                    (string-append "infodir=" info-dir)))
+                 (system* "make" "all")
+                 (install-file "slime.info" info-dir)
+                 (copy-recursively "html" (string-append doc-dir "/html")))
+               (for-each (lambda (f)
+                           (install-file f doc-dir)
+                           (delete-file f))
+                         doc-files)
+               (delete-file-recursively "doc")
+               #t))))))
+    (home-page "https://github.com/slime/slime")
+    (synopsis
+     "Superior Lisp Interaction Mode for Emacs")
+    (description
+     "SLIME extends Emacs with support for interactive programming in
+Common Lisp. The features are centered around slime-mode, an Emacs
+minor-mode that complements the standard lisp-mode. While lisp-mode
+supports editing Lisp source files, slime-mode adds support for
+interacting with a running Common Lisp process for compilation,
+debugging, documentation lookup, and so on.")
+    (license license:gpl2+)))
-- 
2.6.3

Re: [PATCH 6/6] gnu: Add emacs-slime.

[Ben Woodcroft]

Hi Federico,

I'm just idly clicking though emails and I note that the description 
doesn't contain 2 spaces after the full stops - so not a proper review.

Do you know though, is there any way to get emacs to insert the extra 
space in description strings and comments automatically (without it 
messing things up of course). Perhaps we should modify the importers to 
insert this automatically in the description field.

Thanks,
ben

Re: [PATCH 6/6] gnu: Add emacs-slime.

[Federico Beffa]

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

On Thu, Dec 31, 2015 at 1:55 AM, Ben Woodcroft <b.woodcroft@uq.edu.au> wrote:
> Hi Federico,
>
> I'm just idly clicking though emails and I note that the description doesn't
> contain 2 spaces after the full stops - so not a proper review.

I forgot to run 'lint' in this one. I corrected this and added a
'file-name' field to the origin.

>
> Do you know though, is there any way to get emacs to insert the extra space
> in description strings and comments automatically (without it messing things
> up of course). Perhaps we should modify the importers to insert this
> automatically in the description field.

I do not know.

Thanks,
Fede

[-- Attachment #2: 0006-gnu-Add-emacs-slime.patch --]
[-- Type: text/x-diff, Size: 3590 bytes --]

From e3dd3f2235b9aed36d213f68ea767225ec8ebd61 Mon Sep 17 00:00:00 2001
From: Federico Beffa <beffa@fbengineering.ch>
Date: Wed, 30 Dec 2015 00:47:29 +0100
Subject: [PATCH 6/6] gnu: Add emacs-slime.

* gnu/packages/emacs.scm (emacs-slime): New variable.
---
 gnu/packages/emacs.scm | 62 ++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 62 insertions(+)

diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm
index ac43c6f..9ac3a33 100644
--- a/gnu/packages/emacs.scm
+++ b/gnu/packages/emacs.scm
@@ -39,6 +39,7 @@
   #:use-module (gnu packages gnome)
   #:use-module (gnu packages ncurses)
   #:use-module (gnu packages texinfo)
+  #:use-module (gnu packages texlive)
   #:use-module (gnu packages tls)
   #:use-module (gnu packages pkg-config)
   #:use-module (gnu packages xorg)
@@ -1287,3 +1288,64 @@ identifiers in the MIT-Scheme documentation.")
      "This package provides functions for inserting the definition of natural
 constants and units into an Emacs buffer.")
     (license license:gpl2+)))
+
+(define-public emacs-slime
+  (package
+    (name "emacs-slime")
+    (version "2.15")
+    (source
+     (origin
+       (file-name (string-append name "-" version ".tar.gz"))
+       (method url-fetch)
+       (uri (string-append
+             "https://github.com/slime/slime/archive/v"
+             version ".tar.gz"))
+       (sha256
+        (base32
+         "0l2z6l2xm78mhh0nczkrmzh2ddb1n911ij9xb6q40zwvx4f8blds"))))
+    (build-system emacs-build-system)
+    (inputs
+     `(("texlive" ,texlive)
+       ("texinfo" ,texinfo)))
+    (arguments
+     `(#:phases
+       (modify-phases %standard-phases
+         (add-before 'install 'configure
+           (lambda* _
+             (substitute* "slime.el"
+               (("inferior-lisp-program \"lisp\"")
+                "inferior-lisp-program \"sbcl\""))
+             #t))
+         (add-before 'install 'install-doc
+           (lambda* (#:key outputs #:allow-other-keys)
+             (let* ((out (assoc-ref outputs "out"))
+                    (info-dir (string-append out "/share/info"))
+                    (doc-dir (string-append out "/share/doc/"
+                                            ,name "-" ,version))
+                    (doc-files '("doc/slime.pdf" "doc/slime-refcard.pdf"
+                                 "README.md" "NEWS" "PROBLEMS"
+                                 "CONTRIBUTING.md")))
+               (with-directory-excursion "doc"
+                 (substitute* "Makefile"
+                   (("infodir=/usr/local/info")
+                    (string-append "infodir=" info-dir)))
+                 (system* "make" "all")
+                 (install-file "slime.info" info-dir)
+                 (copy-recursively "html" (string-append doc-dir "/html")))
+               (for-each (lambda (f)
+                           (install-file f doc-dir)
+                           (delete-file f))
+                         doc-files)
+               (delete-file-recursively "doc")
+               #t))))))
+    (home-page "https://github.com/slime/slime")
+    (synopsis
+     "Superior Lisp Interaction Mode for Emacs")
+    (description
+     "SLIME extends Emacs with support for interactive programming in
+Common Lisp.  The features are centered around slime-mode, an Emacs
+minor-mode that complements the standard lisp-mode.  While lisp-mode
+supports editing Lisp source files, slime-mode adds support for
+interacting with a running Common Lisp process for compilation,
+debugging, documentation lookup, and so on.")
+    (license license:gpl2+)))
-- 
2.6.3

Re: [PATCH 6/6] gnu: Add emacs-slime.

[Ricardo Wurmus]

Ben Woodcroft <b.woodcroft@uq.edu.au> writes:

> Do you know though, is there any way to get emacs to insert the extra 
> space in description strings and comments automatically (without it 
> messing things up of course). Perhaps we should modify the importers to 
> insert this automatically in the description field.

The CRAN and Bioconductor importers already do this.  See
“beautify-description” in “guix/import/cran.scm”.

Re: [PATCH 6/6] gnu: Add emacs-slime.

[Alex Kost]

Federico Beffa (2015-12-30 20:33 +0300) wrote:

[...]
> +(define-public emacs-slime
> +  (package
> +    (name "emacs-slime")
> +    (version "2.15")
> +    (source
> +     (origin
> +       (method url-fetch)
> +       (uri (string-append
> +             "https://github.com/slime/slime/archive/v"
> +             version ".tar.gz"))
> +       (sha256
> +        (base32
> +         "0l2z6l2xm78mhh0nczkrmzh2ddb1n911ij9xb6q40zwvx4f8blds"))))
> +    (build-system emacs-build-system)
> +    (inputs
> +     `(("texlive" ,texlive)
> +       ("texinfo" ,texinfo)))

As these inputs are used just for generating documentation, I think they
should be in 'native-inputs'.

> +    (arguments
> +     `(#:phases
> +       (modify-phases %standard-phases
> +         (add-before 'install 'configure
> +           (lambda* _
> +             (substitute* "slime.el"
> +               (("inferior-lisp-program \"lisp\"")
> +                "inferior-lisp-program \"sbcl\""))
> +             #t))

Why do you name this phase 'configure'?  Actually I think this phase is
not needed, because 'inferior-lisp-program' should be set by a user to
whatever implementation (s)he prefers.

Thanks for packaging slime!

-- 
Alex

Re: [PATCH 6/6] gnu: Add emacs-slime.

[Federico Beffa]

On Thu, Dec 31, 2015 at 11:17 AM, Alex Kost <alezost@gmail.com> wrote:
> Federico Beffa (2015-12-30 20:33 +0300) wrote:
>
> [...]
>> +(define-public emacs-slime
>> +  (package
>> +    (name "emacs-slime")
>> +    (version "2.15")
>> +    (source
>> +     (origin
>> +       (method url-fetch)
>> +       (uri (string-append
>> +             "https://github.com/slime/slime/archive/v"
>> +             version ".tar.gz"))
>> +       (sha256
>> +        (base32
>> +         "0l2z6l2xm78mhh0nczkrmzh2ddb1n911ij9xb6q40zwvx4f8blds"))))
>> +    (build-system emacs-build-system)
>> +    (inputs
>> +     `(("texlive" ,texlive)
>> +       ("texinfo" ,texinfo)))
>
> As these inputs are used just for generating documentation, I think they
> should be in 'native-inputs'.

yes. will change that.

>
>> +    (arguments
>> +     `(#:phases
>> +       (modify-phases %standard-phases
>> +         (add-before 'install 'configure
>> +           (lambda* _
>> +             (substitute* "slime.el"
>> +               (("inferior-lisp-program \"lisp\"")
>> +                "inferior-lisp-program \"sbcl\""))
>> +             #t))
>
> Why do you name this phase 'configure'?  Actually I think this phase is
> not needed, because 'inferior-lisp-program' should be set by a user to
> whatever implementation (s)he prefers.

It's called configure because I'm configuring a default CL implementation.

The default value in slime is 'lisp'. I only used CLISP and SBCL and
none of them provides a binary called 'lisp'. For this reason I tough
it to be a good idea to provide a default name corresponding to an
existing binary.

Of course the user has to adapt to its own needs.

Thanks.
Fede

Re: [PATCH 6/6] gnu: Add emacs-slime.

[Alex Kost]

Also don't forget about "guix lint emacs-slime" ;-)

> +(define-public emacs-slime
> +  (package
> +    (name "emacs-slime")
> +    (version "2.15")
> +    (source
> +     (origin
> +       (method url-fetch)
> +       (uri (string-append
> +             "https://github.com/slime/slime/archive/v"
> +             version ".tar.gz"))
> +       (sha256
> +        (base32
> +         "0l2z6l2xm78mhh0nczkrmzh2ddb1n911ij9xb6q40zwvx4f8blds"))))

          (file-name (string-append name "-" version ".tar.gz"))

> +    (description
> +     "SLIME extends Emacs with support for interactive programming in
> +Common Lisp. The features are centered around slime-mode, an Emacs
> +minor-mode that complements the standard lisp-mode. While lisp-mode
> +supports editing Lisp source files, slime-mode adds support for
> +interacting with a running Common Lisp process for compilation,
> +debugging, documentation lookup, and so on.")

Double spaces ^^^

-- 
Alex

Re: [PATCH 6/6] gnu: Add emacs-slime.

[Alex Kost]

Federico Beffa (2015-12-31 13:32 +0300) wrote:

> On Thu, Dec 31, 2015 at 11:17 AM, Alex Kost <alezost@gmail.com> wrote:
>> Federico Beffa (2015-12-30 20:33 +0300) wrote:
>>
>> [...]
>>> +    (arguments
>>> +     `(#:phases
>>> +       (modify-phases %standard-phases
>>> +         (add-before 'install 'configure
>>> +           (lambda* _
>>> +             (substitute* "slime.el"
>>> +               (("inferior-lisp-program \"lisp\"")
>>> +                "inferior-lisp-program \"sbcl\""))
>>> +             #t))
>>
>> Why do you name this phase 'configure'?  Actually I think this phase is
>> not needed, because 'inferior-lisp-program' should be set by a user to
>> whatever implementation (s)he prefers.
>
> It's called configure because I'm configuring a default CL implementation.
>
> The default value in slime is 'lisp'. I only used CLISP and SBCL and
> none of them provides a binary called 'lisp'. For this reason I tough
> it to be a good idea to provide a default name corresponding to an
> existing binary.

I don't agree, I think we shouldn't modify the upstream code just
because we think that some implementation is more likely to be used.

> Of course the user has to adapt to its own needs.

Yes, that's why an abstract "lisp" looks like a good default for me.

BTW instead of 'substitute*' it's better to use
'emacs-substitute-variables' for replacing variable values.

-- 
Alex

Re: [PATCH 6/6] gnu: Add emacs-slime.

[Alex Kost]

Ricardo Wurmus (2015-12-31 12:52 +0300) wrote:

> Ben Woodcroft <b.woodcroft@uq.edu.au> writes:
>
>> Do you know though, is there any way to get emacs to insert the extra
>> space in description strings and comments automatically (without it
>> messing things up of course). Perhaps we should modify the importers to
>> insert this automatically in the description field.
>
> The CRAN and Bioconductor importers already do this.  See
> “beautify-description” in “guix/import/cran.scm”.

Hm, is it reliable?  Not all dots specify an end of a sentence: there
are things like "e.g.", "i.e.", "etc.".  Also there may be abbreviations
like "ATA S.M.A.R.T. reading and parsing library" (synopsis of
'libatasmart' package).  Or even things like “<form> ... </form>”
(description of 'perl-html-form') — it should probably be wrapped in
@code{} by the way.

-- 
Alex

Re: [PATCH 6/6] gnu: Add emacs-slime.

[Ricardo Wurmus]

Alex Kost <alezost@gmail.com> writes:

> Ricardo Wurmus (2015-12-31 12:52 +0300) wrote:
>
>> Ben Woodcroft <b.woodcroft@uq.edu.au> writes:
>>
>>> Do you know though, is there any way to get emacs to insert the extra
>>> space in description strings and comments automatically (without it
>>> messing things up of course). Perhaps we should modify the importers to
>>> insert this automatically in the description field.
>>
>> The CRAN and Bioconductor importers already do this.  See
>> “beautify-description” in “guix/import/cran.scm”.
>
> Hm, is it reliable?  Not all dots specify an end of a sentence: there
> are things like "e.g.", "i.e.", "etc.".  Also there may be abbreviations
> like "ATA S.M.A.R.T. reading and parsing library" (synopsis of
> 'libatasmart' package).  Or even things like “<form> ... </form>”
> (description of 'perl-html-form') — it should probably be wrapped in
> @code{} by the way.

It’s not supposed to be maintenance-free.  Descriptions often start with
sentence fragments, which cannot be detected easily.  I found that
“beautify-description” works well enough to make packaging R stuff much
simpler for me.

~~ Ricardo

Re: [PATCH 6/6] gnu: Add emacs-slime.

[Ben Woodcroft]

On 01/01/16 18:25, Ricardo Wurmus wrote:
> Alex Kost <alezost@gmail.com> writes:
>
>> Ricardo Wurmus (2015-12-31 12:52 +0300) wrote:
>>
>>> Ben Woodcroft <b.woodcroft@uq.edu.au> writes:
>>>
>>>> Do you know though, is there any way to get emacs to insert the extra
>>>> space in description strings and comments automatically (without it
>>>> messing things up of course). Perhaps we should modify the importers to
>>>> insert this automatically in the description field.
>>> The CRAN and Bioconductor importers already do this.  See
>>> “beautify-description” in “guix/import/cran.scm”.
>> Hm, is it reliable?  Not all dots specify an end of a sentence: there
>> are things like "e.g.", "i.e.", "etc.".  Also there may be abbreviations
>> like "ATA S.M.A.R.T. reading and parsing library" (synopsis of
>> 'libatasmart' package).  Or even things like “<form> ... </form>”
>> (description of 'perl-html-form') — it should probably be wrapped in
>> @code{} by the way.
> It’s not supposed to be maintenance-free.  Descriptions often start with
> sentence fragments, which cannot be detected easily.  I found that
> “beautify-description” works well enough to make packaging R stuff much
> simpler for me.
I'd like to add this to the Ruby importer. Do you think it is a good 
idea to make your beautify-description available in import/utils ?

Thanks.
ben

Re: [PATCH 6/6] gnu: Add emacs-slime.

[Ricardo Wurmus]

Ben Woodcroft <b.woodcroft@uq.edu.au> writes:

> On 01/01/16 18:25, Ricardo Wurmus wrote:
>> Alex Kost <alezost@gmail.com> writes:
>>
>>> Ricardo Wurmus (2015-12-31 12:52 +0300) wrote:
>>>
>>>> Ben Woodcroft <b.woodcroft@uq.edu.au> writes:
>>>>
>>>>> Do you know though, is there any way to get emacs to insert the extra
>>>>> space in description strings and comments automatically (without it
>>>>> messing things up of course). Perhaps we should modify the importers to
>>>>> insert this automatically in the description field.
>>>> The CRAN and Bioconductor importers already do this.  See
>>>> “beautify-description” in “guix/import/cran.scm”.
>>> Hm, is it reliable?  Not all dots specify an end of a sentence: there
>>> are things like "e.g.", "i.e.", "etc.".  Also there may be abbreviations
>>> like "ATA S.M.A.R.T. reading and parsing library" (synopsis of
>>> 'libatasmart' package).  Or even things like “<form> ... </form>”
>>> (description of 'perl-html-form') — it should probably be wrapped in
>>> @code{} by the way.
>> It’s not supposed to be maintenance-free.  Descriptions often start with
>> sentence fragments, which cannot be detected easily.  I found that
>> “beautify-description” works well enough to make packaging R stuff much
>> simpler for me.
>
> I'd like to add this to the Ruby importer. Do you think it is a good 
> idea to make your beautify-description available in import/utils ?

I think it could be generally useful to have something like that for all
importers.  Do you want to prepare a patch?

~~ Ricardo

[PATCH] import: Move beautify description from cran to utils. (was Re: [PATCH 6/6] gnu: Add emacs-slime.)

[Ben Woodcroft]

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



On 02/01/16 01:04, Ricardo Wurmus wrote:
> Ben Woodcroft <b.woodcroft@uq.edu.au> writes:
>
>> On 01/01/16 18:25, Ricardo Wurmus wrote:
>>> Alex Kost <alezost@gmail.com> writes:
>>>
>>>> Ricardo Wurmus (2015-12-31 12:52 +0300) wrote:
>>>>
>>>>> Ben Woodcroft <b.woodcroft@uq.edu.au> writes:
>>>>>
>>>>>> Do you know though, is there any way to get emacs to insert the extra
>>>>>> space in description strings and comments automatically (without it
>>>>>> messing things up of course). Perhaps we should modify the importers to
>>>>>> insert this automatically in the description field.
>>>>> The CRAN and Bioconductor importers already do this.  See
>>>>> “beautify-description” in “guix/import/cran.scm”.
>>>> Hm, is it reliable?  Not all dots specify an end of a sentence: there
>>>> are things like "e.g.", "i.e.", "etc.".  Also there may be abbreviations
>>>> like "ATA S.M.A.R.T. reading and parsing library" (synopsis of
>>>> 'libatasmart' package).  Or even things like “<form> ... </form>”
>>>> (description of 'perl-html-form') — it should probably be wrapped in
>>>> @code{} by the way.
>>> It’s not supposed to be maintenance-free.  Descriptions often start with
>>> sentence fragments, which cannot be detected easily.  I found that
>>> “beautify-description” works well enough to make packaging R stuff much
>>> simpler for me.
>> I'd like to add this to the Ruby importer. Do you think it is a good
>> idea to make your beautify-description available in import/utils ?
> I think it could be generally useful to have something like that for all
> importers.  Do you want to prepare a patch?

Pretty straightforward stuff. The first patch moves beautify-description 
to import/utils and the second uses it in the rubygem importer. Any good?

ta,
ben

[-- Attachment #2: 0001-import-cran-Move-beautify-description-to-utils-modul.patch --]
[-- Type: text/x-patch, Size: 2787 bytes --]

From e3bad19a07d6a9fdf3045619232a24b77a1a5d12 Mon Sep 17 00:00:00 2001
From: Ben Woodcroft <donttrustben@gmail.com>
Date: Wed, 6 Jan 2016 00:09:19 +1000
Subject: [PATCH 1/2] import: cran: Move beautify-description to utils module.

* guix/import/cran.scm (beautify-description): Move from here...
* guix/import/utils.scm: ... to here.
---
 guix/import/cran.scm  | 11 -----------
 guix/import/utils.scm | 14 +++++++++++++-
 2 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/guix/import/cran.scm b/guix/import/cran.scm
index 45c679c..c66818c 100644
--- a/guix/import/cran.scm
+++ b/guix/import/cran.scm
@@ -136,17 +136,6 @@ empty list when the FIELD cannot be found."
                         (string-any char-set:whitespace item)))
                   (map string-trim-both items))))))
 
-(define (beautify-description description)
-  "Improve the package DESCRIPTION by turning a beginning sentence fragment
-into a proper sentence and by using two spaces between sentences."
-  (let ((cleaned (if (string-prefix? "A " description)
-                     (string-append "This package provides a"
-                                    (substring description 1))
-                     description)))
-    ;; Use double spacing between sentences
-    (regexp-substitute/global #f "\\. \\b"
-                              cleaned 'pre ".  " 'post)))
-
 (define (description->package meta)
   "Return the `package' s-expression for a CRAN package from the alist META,
 which was derived from the R package's DESCRIPTION file."
diff --git a/guix/import/utils.scm b/guix/import/utils.scm
index 0734fa1..44e004b 100644
--- a/guix/import/utils.scm
+++ b/guix/import/utils.scm
@@ -37,7 +37,8 @@
             string->license
             license->symbol
 
-            snake-case))
+            snake-case
+            beautify-description))
 
 (define (factorize-uri uri version)
   "Factorize URI, a package tarball URI as a string, such that any occurrences
@@ -136,3 +137,14 @@ to in the (guix licenses) module, or #f if there is no such known license."
   "Return a downcased version of the string STR where underscores are replaced
 with dashes."
   (string-join (string-split (string-downcase str) #\_) "-"))
+
+(define (beautify-description description)
+  "Improve the package DESCRIPTION by turning a beginning sentence fragment
+into a proper sentence and by using two spaces between sentences."
+  (let ((cleaned (if (string-prefix? "A " description)
+                     (string-append "This package provides a"
+                                    (substring description 1))
+                     description)))
+    ;; Use double spacing between sentences
+    (regexp-substitute/global #f "\\. \\b"
+                              cleaned 'pre ".  " 'post)))
-- 
2.6.3


[-- Attachment #3: 0002-import-gem-Beautify-description-field.patch --]
[-- Type: text/x-patch, Size: 1140 bytes --]

From eb65d0ef0140ac2828b608c31ae19893861fea3a Mon Sep 17 00:00:00 2001
From: Ben Woodcroft <donttrustben@gmail.com>
Date: Wed, 6 Jan 2016 00:17:36 +1000
Subject: [PATCH 2/2] import: gem: Beautify description field.

* guix/import/gem.scm (gem->guix-package): Use 'beautify-description'.
---
 guix/import/gem.scm | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/guix/import/gem.scm b/guix/import/gem.scm
index c64c4e9..3c42052 100644
--- a/guix/import/gem.scm
+++ b/guix/import/gem.scm
@@ -117,7 +117,8 @@ VERSION, HASH, HOME-PAGE, DESCRIPTION, DEPENDENCIES, and LICENSES."
          (let ((name         (assoc-ref package "name"))
                (version      (assoc-ref package "version"))
                (hash         (assoc-ref package "sha"))
-               (description  (assoc-ref package "info"))
+               (description  (beautify-description
+                              (assoc-ref package "info")))
                (home-page    (assoc-ref package "homepage_uri"))
                (dependencies (map (lambda (dep)
                                     (let ((name (assoc-ref dep "name")))
-- 
2.6.3

Re: [PATCH 6/6] gnu: Add emacs-slime.

[Ludovic Courtès]

Federico Beffa <beffa@ieee.org> skribis:

> From e3dd3f2235b9aed36d213f68ea767225ec8ebd61 Mon Sep 17 00:00:00 2001
> From: Federico Beffa <beffa@fbengineering.ch>
> Date: Wed, 30 Dec 2015 00:47:29 +0100
> Subject: [PATCH 6/6] gnu: Add emacs-slime.
>
> * gnu/packages/emacs.scm (emacs-slime): New variable.

[...]

> +    (inputs
> +     `(("texlive" ,texlive)
> +       ("texinfo" ,texinfo)))

Should be ‘native-inputs’.

> +         (add-before 'install 'install-doc
> +           (lambda* (#:key outputs #:allow-other-keys)
> +             (let* ((out (assoc-ref outputs "out"))
> +                    (info-dir (string-append out "/share/info"))
> +                    (doc-dir (string-append out "/share/doc/"
> +                                            ,name "-" ,version))
> +                    (doc-files '("doc/slime.pdf" "doc/slime-refcard.pdf"
> +                                 "README.md" "NEWS" "PROBLEMS"
> +                                 "CONTRIBUTING.md")))
> +               (with-directory-excursion "doc"
> +                 (substitute* "Makefile"
> +                   (("infodir=/usr/local/info")
> +                    (string-append "infodir=" info-dir)))
> +                 (system* "make" "all")
> +                 (install-file "slime.info" info-dir)
> +                 (copy-recursively "html" (string-append doc-dir "/html")))
> +               (for-each (lambda (f)
> +                           (install-file f doc-dir)
> +                           (delete-file f))
> +                         doc-files)
> +               (delete-file-recursively "doc")

Can we build and install only Info files?  This is what we usually do
for packages that have Texinfo manuals.  Incidentally, it allows us to
get rid of the TeX Live dependency.

> +    (synopsis
> +     "Superior Lisp Interaction Mode for Emacs")

Move to previous line.

> +    (description
> +     "SLIME extends Emacs with support for interactive programming in
> +Common Lisp.  The features are centered around slime-mode, an Emacs

@code{slime-mode}

> +minor-mode that complements the standard lisp-mode.  While lisp-mode

s/minor-mode/minor mode/
@code{lisp-mode}

> +supports editing Lisp source files, slime-mode adds support for

@code{slime-mode}

> +interacting with a running Common Lisp process for compilation,
> +debugging, documentation lookup, and so on.")

Could you send an updated patch?

Thanks,
Ludo’.

Re: [PATCH 6/6] gnu: Add emacs-slime.

[Federico Beffa]

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

On Tue, Jan 5, 2016 at 11:17 PM, Ludovic Courtès <ludo@gnu.org> wrote:
> Federico Beffa <beffa@ieee.org> skribis:
>> +         (add-before 'install 'install-doc
>> +           (lambda* (#:key outputs #:allow-other-keys)
>> +             (let* ((out (assoc-ref outputs "out"))
>> +                    (info-dir (string-append out "/share/info"))
>> +                    (doc-dir (string-append out "/share/doc/"
>> +                                            ,name "-" ,version))
>> +                    (doc-files '("doc/slime.pdf" "doc/slime-refcard.pdf"
>> +                                 "README.md" "NEWS" "PROBLEMS"
>> +                                 "CONTRIBUTING.md")))
>> +               (with-directory-excursion "doc"
>> +                 (substitute* "Makefile"
>> +                   (("infodir=/usr/local/info")
>> +                    (string-append "infodir=" info-dir)))
>> +                 (system* "make" "all")
>> +                 (install-file "slime.info" info-dir)
>> +                 (copy-recursively "html" (string-append doc-dir "/html")))
>> +               (for-each (lambda (f)
>> +                           (install-file f doc-dir)
>> +                           (delete-file f))
>> +                         doc-files)
>> +               (delete-file-recursively "doc")
>
> Can we build and install only Info files?  This is what we usually do
> for packages that have Texinfo manuals.  Incidentally, it allows us to
> get rid of the TeX Live dependency.

I'm OK to remove slime.pdf, but the slime-refcard.pdf is quite useful.
(See mit-scheme thread for my opinion on TeXLive.)

>
>> +    (synopsis
>> +     "Superior Lisp Interaction Mode for Emacs")
>
> Move to previous line.

OK. Note that this is coming straight out of Guile's 'pretty-print'...
that's Guile's developers style, not mine :-)

> Could you send an updated patch?

Attached.

Thanks for the review,
Fede

[-- Attachment #2: 0006-gnu-Add-emacs-slime.patch --]
[-- Type: text/x-patch, Size: 3545 bytes --]

From a91182ee7d09c66a3f7b8f85b2ead4e282243d1a Mon Sep 17 00:00:00 2001
From: Federico Beffa <beffa@fbengineering.ch>
Date: Wed, 30 Dec 2015 00:47:29 +0100
Subject: [PATCH 6/8] gnu: Add emacs-slime.

* gnu/packages/emacs.scm (emacs-slime): New variable.
---
 gnu/packages/emacs.scm | 60 ++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 60 insertions(+)

diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm
index d5f4a2b..913e973 100644
--- a/gnu/packages/emacs.scm
+++ b/gnu/packages/emacs.scm
@@ -39,6 +39,7 @@
   #:use-module (gnu packages gnome)
   #:use-module (gnu packages ncurses)
   #:use-module (gnu packages texinfo)
+  #:use-module (gnu packages texlive)
   #:use-module (gnu packages tls)
   #:use-module (gnu packages pkg-config)
   #:use-module (gnu packages xorg)
@@ -1287,3 +1288,62 @@ identifiers in the MIT-Scheme documentation.")
      "This package provides functions for inserting the definition of natural
 constants and units into an Emacs buffer.")
     (license license:gpl2+)))
+
+(define-public emacs-slime
+  (package
+    (name "emacs-slime")
+    (version "2.15")
+    (source
+     (origin
+       (file-name (string-append name "-" version ".tar.gz"))
+       (method url-fetch)
+       (uri (string-append
+             "https://github.com/slime/slime/archive/v"
+             version ".tar.gz"))
+       (sha256
+        (base32
+         "0l2z6l2xm78mhh0nczkrmzh2ddb1n911ij9xb6q40zwvx4f8blds"))))
+    (build-system emacs-build-system)
+    (native-inputs
+     `(("texlive" ,texlive)
+       ("texinfo" ,texinfo)))
+    (arguments
+     `(#:phases
+       (modify-phases %standard-phases
+         (add-before 'install 'configure
+           (lambda* _
+             (emacs-substitute-variables "slime.el"
+               ("inferior-lisp-program" "sbcl"))
+             #t))
+         (add-before 'install 'install-doc
+           (lambda* (#:key outputs #:allow-other-keys)
+             (let* ((out (assoc-ref outputs "out"))
+                    (info-dir (string-append out "/share/info"))
+                    (doc-dir (string-append out "/share/doc/"
+                                            ,name "-" ,version))
+                    (doc-files '("doc/slime-refcard.pdf"
+                                 "README.md" "NEWS" "PROBLEMS"
+                                 "CONTRIBUTING.md")))
+               (with-directory-excursion "doc"
+                 (substitute* "Makefile"
+                   (("infodir=/usr/local/info")
+                    (string-append "infodir=" info-dir)))
+                 (system* "make" "all")
+                 (install-file "slime.info" info-dir)
+                 (copy-recursively "html" (string-append doc-dir "/html")))
+               (for-each (lambda (f)
+                           (install-file f doc-dir)
+                           (delete-file f))
+                         doc-files)
+               (delete-file-recursively "doc")
+               #t))))))
+    (home-page "https://github.com/slime/slime")
+    (synopsis "Superior Lisp Interaction Mode for Emacs")
+    (description
+     "SLIME extends Emacs with support for interactive programming in
+Common Lisp.  The features are centered around @{slime-mode}, an Emacs
+minor mode that complements the standard @{lisp-mode}.  While lisp-mode
+supports editing Lisp source files, @{slime-mode} adds support for
+interacting with a running Common Lisp process for compilation,
+debugging, documentation lookup, and so on.")
+    (license license:gpl2+)))
-- 
2.6.3

Re: [PATCH 6/6] gnu: Add emacs-slime.

[Alex Kost]

Federico Beffa (2016-01-09 13:30 +0300) wrote:

> On Tue, Jan 5, 2016 at 11:17 PM, Ludovic Courtès <ludo@gnu.org> wrote:
>> Federico Beffa <beffa@ieee.org> skribis:
>>> +         (add-before 'install 'install-doc
>>> +           (lambda* (#:key outputs #:allow-other-keys)
>>> +             (let* ((out (assoc-ref outputs "out"))
>>> +                    (info-dir (string-append out "/share/info"))
>>> +                    (doc-dir (string-append out "/share/doc/"
>>> +                                            ,name "-" ,version))
>>> +                    (doc-files '("doc/slime.pdf" "doc/slime-refcard.pdf"
>>> +                                 "README.md" "NEWS" "PROBLEMS"
>>> +                                 "CONTRIBUTING.md")))
>>> +               (with-directory-excursion "doc"
>>> +                 (substitute* "Makefile"
>>> +                   (("infodir=/usr/local/info")
>>> +                    (string-append "infodir=" info-dir)))
>>> +                 (system* "make" "all")
>>> +                 (install-file "slime.info" info-dir)
>>> +                 (copy-recursively "html" (string-append doc-dir "/html")))
>>> +               (for-each (lambda (f)
>>> +                           (install-file f doc-dir)
>>> +                           (delete-file f))
>>> +                         doc-files)
>>> +               (delete-file-recursively "doc")
>>
>> Can we build and install only Info files?  This is what we usually do
>> for packages that have Texinfo manuals.  Incidentally, it allows us to
>> get rid of the TeX Live dependency.
>
> I'm OK to remove slime.pdf, but the slime-refcard.pdf is quite useful.
> (See mit-scheme thread for my opinion on TeXLive.)

I think texlive is not needed for "slime-refcard.pdf" as this pdf is
available in the source: <https://github.com/slime/slime/tree/master/doc>.

-- 
Alex

Re: [PATCH 6/6] gnu: Add emacs-slime.

[Ludovic Courtès]

Federico Beffa <beffa@ieee.org> skribis:

> On Tue, Jan 5, 2016 at 11:17 PM, Ludovic Courtès <ludo@gnu.org> wrote:

[...]

>> Can we build and install only Info files?  This is what we usually do
>> for packages that have Texinfo manuals.  Incidentally, it allows us to
>> get rid of the TeX Live dependency.
>
> I'm OK to remove slime.pdf, but the slime-refcard.pdf is quite useful.

Sure.  Could you check if we can take that PDF from the source, as Alex
suggests?

>>> +    (synopsis
>>> +     "Superior Lisp Interaction Mode for Emacs")
>>
>> Move to previous line.
>
> OK. Note that this is coming straight out of Guile's 'pretty-print'...
> that's Guile's developers style, not mine :-)

Pretty-print is quite rudimentary in fact, and not extensible, so it
doesn’t accurately reflect the tastes of Guile developers.  :-)

> From a91182ee7d09c66a3f7b8f85b2ead4e282243d1a Mon Sep 17 00:00:00 2001
> From: Federico Beffa <beffa@fbengineering.ch>
> Date: Wed, 30 Dec 2015 00:47:29 +0100
> Subject: [PATCH 6/8] gnu: Add emacs-slime.
>
> * gnu/packages/emacs.scm (emacs-slime): New variable.

Modulo slime-refcard.pdf, which would be best to take from the source if
possible, it LGTM!

Thanks,
Ludo’.

Re: [PATCH] import: Move beautify description from cran to utils. (was Re: [PATCH 6/6] gnu: Add emacs-slime.)

[Ludovic Courtès]

Ben Woodcroft <b.woodcroft@uq.edu.au> skribis:

> From e3bad19a07d6a9fdf3045619232a24b77a1a5d12 Mon Sep 17 00:00:00 2001
> From: Ben Woodcroft <donttrustben@gmail.com>
> Date: Wed, 6 Jan 2016 00:09:19 +1000
> Subject: [PATCH 1/2] import: cran: Move beautify-description to utils module.
>
> * guix/import/cran.scm (beautify-description): Move from here...
> * guix/import/utils.scm: ... to here.

[...]

> From eb65d0ef0140ac2828b608c31ae19893861fea3a Mon Sep 17 00:00:00 2001
> From: Ben Woodcroft <donttrustben@gmail.com>
> Date: Wed, 6 Jan 2016 00:17:36 +1000
> Subject: [PATCH 2/2] import: gem: Beautify description field.
>
> * guix/import/gem.scm (gem->guix-package): Use 'beautify-description'.

LGTM, thanks!

Ludo'.

Re: [PATCH] import: Move beautify description from cran to utils. (was Re: [PATCH 6/6] gnu: Add emacs-slime.)

[Ben Woodcroft]

On 11/01/16 07:17, Ludovic Courtès wrote:
> Ben Woodcroft <b.woodcroft@uq.edu.au> skribis:
>
>>  From e3bad19a07d6a9fdf3045619232a24b77a1a5d12 Mon Sep 17 00:00:00 2001
>> From: Ben Woodcroft <donttrustben@gmail.com>
>> Date: Wed, 6 Jan 2016 00:09:19 +1000
>> Subject: [PATCH 1/2] import: cran: Move beautify-description to utils module.
>>
>> * guix/import/cran.scm (beautify-description): Move from here...
>> * guix/import/utils.scm: ... to here.
> [...]
>
>>  From eb65d0ef0140ac2828b608c31ae19893861fea3a Mon Sep 17 00:00:00 2001
>> From: Ben Woodcroft <donttrustben@gmail.com>
>> Date: Wed, 6 Jan 2016 00:17:36 +1000
>> Subject: [PATCH 2/2] import: gem: Beautify description field.
>>
>> * guix/import/gem.scm (gem->guix-package): Use 'beautify-description'.
> LGTM, thanks!
Pushed, ta.
ben

Re: [PATCH] import: Move beautify description from cran to utils. (was Re: [PATCH 6/6] gnu: Add emacs-slime.)

[Ricardo Wurmus]

Ben Woodcroft <b.woodcroft@uq.edu.au> writes:

> On 11/01/16 07:17, Ludovic Courtès wrote:
>> Ben Woodcroft <b.woodcroft@uq.edu.au> skribis:
>>
>>>  From e3bad19a07d6a9fdf3045619232a24b77a1a5d12 Mon Sep 17 00:00:00 2001
>>> From: Ben Woodcroft <donttrustben@gmail.com>
>>> Date: Wed, 6 Jan 2016 00:09:19 +1000
>>> Subject: [PATCH 1/2] import: cran: Move beautify-description to utils module.
>>>
>>> * guix/import/cran.scm (beautify-description): Move from here...
>>> * guix/import/utils.scm: ... to here.
>> [...]
>>
>>>  From eb65d0ef0140ac2828b608c31ae19893861fea3a Mon Sep 17 00:00:00 2001
>>> From: Ben Woodcroft <donttrustben@gmail.com>
>>> Date: Wed, 6 Jan 2016 00:17:36 +1000
>>> Subject: [PATCH 2/2] import: gem: Beautify description field.
>>>
>>> * guix/import/gem.scm (gem->guix-package): Use 'beautify-description'.
>> LGTM, thanks!
> Pushed, ta.

This breaks two of the cran importer tests:

(test-equal "beautify-description: use double spacing"
  "This is a package.  It is great.  Trust me Mr.  Hendrix."
  ((@@ (guix import cran) beautify-description)
   "This is a package. It is great. Trust me Mr. Hendrix."))

(test-equal "beautify-description: transform fragment into sentence"
  "This package provides a function to establish world peace"
  ((@@ (guix import cran) beautify-description)
   "A function to establish world peace"))

How about moving these tests elsewhere?  (Or should they be removed?)

~~ Ricardo

Re: [PATCH] import: Move beautify description from cran to utils. (was Re: [PATCH 6/6] gnu: Add emacs-slime.)

[Ben Woodcroft]

On 14/01/16 20:31, Ricardo Wurmus wrote:
> Ben Woodcroft <b.woodcroft@uq.edu.au> writes:
>
>> On 11/01/16 07:17, Ludovic Courtès wrote:
>>> Ben Woodcroft <b.woodcroft@uq.edu.au> skribis:
>>>
>>>>   From e3bad19a07d6a9fdf3045619232a24b77a1a5d12 Mon Sep 17 00:00:00 2001
>>>> From: Ben Woodcroft <donttrustben@gmail.com>
>>>> Date: Wed, 6 Jan 2016 00:09:19 +1000
>>>> Subject: [PATCH 1/2] import: cran: Move beautify-description to utils module.
>>>>
>>>> * guix/import/cran.scm (beautify-description): Move from here...
>>>> * guix/import/utils.scm: ... to here.
>>> [...]
>>>
>>>>   From eb65d0ef0140ac2828b608c31ae19893861fea3a Mon Sep 17 00:00:00 2001
>>>> From: Ben Woodcroft <donttrustben@gmail.com>
>>>> Date: Wed, 6 Jan 2016 00:17:36 +1000
>>>> Subject: [PATCH 2/2] import: gem: Beautify description field.
>>>>
>>>> * guix/import/gem.scm (gem->guix-package): Use 'beautify-description'.
>>> LGTM, thanks!
>> Pushed, ta.
> This breaks two of the cran importer tests:
>
> (test-equal "beautify-description: use double spacing"
>    "This is a package.  It is great.  Trust me Mr.  Hendrix."
>    ((@@ (guix import cran) beautify-description)
>     "This is a package. It is great. Trust me Mr. Hendrix."))
>
> (test-equal "beautify-description: transform fragment into sentence"
>    "This package provides a function to establish world peace"
>    ((@@ (guix import cran) beautify-description)
>     "A function to establish world peace"))
>
> How about moving these tests elsewhere?  (Or should they be removed?)
Ah, sorry. Should they be moved to a new file tests/import-utils? Why do 
you suggest that they should be removed?

ben

Re: [PATCH] import: Move beautify description from cran to utils. (was Re: [PATCH 6/6] gnu: Add emacs-slime.)

[Ricardo Wurmus]

Ben Woodcroft <b.woodcroft@uq.edu.au> writes:

> On 14/01/16 20:31, Ricardo Wurmus wrote:
>> This breaks two of the cran importer tests:
>>
>> (test-equal "beautify-description: use double spacing"
>>    "This is a package.  It is great.  Trust me Mr.  Hendrix."
>>    ((@@ (guix import cran) beautify-description)
>>     "This is a package. It is great. Trust me Mr. Hendrix."))
>>
>> (test-equal "beautify-description: transform fragment into sentence"
>>    "This package provides a function to establish world peace"
>>    ((@@ (guix import cran) beautify-description)
>>     "A function to establish world peace"))
>>
>> How about moving these tests elsewhere?  (Or should they be removed?)
>
> Ah, sorry. Should they be moved to a new file tests/import-utils? Why do 
> you suggest that they should be removed?

I don’t have any preference for a name.  “tests/import-utils” sounds
good to me.  If we can keep (and later enhance) the tests it would
obviously be better.  (I just meant that I wouldn’t be too sad if they
were removed for whatever reasons.)

Would you like to submit a patch to add tests/import-utils (including
adding it to SCM_TESTS in Makefile.am) and move these two test cases
there?

~~ Ricardo

Re: [PATCH] import: Move beautify description from cran to utils. (was Re: [PATCH 6/6] gnu: Add emacs-slime.)

[Ben Woodcroft]

On 14/01/16 21:30, Ricardo Wurmus wrote:
> Ben Woodcroft <b.woodcroft@uq.edu.au> writes:
>
>> On 14/01/16 20:31, Ricardo Wurmus wrote:
>>> This breaks two of the cran importer tests:
>>>
>>> (test-equal "beautify-description: use double spacing"
>>>     "This is a package.  It is great.  Trust me Mr.  Hendrix."
>>>     ((@@ (guix import cran) beautify-description)
>>>      "This is a package. It is great. Trust me Mr. Hendrix."))
>>>
>>> (test-equal "beautify-description: transform fragment into sentence"
>>>     "This package provides a function to establish world peace"
>>>     ((@@ (guix import cran) beautify-description)
>>>      "A function to establish world peace"))
I just tested these with "make check" and also by ./pre-inst-env guile 
tests/cran.scm, and they seem to pass. Am I doing something incorrectly?

However, ironically tests/gem fails.
>>> How about moving these tests elsewhere?  (Or should they be removed?)
>> Ah, sorry. Should they be moved to a new file tests/import-utils? Why do
>> you suggest that they should be removed?
> I don’t have any preference for a name.  “tests/import-utils” sounds
> good to me.  If we can keep (and later enhance) the tests it would
> obviously be better.  (I just meant that I wouldn’t be too sad if they
> were removed for whatever reasons.)
>
> Would you like to submit a patch to add tests/import-utils (including
> adding it to SCM_TESTS in Makefile.am) and move these two test cases
> there?
Happy to provide a patch fixing the gem test, and moving the (failing?) 
cran tests to this new file since even if they pass that is a more 
appropriate place for them. It'll be the weekend before I have time for 
this though, apologies for leaving master broken.

ben

Re: [PATCH] import: Move beautify description from cran to utils.

[Ben Woodcroft]

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



On 14/01/16 22:15, Ben Woodcroft wrote:
> On 14/01/16 21:30, Ricardo Wurmus wrote:
>> Ben Woodcroft <b.woodcroft@uq.edu.au> writes:
>>> On 14/01/16 20:31, Ricardo Wurmus wrote:
>>>> This breaks two of the cran importer tests:
>>>>
>>>> (test-equal "beautify-description: use double spacing"
>>>>     "This is a package.  It is great.  Trust me Mr. Hendrix."
>>>>     ((@@ (guix import cran) beautify-description)
>>>>      "This is a package. It is great. Trust me Mr. Hendrix."))
>>>>
>>>> (test-equal "beautify-description: transform fragment into sentence"
>>>>     "This package provides a function to establish world peace"
>>>>     ((@@ (guix import cran) beautify-description)
>>>>      "A function to establish world peace"))
> I just tested these with "make check" and also by ./pre-inst-env guile 
> tests/cran.scm, and they seem to pass. Am I doing something incorrectly?
>
> However, ironically tests/gem fails.
Turns out there was an actual bug here - the description was being used 
for the synopsis to so the synopsis was being inappropriately beautified.
>>>> How about moving these tests elsewhere?  (Or should they be removed?)
>>> Ah, sorry. Should they be moved to a new file tests/import-utils? 
>>> Why do
>>> you suggest that they should be removed?
>> I don’t have any preference for a name.  “tests/import-utils” sounds
>> good to me.  If we can keep (and later enhance) the tests it would
>> obviously be better.  (I just meant that I wouldn’t be too sad if they
>> were removed for whatever reasons.)
>>
>> Would you like to submit a patch to add tests/import-utils (including
>> adding it to SCM_TESTS in Makefile.am) and move these two test cases
>> there?
> Happy to provide a patch fixing the gem test, and moving the 
> (failing?) cran tests to this new file since even if they pass that is 
> a more appropriate place for them. It'll be the weekend before I have 
> time for this though, apologies for leaving master broken.
Attached patches, make check now passes. Do they look OK? Possibly I 
messed up the commit messages.

Thanks,
ben

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: 0002-tests-Move-beatify-description-tests-to-import-tests.patch --]
[-- Type: text/x-patch; name="0002-tests-Move-beatify-description-tests-to-import-tests.patch", Size: 3643 bytes --]

From 06f3c311ccab7013b030bb919a1cf40054fe9263 Mon Sep 17 00:00:00 2001
From: Ben Woodcroft <donttrustben@gmail.com>
Date: Sun, 17 Jan 2016 10:20:59 +1000
Subject: [PATCH 2/2] tests: Move beatify-description tests to import-tests.

* tests/cran.scm (beautify-description: use double spacing,
beautify-description: transform fragment into sentence). Move
from here ...
* tests/import-utils.scm: ... to here. New file.
* Makefile.am (SCM_TESTS): Add import-utils.
---
 Makefile.am            |  3 ++-
 tests/cran.scm         | 10 ----------
 tests/import-utils.scm | 38 ++++++++++++++++++++++++++++++++++++++
 3 files changed, 40 insertions(+), 11 deletions(-)
 create mode 100644 tests/import-utils.scm

diff --git a/Makefile.am b/Makefile.am
index 6e9deeb..4fead80 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -246,7 +246,8 @@ SCM_TESTS =					\
   tests/cve.scm					\
   tests/file-systems.scm			\
   tests/services.scm				\
-  tests/containers.scm
+  tests/containers.scm				\
+  tests/import-utils.scm
 
 if HAVE_GUILE_JSON
 
diff --git a/tests/cran.scm b/tests/cran.scm
index 0a4a2fd..206c045 100644
--- a/tests/cran.scm
+++ b/tests/cran.scm
@@ -86,16 +86,6 @@ Date/Publication: 2015-07-14 14:15:16
   '()
   ((@@ (guix import cran) listify) simple-alist "BadList"))
 
-(test-equal "beautify-description: use double spacing"
-  "This is a package.  It is great.  Trust me Mr.  Hendrix."
-  ((@@ (guix import cran) beautify-description)
-   "This is a package. It is great. Trust me Mr. Hendrix."))
-
-(test-equal "beautify-description: transform fragment into sentence"
-  "This package provides a function to establish world peace"
-  ((@@ (guix import cran) beautify-description)
-   "A function to establish world peace"))
-
 (test-assert "description->package"
   ;; Replace network resources with sample data.
   (mock ((guix build download) url-fetch
diff --git a/tests/import-utils.scm b/tests/import-utils.scm
new file mode 100644
index 0000000..a365847
--- /dev/null
+++ b/tests/import-utils.scm
@@ -0,0 +1,38 @@
+;;; GNU Guix --- Functional package management for GNU
+;;; Copyright © 2016 Ben Woodcroft <donttrustben@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 (test-import-utils)
+  #:use-module (guix tests)
+  #:use-module (srfi srfi-64))
+
+(test-begin "import-utils")
+
+(test-equal "beautify-description: use double spacing"
+  "This is a package.  It is great.  Trust me Mr.  Hendrix."
+  ((@@ (guix import utils) beautify-description)
+   "This is a package. It is great. Trust me Mr. Hendrix."))
+
+(test-equal "beautify-description: transform fragment into sentence"
+  "This package provides a function to establish world peace"
+  ((@@ (guix import utils) beautify-description)
+   "A function to establish world peace"))
+
+(test-end "import-utils")
+
+\f
+(exit (= (test-runner-fail-count (test-runner-current)) 0))
-- 
2.6.3


[-- Attachment #3: 0001-import-gem-Beautify-only-the-description-not-the-syn.patch --]
[-- Type: text/x-patch, Size: 2942 bytes --]

From 999bbb38b868a0ae018e631debf5a3ca6e91f065 Mon Sep 17 00:00:00 2001
From: Ben Woodcroft <donttrustben@gmail.com>
Date: Sun, 17 Jan 2016 09:12:14 +1000
Subject: [PATCH 1/2] import: gem: Beautify only the description, not the
 synopsis.

* guix/import/gem.scm (make-gem-sexp): Add synopsis argument.
(gem->guix-package): Pass unbeautified synopsis to make-gem-sexp.
* tests/gem.scm: Adapt it.
---
 guix/import/gem.scm | 7 ++++---
 tests/gem.scm       | 2 +-
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/guix/import/gem.scm b/guix/import/gem.scm
index 3c42052..4b2a253 100644
--- a/guix/import/gem.scm
+++ b/guix/import/gem.scm
@@ -77,7 +77,7 @@ the package."
             (bytevector-u8-set! bv i (read-byte i))
             (loop (1+ i)))))))
 
-(define (make-gem-sexp name version hash home-page description
+(define (make-gem-sexp name version hash home-page synopsis description
                        dependencies licenses)
   "Return the `package' s-expression for a Ruby package with the given NAME,
 VERSION, HASH, HOME-PAGE, DESCRIPTION, DEPENDENCIES, and LICENSES."
@@ -101,7 +101,7 @@ VERSION, HASH, HOME-PAGE, DESCRIPTION, DEPENDENCIES, and LICENSES."
                          (,'unquote
                           ,(string->symbol name))))
                      dependencies)))))
-     (synopsis ,description)    ; nothing better to use
+     (synopsis ,synopsis)
      (description ,description)
      (home-page ,home-page)
      (license ,(match licenses
@@ -117,6 +117,7 @@ VERSION, HASH, HOME-PAGE, DESCRIPTION, DEPENDENCIES, and LICENSES."
          (let ((name         (assoc-ref package "name"))
                (version      (assoc-ref package "version"))
                (hash         (assoc-ref package "sha"))
+               (synopsis     (assoc-ref package "info")) ; nothing better to use
                (description  (beautify-description
                               (assoc-ref package "info")))
                (home-page    (assoc-ref package "homepage_uri"))
@@ -129,5 +130,5 @@ VERSION, HASH, HOME-PAGE, DESCRIPTION, DEPENDENCIES, and LICENSES."
                                               "runtime")))
                (licenses     (map string->license
                                   (assoc-ref package "licenses"))))
-           (make-gem-sexp name version hash home-page
+           (make-gem-sexp name version hash home-page synopsis
                           description dependencies licenses)))))
diff --git a/tests/gem.scm b/tests/gem.scm
index 9efbda3..ebce809 100644
--- a/tests/gem.scm
+++ b/tests/gem.scm
@@ -69,7 +69,7 @@
            (("bundler" ('unquote 'bundler))
             ("ruby-bar" ('unquote 'ruby-bar)))))
          ('synopsis "A cool gem")
-         ('description "A cool gem")
+         ('description "This package provides a cool gem")
          ('home-page "https://example.com")
          ('license ('list 'expat 'asl2.0)))
        #t)
-- 
2.6.3

Re: [PATCH] import: Move beautify description from cran to utils.

[Ludovic Courtès]

Ben Woodcroft <b.woodcroft@uq.edu.au> skribis:

> From 06f3c311ccab7013b030bb919a1cf40054fe9263 Mon Sep 17 00:00:00 2001
> From: Ben Woodcroft <donttrustben@gmail.com>
> Date: Sun, 17 Jan 2016 10:20:59 +1000
> Subject: [PATCH 2/2] tests: Move beatify-description tests to import-tests.
>
> * tests/cran.scm (beautify-description: use double spacing,
> beautify-description: transform fragment into sentence). Move
> from here ...
> * tests/import-utils.scm: ... to here. New file.
> * Makefile.am (SCM_TESTS): Add import-utils.

[...]

> +++ b/tests/import-utils.scm
> @@ -0,0 +1,38 @@
> +;;; GNU Guix --- Functional package management for GNU
> +;;; Copyright .© 2016 Ben Woodcroft <donttrustben@gmail.com>

Please keep the line for Ricardo.

> +(define-module (test-import-utils)
> +  #:use-module (guix tests)
> +  #:use-module (srfi srfi-64))
> +
> +(test-begin "import-utils")
> +
> +(test-equal "beautify-description: use double spacing"
> +  "This is a package.  It is great.  Trust me Mr.  Hendrix."
> +  ((@@ (guix import utils) beautify-description)

Since ‘beautify-description’ is now exported, could you add
#:use-module (guix import utils) and remove the ‘@@’ form?

> +(test-equal "beautify-description: transform fragment into sentence"
> +  "This package provides a function to establish world peace"
> +  ((@@ (guix import utils) beautify-description)

Same here.

OK with this change.

> From 999bbb38b868a0ae018e631debf5a3ca6e91f065 Mon Sep 17 00:00:00 2001
> From: Ben Woodcroft <donttrustben@gmail.com>
> Date: Sun, 17 Jan 2016 09:12:14 +1000
> Subject: [PATCH 1/2] import: gem: Beautify only the description, not the
>  synopsis.
>
> * guix/import/gem.scm (make-gem-sexp): Add synopsis argument.
> (gem->guix-package): Pass unbeautified synopsis to make-gem-sexp.
> * tests/gem.scm: Adapt it.

Please also add:

  Fixes <http://bugs.gnu.org/22391>.

below the subject line.

OK with this change.

Thanks!

Ludo’.

Re: [PATCH] import: Move beautify description from cran to utils.

[Ben Woodcroft]

On 18/01/16 19:45, Ludovic Courtès wrote:

[..]
>
> OK with this change.
Great, thanks, pushed.

Can I ask a question though, does the bug system track the contents of 
commit messages on master or did the bug need to be closed manually (I 
did this already mind)?

ta
ben

Re: [PATCH] import: Move beautify description from cran to utils.

[Ludovic Courtès]

Ben Woodcroft <b.woodcroft@uq.edu.au> skribis:

> Can I ask a question though, does the bug system track the contents of
> commit messages on master or did the bug need to be closed manually (I
> did this already mind)?

Unfortunately there’s no connection between the two, so the bug indeed
has to be closed manually.

Ludo’.