From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:37111) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fLXNp-00017q-Pd for guix-patches@gnu.org; Wed, 23 May 2018 13:17:06 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fLXNm-00081F-KP for guix-patches@gnu.org; Wed, 23 May 2018 13:17:05 -0400 Received: from debbugs.gnu.org ([208.118.235.43]:37690) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1fLXNm-000819-Ft for guix-patches@gnu.org; Wed, 23 May 2018 13:17:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1fLXNl-0005Wd-Vg for guix-patches@gnu.org; Wed, 23 May 2018 13:17:02 -0400 Subject: [bug#31570] [PATCH 1/2] gnu: javacc: 'javacc' now inherits from 'javacc-4'. References: <871se2jnya.fsf@gmail.com> In-Reply-To: <871se2jnya.fsf@gmail.com> Resent-Message-ID: From: Alex Vong Date: Thu, 24 May 2018 01:16:33 +0800 Message-ID: <87wovui972.fsf@gmail.com> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="==-=-="; micalg=pgp-sha256; protocol="application/pgp-signature" List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+kyle=kyleam.com@gnu.org Sender: "Guix-patches" To: 31570@debbugs.gnu.org Cc: alexvong1995@gmail.com --==-=-= Content-Type: multipart/mixed; boundary="=-=-=" --=-=-= Content-Type: text/x-diff Content-Disposition: inline; filename=0001-gnu-javacc-javacc-now-inherits-from-javacc-4.patch Content-Transfer-Encoding: quoted-printable From=20f9a32516aab9aca1b8797e685623ac8cfb188535 Mon Sep 17 00:00:00 2001 From: Alex Vong Date: Thu, 24 May 2018 00:21:49 +0800 Subject: [PATCH 1/2] gnu: javacc: 'javacc' now inherits from 'javacc-4'. * gnu/packages/java.scm (javacc, javacc-4): 'javacc' now inherits from 'javacc-4' instead of the opposite around. =2D-- gnu/packages/java.scm | 47 ++++++++++++++++++++++--------------------- 1 file changed, 24 insertions(+), 23 deletions(-) diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm index 90fd07c59..c64313046 100644 =2D-- a/gnu/packages/java.scm +++ b/gnu/packages/java.scm @@ -1861,27 +1861,31 @@ designs.") license:asl2.0 license:cpl1.0))))) =20 =2D(define-public javacc +(define-public javacc-4 (package (name "javacc") =2D (version "7.0.3") + (version "4.1") (source (origin =2D (method url-fetch) =2D (uri (string-append "https://github.com/javacc/javacc/" =2D "archive/" version ".tar.gz")) =2D (file-name (string-append "javacc-" version ".tar.gz")) + (method git-fetch) + (uri (git-reference + (url "https://github.com/javacc/javacc.git") + (commit "release_41"))) + (file-name (string-append "javacc-" version "-checkout")) (sha256 (base32 =2D "111xc9mnmc5a6qz6x3xbhqc07y1lg2b996ggzw0hrblg42zya9xf"))= )) + "07ysav7j8r1c6h8qxrgqk6lwdp74ly0ad1935lragxml0qqc3ka0")))) (build-system ant-build-system) + ;; Tests fail with + ;; /tmp/guix-build-javacc-4.1.drv-0/source/test/javacodeLA/build.xml:6= 0: + ;; JAVACODE failed (arguments =2D `(#:test-target "test" + `(#:tests? #f #:phases (modify-phases %standard-phases (add-after 'unpack 'delete-bundled-libs (lambda _ (delete-file-recursively "lib") #t)) =2D (replace 'install (install-jars "target"))))) + (replace 'install (install-jars "bin/lib"))))) (home-page "https://javacc.org/") (synopsis "Java parser generator") (description "Java Compiler Compiler (JavaCC) is the most popular pars= er @@ -1893,29 +1897,26 @@ as tree building (via a tool called JJTree included= with JavaCC), actions, debugging, etc.") (license license:bsd-3))) =20 =2D(define-public javacc-4 =2D (package (inherit javacc) =2D (version "4.1") +(define-public javacc + (package + (inherit javacc-4) + (version "7.0.3") (source (origin =2D (method git-fetch) =2D (uri (git-reference =2D (url "https://github.com/javacc/javacc.git") =2D (commit "release_41"))) =2D (file-name (string-append "javacc-" version "-checkout")) + (method url-fetch) + (uri (string-append "https://github.com/javacc/javacc/" + "archive/" version ".tar.gz")) + (file-name (string-append "javacc-" version ".tar.gz")) (sha256 (base32 =2D "07ysav7j8r1c6h8qxrgqk6lwdp74ly0ad1935lragxml0qqc3ka0"))= )) =2D ;; Tests fail with =2D ;; /tmp/guix-build-javacc-4.1.drv-0/source/test/javacodeLA/build.xml= :60: =2D ;; JAVACODE failed + "111xc9mnmc5a6qz6x3xbhqc07y1lg2b996ggzw0hrblg42zya9xf")))) (arguments =2D `(#:tests? #f + `(#:test-target "test" #:phases (modify-phases %standard-phases (add-after 'unpack 'delete-bundled-libs (lambda _ (delete-file-recursively "lib") #t)) =2D (replace 'install (install-jars "bin/lib"))))))) + (replace 'install (install-jars "target"))))))) =20 ;; This is the last 3.x release of ECJ (define-public java-ecj-3 =2D-=20 2.17.0 --=-=-=-- --==-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iHUEARYIAB0WIQTdXC2pN4kXBjiMDs8cGaIXrbrArQUCWwWh8QAKCRAcGaIXrbrA rUmwAQC8h9Dny0QGEnqRj4W/tQmTrrRup+G1keOrtm6p0E6ISAD/cmBjUyl7kFay aqZYHE/85uXP+yp89LxAfy/mqPq+tQ0= =5mJu -----END PGP SIGNATURE----- --==-=-=--