From patchwork Tue Jul 28 11:36:09 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Maja_K=C4=85dzio=C5=82ka?= X-Patchwork-Id: 23430 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 2501A27BBE1; Tue, 28 Jul 2020 12:37:13 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-5.2 required=5.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_DNSWL_MED,RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL, UNPARSEABLE_RELAY,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTP id CC68527BBE3 for ; Tue, 28 Jul 2020 12:37:10 +0100 (BST) Received: from localhost ([::1]:37928 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1k0Nuw-0007cR-8i for patchwork@mira.cbaines.net; Tue, 28 Jul 2020 07:37:10 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:40338) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1k0Nuo-0007Zs-Pk for guix-patches@gnu.org; Tue, 28 Jul 2020 07:37:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:45920) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1k0Nuo-0002Ru-F0 for guix-patches@gnu.org; Tue, 28 Jul 2020 07:37:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1k0Nuo-0001hg-C9 for guix-patches@gnu.org; Tue, 28 Jul 2020 07:37:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#42474] [PATCH v3 1/2] gnu: Add ispell. Resent-From: Jakub =?utf-8?b?S8SFZHppb8WCa2E=?= Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 28 Jul 2020 11:37:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 42474 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 42474@debbugs.gnu.org Cc: efraim@flashner.co.il, jonathan.brielmaier@web.de Received: via spool by 42474-submit@debbugs.gnu.org id=B42474.15959361956503 (code B ref 42474); Tue, 28 Jul 2020 11:37:02 +0000 Received: (at 42474) by debbugs.gnu.org; 28 Jul 2020 11:36:35 +0000 Received: from localhost ([127.0.0.1]:57463 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1k0NuC-0001gb-GX for submit@debbugs.gnu.org; Tue, 28 Jul 2020 07:36:35 -0400 Received: from pat.zlotemysli.pl ([37.59.186.212]:51788) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1k0Nu9-0001gQ-EI for 42474@debbugs.gnu.org; Tue, 28 Jul 2020 07:36:23 -0400 Received: (qmail 24078 invoked by uid 1009); 28 Jul 2020 13:36:19 +0200 Received: from user-5-173-112-145.play-internet.pl (kuba@kadziolka.net@user-5-173-112-145.play-internet.pl) by pat.zlotemysli.pl (envelope-from , uid 1002) with qmail-scanner-2.08st (clamdscan: 0.98.6/25886. spamassassin: 3.4.0. perlscan: 2.08st. Clear:RC:1(5.173.112.145):. Processed in 0.057594 secs); 28 Jul 2020 11:36:19 -0000 Received: from user-5-173-112-145.play-internet.pl (HELO localhost.localdomain) (kuba@kadziolka.net@5.173.112.145) by pat.zlotemysli.pl with AES256-SHA encrypted SMTP; 28 Jul 2020 13:36:18 +0200 From: Jakub =?utf-8?b?S8SFZHppb8WCa2E=?= Date: Tue, 28 Jul 2020 13:36:09 +0200 Message-Id: <20200728113609.28126-1-kuba@kadziolka.net> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20200724223838.12444-3-jonathan.brielmaier@web.de> References: <20200724223838.12444-3-jonathan.brielmaier@web.de> MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/aspell.scm (ispell): New variable. Co-authored-by: Jonathan Brielmaier --- Hi, DESTDIR is a variable that should always be / on Guix. Its meaning is that the package should be installed to $DESTDIR/$prefix/bin/foo, but will be ran at $prefix/bin/foo - useful when you're managing the creation of a binary tarball manually, but useless and misleading for Guix. Also, we already have an implementation of Yacc - I've replaced the input with Bison. Moreover, instead of patching the defaults, a configuration file is now created. I haven't tried spellchecking anything with ispell or using the German dictionary, but both packages now build. Regards, Jakub Kądziołka gnu/packages/aspell.scm | 51 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 51 insertions(+) diff --git a/gnu/packages/aspell.scm b/gnu/packages/aspell.scm index 22256f750b..a9c7e0d615 100644 --- a/gnu/packages/aspell.scm +++ b/gnu/packages/aspell.scm @@ -9,6 +9,8 @@ ;;; Copyright © 2019 Jens Mølgaard ;;; Copyright © 2020 Timotej Lazar ;;; Copyright © 2020 Marcin Karpezo +;;; Copyright © 2020 Jonathan Brielmaier +;;; Copyright © 2020 Jakub Kądziołka ;;; ;;; This file is part of GNU Guix. ;;; @@ -33,7 +35,9 @@ #:use-module (guix utils) #:use-module (gnu packages) #:use-module (gnu packages base) + #:use-module (gnu packages bison) #:use-module (gnu packages compression) + #:use-module (gnu packages ncurses) #:use-module (gnu packages perl) #:use-module (ice-9 match)) @@ -453,3 +457,50 @@ under permissive licensing terms. See the 'Copyright' file.")))) (define-word-list-dictionary hunspell-dict-en-us "en_US" (synopsis "Hunspell dictionary for United States English")) + +(define-public ispell + (package + (name "ispell") + (version "3.4.00") + (source + (origin + (method url-fetch) + (uri (string-append "http://www.cs.hmc.edu/~geoff/tars/ispell-" + version ".tar.gz")) + (sha256 + (base32 + "1hmfnz55qzfpz7lz0r3m4kkv31smir92ks9s5l1iiwimhr2jxi2x")))) + (build-system gnu-build-system) + (arguments + `(#:parallel-build? #f + #:tests? #f ; no tests + #:phases + (modify-phases %standard-phases + (replace 'configure + (lambda* (#:key inputs outputs #:allow-other-keys) + ;; Based on local.h.linux + (let* ((grep (assoc-ref inputs "grep")) + (out (assoc-ref outputs "out"))) + (call-with-output-file "local.h" + (lambda (port) + (format port "#define MINIMENU~%") + (format port "#define USG~%") + (format port "#define HAS_RENAME~%") + (format port "#define CC \"gcc\"~%") + (format port "#define POUNDBANG \"#!~a\"~%" (which "sh")) + (format port "#define EGREPCMD \"~a/bin/grep -Ei\"~%" grep) + (format port "#define BINDIR \"~a/bin\"~%" out) + (format port "#define LIBDIR \"~a/lib/ispell\"~%" out) + (format port "#define MAN1DIR \"~a/share/man/man1\"~%" out) + (format port "#define MAN45DIR \"~a/share/man/man5\"~%" out)))) + #t))))) + (inputs + `(("grep" ,grep) + ("ncurses" ,ncurses))) + (native-inputs + `(("bison" ,bison))) + (synopsis "Interactive spell-checking tool for Unix") + (description "Ispell is an interactive spell-checking tool supporting many +European languages.") + (home-page "https://www.cs.hmc.edu/~geoff/ispell.html") + (license bsd-3)))