[bug#29079] [PATCH] gnu: Add hunspell-en-US.

[bug#29079] [PATCH] gnu: Add hunspell-en-US.

[Kei Kebreau]

* gnu/packages/dictionaries.scm (hunspell-en-US): New variable.
---
 gnu/packages/dictionaries.scm | 37 +++++++++++++++++++++++++++++++++++++
 1 file changed, 37 insertions(+)

diff --git a/gnu/packages/dictionaries.scm b/gnu/packages/dictionaries.scm
index 062c29b66..0cc7df394 100644
--- a/gnu/packages/dictionaries.scm
+++ b/gnu/packages/dictionaries.scm
@@ -2,6 +2,7 @@
 ;;; Copyright © 2014, 2015, 2016 Ludovic Courtès <ludo@gnu.org>
 ;;; Copyright © 2016, 2017 Efraim Flashner <efraim@flashner.co.il>
 ;;; Copyright © 2016 Sou Bunnbu <iyzsong@gmail.com>
+;;; Copyright © 2017 Kei Kebreau <kkebreau@posteo.net>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -252,3 +253,39 @@ translator powered by Google Translate (default), Bing Translator,
 Yandex.Translate and Apertium.  It gives you easy access to one of these
 translation engines from your terminal.")
     (license public-domain)))
