From patchwork Sat Feb 25 20:30:26 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Julien Lepiller X-Patchwork-Id: 47340 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 B7CB816BA5; Sat, 25 Feb 2023 20:31:34 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-1.8 required=5.0 tests=DKIM_INVALID,DKIM_SIGNED, MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,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 B2B0A1684B for ; Sat, 25 Feb 2023 20:31:33 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pW1CG-0005bE-TC; Sat, 25 Feb 2023 15:31:08 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pW1CD-0005Z2-7I for guix-patches@gnu.org; Sat, 25 Feb 2023 15:31:07 -0500 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pW1CB-0000ua-Es for guix-patches@gnu.org; Sat, 25 Feb 2023 15:31:04 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pW1CB-0004Pr-AH for guix-patches@gnu.org; Sat, 25 Feb 2023 15:31:03 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#61794] [PATCH 02/18] gnu: java-bsh: Update to 2.1.1. Resent-From: Julien Lepiller Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 25 Feb 2023 20:31:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 61794 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 61794@debbugs.gnu.org Received: via spool by 61794-submit@debbugs.gnu.org id=B61794.167735706216960 (code B ref 61794); Sat, 25 Feb 2023 20:31:03 +0000 Received: (at 61794) by debbugs.gnu.org; 25 Feb 2023 20:31:02 +0000 Received: from localhost ([127.0.0.1]:41646 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pW1C9-0004PO-Vc for submit@debbugs.gnu.org; Sat, 25 Feb 2023 15:31:02 -0500 Received: from lepiller.eu ([89.234.186.109]:49662) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pW1C4-0004OQ-A3 for 61794@debbugs.gnu.org; Sat, 25 Feb 2023 15:30:56 -0500 Received: from lepiller.eu (localhost [127.0.0.1]) by lepiller.eu (OpenSMTPD) with ESMTP id 812d2b31 for <61794@debbugs.gnu.org>; Sat, 25 Feb 2023 20:30:54 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed; d=lepiller.eu; h=from:to :subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; s=dkim; bh=6sKc9ifZhzosQn7eeMyGf+mDp tIaIAnecwpidJ/TO1Y=; b=OCu5iHZjkVRtVuXqByhtQe0dqSDvpffu1jKJscPi2 duFxLIQZf9ROuvU9LIaCIO20HWXo9TOWI13ILdBPNZPaWRkquBVj6PJqEI2nZwrK idtCexipk+Cl3v0kU7xkajhg9EyIMEiiJ6kqeAwd4TQ46DkVeSag8AtutfZn0vsp UwWoaVR2Q8O7TprjVytUu9VI23v45bNa4I1nA5zyU2kigwyb5/uj2nvTcGUvr79b 0usiqr0SMSxaMmjVhButo+uyJ26Geu2HFha/EYwo86XigErdwi8udH58/JDxL2za qFnYuNacEWoSxuU1PCrpMUcDIkgvAaaaD/d/YbDRv04ng== Received: by lepiller.eu (OpenSMTPD) with ESMTPSA id 01428acf (TLSv1.3:TLS_AES_256_GCM_SHA384:256:NO) for <61794@debbugs.gnu.org>; Sat, 25 Feb 2023 20:30:53 +0000 (UTC) From: Julien Lepiller Date: Sat, 25 Feb 2023 21:30:26 +0100 Message-Id: X-Mailer: git-send-email 2.38.1 In-Reply-To: <8c21fa41d1a4bc4665a074eee3b960a99455459e.1677357041.git.julien@lepiller.eu> References: <8c21fa41d1a4bc4665a074eee3b960a99455459e.1677357041.git.julien@lepiller.eu> 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-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/java.scm (java-bsh): Update to 2.1.1. --- gnu/packages/java.scm | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm index 3ffc6b53dc..0fb46ce465 100644 --- a/gnu/packages/java.scm +++ b/gnu/packages/java.scm @@ -10229,7 +10229,7 @@ (define-public java-jcommander (define-public java-bsh (package (name "java-bsh") - (version "2.0b6") + (version "2.1.1") (source (origin (method git-fetch) (uri (git-reference @@ -10238,7 +10238,7 @@ (define-public java-bsh (file-name (git-file-name name version)) (sha256 (base32 - "0kz3f0xjack6c9syssi4qjw1rbd3q5963sk5pmr143hiibxa9csw")) + "1a6y46yz2ba4mnlfv4bpd5pmzhgxrzk3s10xp05jz377nbp2izwg")) (modules '((guix build utils))) (snippet '(begin @@ -10254,6 +10254,10 @@ (define-public java-bsh #:make-flags (list "-DDATE" "(no date for reproducibility)") #:phases (modify-phases %standard-phases + (add-before 'check 'fix-test + (lambda _ + (substitute* "tests/junitTests/src/bsh/Issue_55_Test.java" + ((" BshScriptEngineFactory") " bsh.engine.BshScriptEngineFactory")))) (replace 'install (install-from-pom "pom.xml"))))) (inputs