From patchwork Tue Aug 30 19:38:28 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Joeke de Graaf X-Patchwork-Id: 42083 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 A6B7927BBEA; Tue, 30 Aug 2022 20:54:40 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 0D2DE27BBE9 for ; Tue, 30 Aug 2022 20:54:40 +0100 (BST) Received: from localhost ([::1]:40302 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oT7Je-0002lG-UT for patchwork@mira.cbaines.net; Tue, 30 Aug 2022 15:54:37 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:42224) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oT74g-0004j5-6D for guix-patches@gnu.org; Tue, 30 Aug 2022 15:39:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:47832) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oT74f-0006KB-PS for guix-patches@gnu.org; Tue, 30 Aug 2022 15:39:01 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1oT74f-0006Hs-Ku for guix-patches@gnu.org; Tue, 30 Aug 2022 15:39:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#57348] [PATCH] gnu: Add eisl Resent-From: Joeke Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 30 Aug 2022 19:39:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 57348 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 57348@debbugs.gnu.org Received: via spool by 57348-submit@debbugs.gnu.org id=B57348.166188832124139 (code B ref 57348); Tue, 30 Aug 2022 19:39:01 +0000 Received: (at 57348) by debbugs.gnu.org; 30 Aug 2022 19:38:41 +0000 Received: from localhost ([127.0.0.1]:37581 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oT74K-0006HG-U5 for submit@debbugs.gnu.org; Tue, 30 Aug 2022 15:38:41 -0400 Received: from mout01.posteo.de ([185.67.36.65]:54315) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oT74I-0006H2-HH for 57348@debbugs.gnu.org; Tue, 30 Aug 2022 15:38:39 -0400 Received: from submission (posteo.de [185.67.36.169]) by mout01.posteo.de (Postfix) with ESMTPS id 81182240027 for <57348@debbugs.gnu.org>; Tue, 30 Aug 2022 21:38:29 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1661888312; bh=/RS8BUb65V5mGZMDRdKX0x1zhiS2qWP+UMCDp723j1U=; h=From:To:Subject:Date:From; b=fjmTk9TEUPDwicbeZy+XCwF+obfyeZndi183QoKxTGtQqYZVKvjwgw9S3+maVeqGq 6C8viP4/2JQxdkiHw/F/GX1U0QAL/MN9hZbftB8lIJFlT2Eb005+hqRcYNiOM1FcyO qIMHW3G1QHYQ5hGJejcpBZQc9tQKVHlkv9fYFVRW9KqOc2axfitJHtfj2UkGe1xn14 Q6+LSp93PBIrep/uNCQ/9u5QdCmYgBl3+4qdapjNgtuIHxXwHHGt5uUSjd0p2liOFP 0Xal50YyvYMCq/RBT05WRVgtu0G44LGvGWghBmtdzJP2mzioIl8D9ULb04WQyrQHCA kbj4W33ZMmJrA== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4MHHfY2pzYz6tqn for <57348@debbugs.gnu.org>; Tue, 30 Aug 2022 21:38:29 +0200 (CEST) From: Joeke In-Reply-To: <871qt20w8g.fsf@kitej> References: <87tu6351hu.fsf@bolo-santosi.mail-host-address-is-not-set> <871qt20w8g.fsf@kitej> Date: Tue, 30 Aug 2022 19:38:28 +0000 Message-ID: <87k06pbjyj.fsf@bolo-santosi.mail-host-address-is-not-set> 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 Hi, Guillaume Le Vaillant writes: >> + (build-system gnu-build-system) >> + (native-inputs >> + (list gcc ncurses cppcheck)) > > Adding gcc to 'native-inputs' is not necessary, and ncurses should > probably be in 'inputs' instead of 'native-inputs'. Right, fixed. >> + (arguments >> + `(#:modules >> + ((guix build utils) >> + (guix build gnu-build-system)) > > Specifying 'modules' here is not necessary. I removed this as well. >> + (home-page "https://github.com/sasagawa888/eisl") >> + (synopsis "Implementation of ISLisp") >> + (description "Easy ISLISP (eisl) is an implementation of ISLisp which >> +includes a compiler as well as an interpreter.") >> + (license license:bsd-2))) > > It looks like some code in "cii/" is under the expat license, and some > code in "nana/" is under bsd-3, so they should be added to the 'license' > field. You're right. I also found some gpl2+ code under nana/. > Also, it looks like the files in "library/" are not compiled/installed. > Is it on purpose? This certainly was not intentional. In my new patch I somewhat hackily copy the "library" and "bench" directories over to the output directory. If there is a better way to do this, please let me know. Dankon por la revizio, Joeke de Graaf From 0162b638d42d02b4ed11db77b2ad46179f673f03 Mon Sep 17 00:00:00 2001 From: Joeke de Graaf Date: Tue, 30 Aug 2022 21:27:24 +0200 Subject: [PATCH] gnu: Add eisl --- gnu/packages/lisp.scm | 59 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 59 insertions(+) diff --git a/gnu/packages/lisp.scm b/gnu/packages/lisp.scm index 2f37b82..ad57d45 100644 --- a/gnu/packages/lisp.scm +++ b/gnu/packages/lisp.scm @@ -21,6 +21,7 @@ ;;; Copyright © 2021 Paul A. Patience ;;; Copyright © 2021 Charles Jackson ;;; Copyright © 2021 jgart +;;; Copyright © 2022 Joeke de Graaf ;;; ;;; This file is part of GNU Guix. ;;; @@ -59,6 +60,7 @@ (define-module (gnu packages lisp) #:use-module (gnu packages base) #:use-module (gnu packages bash) #:use-module (gnu packages bdw-gc) + #:use-module (gnu packages check) #:use-module (gnu packages compression) #:use-module (gnu packages ed) #:use-module (gnu packages fontutils) @@ -1351,3 +1353,60 @@ (define-public buildapp "Buildapp is an application for SBCL or CCL that configures and saves an executable Common Lisp image. It is similar to cl-launch and hu.dwim.build.") (license license:bsd-2))) + + +(define-public eisl + (package + (name "eisl") + (version "2.60") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/sasagawa888/eisl") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0qrmy6myyac38q3kf26axmxpmq9srhc6qy0ykfcsng50jzcdg1mn")))) + (build-system gnu-build-system) + (inputs + (list ncurses)) + (native-inputs + (list cppcheck)) + (arguments + `(#:make-flags + (list (string-append "PREFIX=" (assoc-ref %outputs "out")) + (string-append "CC=" ,(cc-for-target))) + + #:phases + (modify-phases %standard-phases + (add-before 'install 'create-store-directory + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref %outputs "out")) + (bin (string-append out "/bin")) + (lib (string-append out "/library")) + (ben (string-append out "/bench"))) + (map mkdir-p (list out bin lib ben))))) + (add-after 'install 'install-lib-and-bench + (lambda* (#:key build-inputs outputs #:allow-other-keys) + (let* ((source (assoc-ref %build-inputs "source")) + (out (assoc-ref %outputs "out")) + (libstring "/library/") + (benchstring "/bench/")) + (map (lambda (subdir-name) + (let ((sourcedir (opendir (string-append source subdir-name)))) + (do ((file (readdir sourcedir) (readdir sourcedir))) + ((eof-object? file)) + (when (not (member file '("." ".."))) + (copy-file (string-append source subdir-name file) + (string-append out subdir-name file)))))) + (list libstring benchstring))))) + (delete 'configure)))) + (home-page "https://github.com/sasagawa888/eisl") + (synopsis "Implementation of ISLisp") + (description "Easy ISLISP (eisl) is an implementation of ISLisp which +includes a compiler as well as an interpreter.") + (license (list license:bsd-2 ;; documents/license.txt + license:expat ;; cii/LICENSE + license:gpl2+ ;; nana/gdb/test.c and others under nana/ + license:bsd-3 ;; bench/* +)))) -- 2.37.2