+
+(define-public hunspell-en-US
+  (package
+    (name "hunspell-en-US")
+    (version "2017.01.22")
+    (source (origin
+              (method url-fetch)
+              (uri (string-append "https://launchpad.net/hunspell-en_US/trunk/"
+                                  version "/+download/hunspell-en_US-" version
+                                  ".zip"))
+              (sha256
+               (base32
+                "0svc3m09vz7q37481a0lrf6j2raw65zqg6lazic06s7f1vc6h92i"))))
+    (build-system trivial-build-system)
+    (arguments
+     '(#:builder (begin
+                   (use-modules (guix build utils))
+
+                   (let* ((dict (assoc-ref %build-inputs "source"))
+                          (out (assoc-ref %outputs "out"))
+                          (share (string-append out "/share/hunspell"))
+                          (unzip (string-append
+                                  (assoc-ref %build-inputs "unzip")
+                                  "/bin/unzip")))
+                     (mkdir-p share)
+                     (zero? (system* unzip dict "-d" share))))
+       #:modules ((guix build utils))))
+    (native-inputs
+     `(("source" ,source)
+       ("unzip" ,unzip)))
+    (home-page "http://wordlist.aspell.net/")
+    (synopsis "American English dictionary for use with hunspell")
+    (description
+     "This is an American English dictionary for use with the hunspell spell
+checker.")
+    (license (non-copyleft "file://README_en_US.txt"))))
-- 
2.14.3

[bug#29079] [PATCH] gnu: Add hunspell-en-US.

[Ludovic Courtès]

Hi Kei,

Kei Kebreau <kkebreau@posteo.net> skribis:

> * gnu/packages/dictionaries.scm (hunspell-en-US): New variable.

On the same day I added this one and a couple of other dictionaries:

  https://git.savannah.gnu.org/cgit/guix.git/commit/?id=085bcca313c3827f7c56e7c345d4606588db9085

The package I committed builds the Hunspell list “from source”.

Let me know whether we should adjust things and what you think of it.

Thanks!

Ludo’.

[bug#29079] [PATCH] gnu: Add hunspell-en-US.

[Kei Kebreau]

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

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

> Hi Kei,
>
> Kei Kebreau <kkebreau@posteo.net> skribis:
>
>> * gnu/packages/dictionaries.scm (hunspell-en-US): New variable.
>
> On the same day I added this one and a couple of other dictionaries:
>
>   https://git.savannah.gnu.org/cgit/guix.git/commit/?id=085bcca313c3827f7c56e7c345d4606588db9085
>
> The package I committed builds the Hunspell list “from source”.
>
> Let me know whether we should adjust things and what you think of it.
>
> Thanks!
>
> Ludo’.

I definitely like the generality and flexibility of this patch
better. To get the dictionary to work in LibreOffice I had to install
the .dic file as well [0], but once I did that everything seemed to work
as expected.

[0]:
  (mkdir-p myspell)
+ (install-file ,(string-append "speller/" language ".dic")
+               hunspell)
  (install-file ,(string-append "speller/" language ".aff")
                hunspell)

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 832 bytes --]

[bug#29079] [PATCH] gnu: Add hunspell-en-US.

[Ludovic Courtès]

Hi Kei,

Kei Kebreau <kkebreau@posteo.net> skribis:

> ludo@gnu.org (Ludovic Courtès) writes:
>
>> Hi Kei,
>>
>> Kei Kebreau <kkebreau@posteo.net> skribis:
>>
>>> * gnu/packages/dictionaries.scm (hunspell-en-US): New variable.
>>
>> On the same day I added this one and a couple of other dictionaries:
>>
>>   https://git.savannah.gnu.org/cgit/guix.git/commit/?id=085bcca313c3827f7c56e7c345d4606588db9085
>>
>> The package I committed builds the Hunspell list “from source”.
>>
>> Let me know whether we should adjust things and what you think of it.
>>
>> Thanks!
>>
>> Ludo’.
>
> I definitely like the generality and flexibility of this patch
> better. To get the dictionary to work in LibreOffice I had to install
> the .dic file as well [0], but once I did that everything seemed to work
> as expected.
>
> [0]:
>   (mkdir-p myspell)
> + (install-file ,(string-append "speller/" language ".dic")
> +               hunspell)
>   (install-file ,(string-append "speller/" language ".aff")
>                 hunspell)

Nice (I thought Hunspell used exclusively the .aff files.)
OK for this patch!

The hunspell-dict-fr* packages include both .aff and .dic, so that
should be fine.

Thanks,
Ludo’.

[bug#29079] [PATCH] gnu: Add hunspell-en-US.

[Kei Kebreau]

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

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

> Hi Kei,
>
> Kei Kebreau <kkebreau@posteo.net> skribis:
>
>> ludo@gnu.org (Ludovic Courtès) writes:
>>
>>> Hi Kei,
>>>
>>> Kei Kebreau <kkebreau@posteo.net> skribis:
>>>
>>>> * gnu/packages/dictionaries.scm (hunspell-en-US): New variable.
>>>
>>> On the same day I added this one and a couple of other dictionaries:
>>>
>>>   https://git.savannah.gnu.org/cgit/guix.git/commit/?id=085bcca313c3827f7c56e7c345d4606588db9085
>>>
>>> The package I committed builds the Hunspell list “from source”.
>>>
>>> Let me know whether we should adjust things and what you think of it.
>>>
>>> Thanks!
>>>
>>> Ludo’.
>>
>> I definitely like the generality and flexibility of this patch
>> better. To get the dictionary to work in LibreOffice I had to install
>> the .dic file as well [0], but once I did that everything seemed to work
>> as expected.
>>
>> [0]:
>>   (mkdir-p myspell)
>> + (install-file ,(string-append "speller/" language ".dic")
>> +               hunspell)
>>   (install-file ,(string-append "speller/" language ".aff")
>>                 hunspell)
>
> Nice (I thought Hunspell used exclusively the .aff files.)
> OK for this patch!
>
> The hunspell-dict-fr* packages include both .aff and .dic, so that
> should be fine.
>
> Thanks,
> Ludo’.

Is this log message okay? I'm not sure how we handle changes to package
template functions.

[-- Attachment #1.2: 0001-gnu-Fix-hunspell-dict-en-dictionary-installation.patch --]
[-- Type: text/plain, Size: 1105 bytes --]

From c143bad02ebcb7d94ad6e2582b6831c5d107e2a8 Mon Sep 17 00:00:00 2001
From: Kei Kebreau <kkebreau@posteo.net>
Date: Thu, 9 Nov 2017 17:49:02 -0500
Subject: [PATCH] gnu: Fix hunspell-dict-en-* dictionary installation.

* gnu/packages/aspell.scm (aspell-word-list)[arguments]: Install the .dic file
for all hunspell dictionaries.
---
 gnu/packages/aspell.scm | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/gnu/packages/aspell.scm b/gnu/packages/aspell.scm
index 3eeeee64f..86e059834 100644
--- a/gnu/packages/aspell.scm
+++ b/gnu/packages/aspell.scm
@@ -270,6 +270,8 @@ dictionaries, including personal ones.")
                     (doc      (string-append out "/share/doc/"
                                              ,name)))
                (mkdir-p myspell)
+               (install-file ,(string-append "speller/" language ".dic")
+                             hunspell)
                (install-file ,(string-append "speller/" language ".aff")
                              hunspell)
                (symlink hunspell (string-append myspell "/dicts"))
-- 
2.14.3


[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 832 bytes --]

[bug#29079] [PATCH] gnu: Add hunspell-en-US.

[Ludovic Courtès]

Kei Kebreau <kkebreau@posteo.net> skribis:

> From c143bad02ebcb7d94ad6e2582b6831c5d107e2a8 Mon Sep 17 00:00:00 2001
> From: Kei Kebreau <kkebreau@posteo.net>
> Date: Thu, 9 Nov 2017 17:49:02 -0500
> Subject: [PATCH] gnu: Fix hunspell-dict-en-* dictionary installation.
>
> * gnu/packages/aspell.scm (aspell-word-list)[arguments]: Install the .dic file
> for all hunspell dictionaries.

Perfect, thanks!

Ludo’.

bug#29079: [PATCH] gnu: Add hunspell-en-US.

[Kei Kebreau]

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

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

> Kei Kebreau <kkebreau@posteo.net> skribis:
>
>> From c143bad02ebcb7d94ad6e2582b6831c5d107e2a8 Mon Sep 17 00:00:00 2001
>> From: Kei Kebreau <kkebreau@posteo.net>
>> Date: Thu, 9 Nov 2017 17:49:02 -0500
>> Subject: [PATCH] gnu: Fix hunspell-dict-en-* dictionary installation.
>>
>> * gnu/packages/aspell.scm (aspell-word-list)[arguments]: Install the .dic file
>> for all hunspell dictionaries.
>
> Perfect, thanks!
>
> Ludo’.

Pushed as d4d7d70912642be18d93c9ce6470f8650097b5e5 to master!

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 832 bytes --]