From debbugs-submit-bounces@debbugs.gnu.org Tue Sep 17 08:29:44 2019 Received: (at submit) by debbugs.gnu.org; 17 Sep 2019 12:29:44 +0000 Received: from localhost ([127.0.0.1]:51793 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1iACbx-0005rf-Vt for submit@debbugs.gnu.org; Tue, 17 Sep 2019 08:29:44 -0400 Received: from lists.gnu.org ([209.51.188.17]:59951) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1iACbr-0005rS-Hx for submit@debbugs.gnu.org; Tue, 17 Sep 2019 08:29:36 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:35922) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iACbp-0000Ta-FH for guix-patches@gnu.org; Tue, 17 Sep 2019 08:29:31 -0400 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on eggs.gnu.org X-Spam-Level: X-Spam-Status: No, score=0.8 required=5.0 tests=BAYES_50,URIBL_BLOCKED autolearn=disabled version=3.3.2 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iACbn-0000qb-S7 for guix-patches@gnu.org; Tue, 17 Sep 2019 08:29:29 -0400 Received: from zancanaro.com.au ([45.76.117.151]:43114) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1iACbn-0000Xf-5u for guix-patches@gnu.org; Tue, 17 Sep 2019 08:29:27 -0400 Received: by zancanaro.com.au (Postfix, from userid 116) id 843CA29DC3; Tue, 17 Sep 2019 12:29:19 +0000 (UTC) Received: from jolteon (210-1-202-160-cpe.spintel.net.au [210.1.202.160]) by zancanaro.com.au (Postfix) with ESMTPSA id C431D29DC1 for ; Tue, 17 Sep 2019 12:29:15 +0000 (UTC) User-agent: mu4e 1.2.0; emacs 26.3 From: Carlo Zancanaro To: guix-patches@gnu.org Subject: [PATCH] Add abcl. Date: Tue, 17 Sep 2019 22:29:14 +1000 Message-ID: <87sgovrtr9.fsf@zancanaro.id.au> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 45.76.117.151 X-Spam-Score: -1.4 (-) X-Debbugs-Envelope-To: submit X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -0.1 (/) --=-=-= Content-Type: text/plain; format=flowed Hey Guix! Here's another patch! This one adds a new Common Lisp implementation: ABCL on the JVM. When I added Kawa we ended up deciding to put it in its own package (in kawa.scm). I wasn't sure whether it was a good idea to do that for ABCL, too, so I just put it in java.scm for now. Feel free to move it to its own package (or ask me to do so) if you'd rather. It might even fit better in lisp.scm. Carlo --=-=-= Content-Type: text/x-diff; charset=utf-8 Content-Disposition: attachment; filename=0001-gnu-Add-abcl.patch Content-Transfer-Encoding: quoted-printable >From 34c731278669102b0449a4b0cad25274be0e07f2 Mon Sep 17 00:00:00 2001 From: Carlo Zancanaro Date: Tue, 17 Sep 2019 22:01:01 +1000 Subject: [PATCH] gnu: Add abcl. * gnu/packages/java.scm (abcl): New variable. * gnu/packages/patches/abcl-fix-build-xml.patch: New file. * gnu/local.mk (dist_patch_DATA): Add it. --- gnu/local.mk | 1 + gnu/packages/java.scm | 65 ++++++++++++++++++- gnu/packages/patches/abcl-fix-build-xml.patch | 37 +++++++++++ 3 files changed, 102 insertions(+), 1 deletion(-) create mode 100644 gnu/packages/patches/abcl-fix-build-xml.patch diff --git a/gnu/local.mk b/gnu/local.mk index 3f32b9cbf2..a0307b5e23 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -669,6 +669,7 @@ dist_patch_DATA =3D \ %D%/packages/patches/a2ps-CVE-2001-1593.patch \ %D%/packages/patches/a2ps-CVE-2014-0466.patch \ %D%/packages/patches/a2ps-CVE-2015-8107.patch \ + %D%/packages/patches/abcl-fix-build-xml.patch \ %D%/packages/patches/abiword-explictly-cast-bools.patch \ %D%/packages/patches/abiword-black-drawing-with-gtk322.patch \ %D%/packages/patches/acl-fix-perl-regex.patch \ diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm index 403c446a82..1999f31798 100644 --- a/gnu/packages/java.scm +++ b/gnu/packages/java.scm @@ -2,7 +2,7 @@ ;;; Copyright =C2=A9 2015, 2016, 2017, 2018, 2019 Ricardo Wurmus ;;; Copyright =C2=A9 2016 Leo Famulari ;;; Copyright =C2=A9 2016, 2017 Roel Janssen -;;; Copyright =C2=A9 2017 Carlo Zancanaro +;;; Copyright =C2=A9 2017, 2019 Carlo Zancanaro ;;; Copyright =C2=A9 2017, 2018 Julien Lepiller ;;; Copyright =C2=A9 2017 Thomas Danckaert ;;; Copyright =C2=A9 2016, 2017, 2018 Alex Vong @@ -11109,3 +11109,66 @@ network protocols, and core version control algori= thms.") `(("java-javaewah" ,java-javaewah) ("java-jsch" ,java-jsch) ("java-slf4j-api" ,java-slf4j-api))))) + +(define-public abcl + (package + (name "abcl") + (version "1.5.0") + (source + (origin + (method url-fetch) + (uri (string-append "https://abcl.org/releases/" + version "/abcl-src-" version ".tar.gz")) + (sha256 + (base32 + "1hhvcg050nfpjbdmskc1cv2j38qi6qfl77a61b5cxx576kbff3lj")) + (patches + (search-patches + "abcl-fix-build-xml.patch")))) + (build-system ant-build-system) + (native-inputs + `(("java-junit" ,java-junit))) + (arguments + `(#:build-target "abcl.jar" + #:test-target "abcl.test" + #:phases + (modify-phases %standard-phases + (replace 'install + (lambda* (#:key outputs #:allow-other-keys) + (let ((share (string-append (assoc-ref outputs "out") + "/share/java/")) + (bin (string-append (assoc-ref outputs "out") + "/bin/"))) + (mkdir-p share) + (install-file "dist/abcl.jar" share) + (install-file "dist/abcl-contrib.jar" share) + (mkdir-p bin) + (with-output-to-file (string-append bin "abcl") + (lambda _ + (let ((classpath (string-append + share "abcl.jar" + ":" + share "abcl-contrib.jar"))) + (display (string-append + "#!" (which "sh") "\n" + "if [[ -z $CLASSPATH ]]; then\n" + " cp=3D\"" classpath "\"\n" + "else\n" + " cp=3D\"" classpath ":$CLASSPATH\"\n" + "fi\n" + "exec " (which "java") " -cp $cp org.armedb= ear.lisp.Main $@\n"))))) + (chmod (string-append bin "abcl") #o755) + #t)))))) + (home-page "https://abcl.org/") + (synopsis "Common Lisp Implementation on the JVM") + (description + "@dfn{Armed Bear Common Lisp} (ABCL) is a full implementation of the = Common +Lisp language featuring both an interpreter and a compiler, running in the +JVM. It supports JSR-223 (Java scripting API): it can be a scripting engi= ne +in any Java application. Additionally, it can be used to implement (parts= of) +the application using Java to Lisp integration APIs.") + (license (list license:gpl2+ + ;; named-readtables is released under 3 clause BSD + license:bsd-3 + ;; jfli is released under CPL 1.0 + license:cpl1.0)))) diff --git a/gnu/packages/patches/abcl-fix-build-xml.patch b/gnu/packages/p= atches/abcl-fix-build-xml.patch new file mode 100644 index 0000000000..0c21491b74 --- /dev/null +++ b/gnu/packages/patches/abcl-fix-build-xml.patch @@ -0,0 +1,37 @@ +ABCL's build calls the hostname command, and needs the internet to download +JUnit. Neither of these are really required, though, so we can patch them = out +to make it build. + +--- a/build.xml ++++ b/build2.xml +@@ -327,7 +327,7 @@ from ${abcl.home.dir} + + ++ depends=3D"abcl.compile,abcl.stamp.version"> + + +@@ -455,11 +455,6 @@ from ${abcl.home.dir} + value=3D"${abcl.version}-${abcl.version.src}"/> + +=20 +- +- +- abcl.hostname: ${abcl.hostname} +- +- + + + +@@ -1019,8 +1014,7 @@ ${basedir}/../cl-bench + + +=20=20=20=20=20=20=20=20=20 +- ++ + + ) id 1iADtY-0003W2-MS for submit@debbugs.gnu.org; Tue, 17 Sep 2019 09:51:59 -0400 Received: from lists.gnu.org ([209.51.188.17]:50822) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1iADtR-0003Vp-Hw for submit@debbugs.gnu.org; Tue, 17 Sep 2019 09:51:51 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:47936) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iADtP-0003Af-FB for guix-patches@gnu.org; Tue, 17 Sep 2019 09:51:45 -0400 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on eggs.gnu.org X-Spam-Level: X-Spam-Status: No, score=0.8 required=5.0 tests=BAYES_50,URIBL_BLOCKED autolearn=disabled version=3.3.2 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iADtN-0004HE-Qv for guix-patches@gnu.org; Tue, 17 Sep 2019 09:51:43 -0400 Received: from zancanaro.com.au ([45.76.117.151]:33582) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1iADtN-0004Fx-4g for guix-patches@gnu.org; Tue, 17 Sep 2019 09:51:41 -0400 Received: by zancanaro.com.au (Postfix, from userid 116) id 8FD3629DCE; Tue, 17 Sep 2019 13:51:37 +0000 (UTC) Received: from jolteon (210-1-202-160-cpe.spintel.net.au [210.1.202.160]) by zancanaro.com.au (Postfix) with ESMTPSA id 189CD29DCC for ; Tue, 17 Sep 2019 13:51:34 +0000 (UTC) References: <87sgovrtr9.fsf@zancanaro.id.au> User-agent: mu4e 1.2.0; emacs 26.3 From: Carlo Zancanaro To: guix-patches@gnu.org Subject: Re: [PATCH] Add abcl. In-reply-to: <87sgovrtr9.fsf@zancanaro.id.au> Date: Tue, 17 Sep 2019 23:51:33 +1000 Message-ID: <87r24frpy2.fsf@zancanaro.id.au> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 45.76.117.151 X-Spam-Score: 0.9 (/) X-Debbugs-Envelope-To: submit X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -0.1 (/) --=-=-= Content-Type: text/plain; format=flowed On Tue, Sep 17 2019, Carlo Zancanaro wrote: > Here's another patch! ... Soon after sending the patch I realised that I hadn't run it with --check. It turns out it wasn't reproducible, so I've attached an updated patch that fixes that, and the long line warning from 'guix lint'. Carlo --=-=-= Content-Type: text/x-diff; charset=utf-8 Content-Disposition: attachment; filename=0001-gnu-Add-abcl.patch Content-Transfer-Encoding: quoted-printable >From 0e35319f9df5e91bc6fb07224122109508a85244 Mon Sep 17 00:00:00 2001 From: Carlo Zancanaro Date: Tue, 17 Sep 2019 22:01:01 +1000 Subject: [PATCH] gnu: Add abcl. * gnu/packages/java.scm (abcl): New variable. * gnu/packages/patches/abcl-fix-build-xml.patch: New file. * gnu/local.mk (dist_patch_DATA): Add it. --- gnu/local.mk | 1 + gnu/packages/java.scm | 66 ++++++++++++++++++- gnu/packages/patches/abcl-fix-build-xml.patch | 50 ++++++++++++++ 3 files changed, 116 insertions(+), 1 deletion(-) create mode 100644 gnu/packages/patches/abcl-fix-build-xml.patch diff --git a/gnu/local.mk b/gnu/local.mk index 3f32b9cbf2..a0307b5e23 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -669,6 +669,7 @@ dist_patch_DATA =3D \ %D%/packages/patches/a2ps-CVE-2001-1593.patch \ %D%/packages/patches/a2ps-CVE-2014-0466.patch \ %D%/packages/patches/a2ps-CVE-2015-8107.patch \ + %D%/packages/patches/abcl-fix-build-xml.patch \ %D%/packages/patches/abiword-explictly-cast-bools.patch \ %D%/packages/patches/abiword-black-drawing-with-gtk322.patch \ %D%/packages/patches/acl-fix-perl-regex.patch \ diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm index 403c446a82..6090dcd514 100644 --- a/gnu/packages/java.scm +++ b/gnu/packages/java.scm @@ -2,7 +2,7 @@ ;;; Copyright =C2=A9 2015, 2016, 2017, 2018, 2019 Ricardo Wurmus ;;; Copyright =C2=A9 2016 Leo Famulari ;;; Copyright =C2=A9 2016, 2017 Roel Janssen -;;; Copyright =C2=A9 2017 Carlo Zancanaro +;;; Copyright =C2=A9 2017, 2019 Carlo Zancanaro ;;; Copyright =C2=A9 2017, 2018 Julien Lepiller ;;; Copyright =C2=A9 2017 Thomas Danckaert ;;; Copyright =C2=A9 2016, 2017, 2018 Alex Vong @@ -11109,3 +11109,67 @@ network protocols, and core version control algori= thms.") `(("java-javaewah" ,java-javaewah) ("java-jsch" ,java-jsch) ("java-slf4j-api" ,java-slf4j-api))))) + +(define-public abcl + (package + (name "abcl") + (version "1.5.0") + (source + (origin + (method url-fetch) + (uri (string-append "https://abcl.org/releases/" + version "/abcl-src-" version ".tar.gz")) + (sha256 + (base32 + "1hhvcg050nfpjbdmskc1cv2j38qi6qfl77a61b5cxx576kbff3lj")) + (patches + (search-patches + "abcl-fix-build-xml.patch")))) + (build-system ant-build-system) + (native-inputs + `(("java-junit" ,java-junit))) + (arguments + `(#:build-target "abcl.jar" + #:test-target "abcl.test" + #:phases + (modify-phases %standard-phases + (replace 'install + (lambda* (#:key outputs #:allow-other-keys) + (let ((share (string-append (assoc-ref outputs "out") + "/share/java/")) + (bin (string-append (assoc-ref outputs "out") + "/bin/"))) + (mkdir-p share) + (install-file "dist/abcl.jar" share) + (install-file "dist/abcl-contrib.jar" share) + (mkdir-p bin) + (with-output-to-file (string-append bin "abcl") + (lambda _ + (let ((classpath (string-append + share "abcl.jar" + ":" + share "abcl-contrib.jar"))) + (display (string-append + "#!" (which "sh") "\n" + "if [[ -z $CLASSPATH ]]; then\n" + " cp=3D\"" classpath "\"\n" + "else\n" + " cp=3D\"" classpath ":$CLASSPATH\"\n" + "fi\n" + "exec " (which "java") + " -cp $cp org.armedbear.lisp.Main $@\n"))))) + (chmod (string-append bin "abcl") #o755) + #t)))))) + (home-page "https://abcl.org/") + (synopsis "Common Lisp Implementation on the JVM") + (description + "@dfn{Armed Bear Common Lisp} (ABCL) is a full implementation of the = Common +Lisp language featuring both an interpreter and a compiler, running in the +JVM. It supports JSR-223 (Java scripting API): it can be a scripting engi= ne +in any Java application. Additionally, it can be used to implement (parts= of) +the application using Java to Lisp integration APIs.") + (license (list license:gpl2+ + ;; named-readtables is released under 3 clause BSD + license:bsd-3 + ;; jfli is released under CPL 1.0 + license:cpl1.0)))) diff --git a/gnu/packages/patches/abcl-fix-build-xml.patch b/gnu/packages/p= atches/abcl-fix-build-xml.patch new file mode 100644 index 0000000000..dd315b4271 --- /dev/null +++ b/gnu/packages/patches/abcl-fix-build-xml.patch @@ -0,0 +1,50 @@ +ABCL's build calls the hostname command, and needs the internet to download +JUnit. Neither of these are really required, though, so we can patch them = out +to make it build. + +We also remove the Implemetation-Build property that ends up in the manife= st +file, because it stores information about the time of the build, which mak= es +it non-deterministic. + +--- a/build.xml ++++ b/build.xml +@@ -327,7 +327,7 @@ from ${abcl.home.dir} + + ++ depends=3D"abcl.compile,abcl.stamp.version"> + + +@@ -455,11 +455,6 @@ from ${abcl.home.dir} + value=3D"${abcl.version}-${abcl.version.src}"/> + +=20 +- +- +- abcl.hostname: ${abcl.hostname} +- +- + + + +@@ -500,8 +495,6 @@ from ${abcl.home.dir} + value=3D"ABCL"/> + +- + + + =20 +@@ -1019,8 +1012,7 @@ ${basedir}/../cl-bench + + +=20=20=20=20=20=20=20=20=20 +- ++ + + ) id 1iFEN6-00085c-2Z for submit@debbugs.gnu.org; Tue, 01 Oct 2019 05:23:05 -0400 Received: from hera.aquilenet.fr ([185.233.100.1]:49016) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1iFEN3-00084w-CO for 37439-done@debbugs.gnu.org; Tue, 01 Oct 2019 05:23:01 -0400 Received: from localhost (localhost [127.0.0.1]) by hera.aquilenet.fr (Postfix) with ESMTP id 805AEAB2AE; Tue, 1 Oct 2019 11:22:59 +0200 (CEST) X-Virus-Scanned: Debian amavisd-new at aquilenet.fr Received: from hera.aquilenet.fr ([127.0.0.1]) by localhost (hera.aquilenet.fr [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id SElj-wpxiZ-9; Tue, 1 Oct 2019 11:22:58 +0200 (CEST) Received: from ribbon (unknown [IPv6:2001:660:6102:320:e120:2c8f:8909:cdfe]) by hera.aquilenet.fr (Postfix) with ESMTPSA id 38026AB23E; Tue, 1 Oct 2019 11:22:58 +0200 (CEST) From: =?utf-8?Q?Ludovic_Court=C3=A8s?= To: Carlo Zancanaro Subject: Re: [bug#37439] [PATCH] Add abcl. References: <87sgovrtr9.fsf@zancanaro.id.au> <87r24frpy2.fsf@zancanaro.id.au> Date: Tue, 01 Oct 2019 11:22:57 +0200 In-Reply-To: <87r24frpy2.fsf@zancanaro.id.au> (Carlo Zancanaro's message of "Tue, 17 Sep 2019 23:51:33 +1000") Message-ID: <87y2y4rf9q.fsf@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/26.3 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: 1.0 (+) X-Debbugs-Envelope-To: 37439-done Cc: 37439-done@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -0.0 (/) Hi Carlo, Carlo Zancanaro skribis: >>>From 0e35319f9df5e91bc6fb07224122109508a85244 Mon Sep 17 00:00:00 2001 > From: Carlo Zancanaro > Date: Tue, 17 Sep 2019 22:01:01 +1000 > Subject: [PATCH] gnu: Add abcl. > > * gnu/packages/java.scm (abcl): New variable. > * gnu/packages/patches/abcl-fix-build-xml.patch: New file. > * gnu/local.mk (dist_patch_DATA): Add it. Pushed, thanks! Ludo=E2=80=99. From unknown Sat Jun 14 03:47:53 2025 Received: (at fakecontrol) by fakecontrolmessage; To: internal_control@debbugs.gnu.org From: Debbugs Internal Request Subject: Internal Control Message-Id: bug archived. Date: Tue, 29 Oct 2019 11:24:05 +0000 User-Agent: Fakemail v42.6.9 # This is a fake control message. # # The action: # bug archived. thanks # This fakemail brought to you by your local debbugs # administrator