From patchwork Sat Oct 15 21:39:21 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Julien Lepiller X-Patchwork-Id: 43432 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 8CA7B27BBEA; Sat, 15 Oct 2022 22:40:41 +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=-3.7 required=5.0 tests=BAYES_00,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 5266027BBE9 for ; Sat, 15 Oct 2022 22:40:41 +0100 (BST) Received: from localhost ([::1]:50730 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ojotc-0003m0-Gf for patchwork@mira.cbaines.net; Sat, 15 Oct 2022 17:40:40 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:38288) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ojot1-0003hO-N2 for guix-patches@gnu.org; Sat, 15 Oct 2022 17:40:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:43661) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1ojot1-0004vF-FA for guix-patches@gnu.org; Sat, 15 Oct 2022 17:40:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1ojot1-0008KS-9B for guix-patches@gnu.org; Sat, 15 Oct 2022 17:40:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#58553] [PATCH 3/7] gnu: Add java-asm-3. Resent-From: Julien Lepiller Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 15 Oct 2022 21:40:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 58553 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 58553@debbugs.gnu.org Received: via spool by 58553-submit@debbugs.gnu.org id=B58553.166586998631940 (code B ref 58553); Sat, 15 Oct 2022 21:40:03 +0000 Received: (at 58553) by debbugs.gnu.org; 15 Oct 2022 21:39:46 +0000 Received: from localhost ([127.0.0.1]:42728 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ojosj-0008It-KH for submit@debbugs.gnu.org; Sat, 15 Oct 2022 17:39:46 -0400 Received: from lepiller.eu ([89.234.186.109]:40376) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ojosg-0008I5-92 for 58553@debbugs.gnu.org; Sat, 15 Oct 2022 17:39:44 -0400 Received: from lepiller.eu (localhost [127.0.0.1]) by lepiller.eu (OpenSMTPD) with ESMTP id 9046b8b1 for <58553@debbugs.gnu.org>; Sat, 15 Oct 2022 21:39:37 +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=GxVW+jN86Tu7qzIjmf0vqAMCa yjpxLXSYnY/rEGF3DE=; b=SqYToUQ3SURMuXnYVw0tBBK0V0fUBearGvdwjWCSW 4fNqOIepIAaIifyJtnq4CQu3V17irE9bEMP2bE/szmhskGAkN/9B1MSgbqk+4mfQ 28KbyOwjfWE+r2FRBmxxmGGRYDfar+guAah5XWi4ZMetGDMB2KQ/HcZMA6tDupEM Q3aWfgOpNi/n0Iu1wR0EDM9CegRXmLVbinAcCC2L6Z9+n0gpyAhTohwqzWUZw4Dy gsXJp6c4GJm/txWuXl/V6wK2pUqjrz1gmK5jOylk9fGrMI7a/EvyZpVs/hdNRyzX Pla0iRp7R3kX5qI8RqIz7G69LPejaKaUJH0gu5vEOwLDQ== Received: by lepiller.eu (OpenSMTPD) with ESMTPSA id e58a5060 (TLSv1.3:AEAD-AES256-GCM-SHA384:256:NO) for <58553@debbugs.gnu.org>; Sat, 15 Oct 2022 21:39:36 +0000 (UTC) From: Julien Lepiller Date: Sat, 15 Oct 2022 23:39:21 +0200 Message-Id: <20221015213925.6447-3-julien@lepiller.eu> X-Mailer: git-send-email 2.38.0 In-Reply-To: <20221015213925.6447-1-julien@lepiller.eu> References: <20221015233630.4da3d935@sybil.lepiller.eu> <20221015213925.6447-1-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" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/java.scm (java-asm): New variable. --- gnu/packages/java.scm | 26 +++++++++++++++++++++++++- 1 file changed, 25 insertions(+), 1 deletion(-) diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm index 3ab324cce9..a433281ce3 100644 --- a/gnu/packages/java.scm +++ b/gnu/packages/java.scm @@ -5296,6 +5296,29 @@ (define java-asm-bootstrap ((#:tests? _) #f))) (native-inputs `()))) +(define-public java-asm-3 + (package + (inherit java-asm) + (version "3.1") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://gitlab.ow2.org/asm/asm") + (commit "ASM_3_1"))) + (file-name (git-file-name "java-asm" version)) + (sha256 + (base32 + "0xbyf2sl8j6mrvfpg2da0vjdp906rac62l66gkk82x5cn3vc30h4")))) + (arguments + `(#:build-target "jar" + #:test-target "test" + #:phases + (modify-phases %standard-phases + (replace 'install (install-jars "output/dist")) + (delete 'generate-jar-indices)))) + (native-inputs + `(("java-junit" ,java-junit))))) + (define-public java-asm-8 (package (inherit java-asm) @@ -6778,6 +6801,7 @@ (define-public java-commons-compress (build-system ant-build-system) (arguments `(#:jar-name "commons-compress.jar" + #:source-dir "src/main/java" #:phases (modify-phases %standard-phases (add-after 'unpack 'delete-bad-tests @@ -6798,7 +6822,7 @@ (define-public java-commons-compress #t)) (replace 'install (install-from-pom "pom.xml"))))) (propagated-inputs - (list java-xz apache-commons-parent-pom-41)) + (list java-asm-3 java-brotli java-xz java-zstd apache-commons-parent-pom-52)) (native-inputs (list java-junit java-mockito-1)) (home-page "https://commons.apache.org/proper/commons-compress/")