From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp10.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms5.migadu.com with LMTPS id 8HIrOgBrDmMdIQAAbAwnHQ (envelope-from ) for ; Tue, 30 Aug 2022 21:54:41 +0200 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp10.migadu.com with LMTPS id mAk+OQBrDmPUZAEAG6o9tA (envelope-from ) for ; Tue, 30 Aug 2022 21:54:40 +0200 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 8C177BB3 for ; Tue, 30 Aug 2022 21:54:40 +0200 (CEST) Received: from localhost ([::1]:40302 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oT7Jn-0002lG-Q9 for larch@yhetil.org; Tue, 30 Aug 2022 15:54:39 -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 Content-Type: multipart/mixed; boundary="=-=-=" 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+larch=yhetil.org@gnu.org Sender: "Guix-patches" X-Migadu-Flow: FLOW_IN X-Migadu-To: larch@yhetil.org X-Migadu-Country: US ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1661889280; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type:resent-cc:resent-from:resent-sender: resent-message-id:in-reply-to:in-reply-to:references:references: list-id:list-help:list-unsubscribe:list-subscribe:list-post: dkim-signature; bh=K3o50RrMpqLXa8bIlk/P8FVof1lXMOoimGoAms3Ibi0=; b=NEFoDl7cuoIA3okDP/2NDhreNqD+H3314QIh35Jzq3zRdTFFQ7pKvv1gzPGCV/1FCPpds2 Anw/7jM236iHT/fBAvsONeCsba8SiyV/A3pPuK9hckbsZdXJHG8BgJiQ7dl4fvzFZ0DnP7 U0u57J1gphMrZhTJSTBywzzmUQOxXzmELhgZUVkRAX2Fy/GDKqqw2qA03H3foqbK6fG7Iv 4F7sJwUNYqP2CVtZsTmoigMDokV8yRXsCLZWggIfrOpqPrxsKbf2Rh/iAuSZiqfi0v5Sqw ClfbY9C9BN5OX06rSZq41MrpFuudEylUWJEdjWyT1HkndzQUD5WGry/ZkisOtQ== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1661889280; a=rsa-sha256; cv=none; b=iCeJaY6K2Phk+pi0jDvbhticQ4l6yqwKPhCAuWE3/tPyVWEVhHsrDSS65S1/Xim9FlMMya gt30QaRmfvrje/2qw46IsF24htI0g40j2P/QHvI/jk9LvqsjCQbxzI0mCMaDWr2DVlbdoi iTpRsBHs/scjTw7l8oYqS7A8pW0eeg0EtpPa3oMfLG03r6PRBKwKZI6PG/uEJ6IfiNJkGZ GH2gJUwDV2BaJWmAh5w6FoyBMSCOnTW92ZauCMTUaerXD+CsqPcBbeXitgwSxMgJCwbViK v0xTvUqDSQHHSYvno6dM1uPfTyDwIKaxijuKv03PgCjquf5KiXTulVPWxiN4tw== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=posteo.net header.s=2017 header.b=fjmTk9TE; dmarc=fail reason="SPF not aligned (strict)" header.from=posteo.net (policy=none); spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" X-Migadu-Spam-Score: 6.01 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=posteo.net header.s=2017 header.b=fjmTk9TE; dmarc=fail reason="SPF not aligned (strict)" header.from=posteo.net (policy=none); spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" X-Migadu-Queue-Id: 8C177BB3 X-Spam-Score: 6.01 X-Migadu-Scanner: scn1.migadu.com X-TUID: X2/kiwTbv5Yp --=-=-= Content-Type: text/plain 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 --=-=-= Content-Type: text/x-patch; charset=utf-8 Content-Disposition: inline; filename=0001-gnu-Add-eisl.patch Content-Transfer-Encoding: quoted-printable Content-Description: patch >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 =C2=A9 2021 Paul A. Patience ;;; Copyright =C2=A9 2021 Charles Jackson ;;; Copyright =C2=A9 2021 jgart +;;; Copyright =C2=A9 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.buil= d.") (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 "0qrmy6myyac38q3kf26axmxpmq9srhc6qy0ykfcsng50jzcdg1= mn")))) + (build-system gnu-build-system) + (inputs + (list ncurses)) + (native-inputs + (list cppcheck)) + (arguments + `(#:make-flags + (list (string-append "PREFIX=3D" (assoc-ref %outputs "out")) + (string-append "CC=3D" ,(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 subd= ir-name)))) + (do ((file (readdir sourcedir) (readdir sourcedir)= )) + ((eof-object? file)) + (when (not (member file '("." ".."))) + (copy-file (string-append source subdir-name f= ile) + (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/* +)))) --=20 2.37.2 --=-=-=--