From patchwork Fri Apr 16 01:23:42 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Mike Gerwitz X-Patchwork-Id: 28582 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 53A1527BC77; Fri, 16 Apr 2021 02:28:56 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.9 required=5.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL,SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id BE6E427BC76 for ; Fri, 16 Apr 2021 02:28:55 +0100 (BST) Received: from localhost ([::1]:44530 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lXDHz-0006ai-0y for patchwork@mira.cbaines.net; Thu, 15 Apr 2021 21:28:55 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:51902) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lXDGM-0005tK-3w for guix-patches@gnu.org; Thu, 15 Apr 2021 21:27:14 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:56334) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lXDGB-0003Ir-4I for guix-patches@gnu.org; Thu, 15 Apr 2021 21:27:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lXDGB-0008Rd-1Z for guix-patches@gnu.org; Thu, 15 Apr 2021 21:27:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#47789] [PATCH 1/6] gnu: Add java-gson-2.8.6. Resent-From: Mike Gerwitz Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 16 Apr 2021 01:27:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 47789 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 47789@debbugs.gnu.org Received: via spool by 47789-submit@debbugs.gnu.org id=B47789.161853639132362 (code B ref 47789); Fri, 16 Apr 2021 01:27:02 +0000 Received: (at 47789) by debbugs.gnu.org; 16 Apr 2021 01:26:31 +0000 Received: from localhost ([127.0.0.1]:39635 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lXDFe-0008Pu-TL for submit@debbugs.gnu.org; Thu, 15 Apr 2021 21:26:31 -0400 Received: from eggs.gnu.org ([209.51.188.92]:39012) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lXDFb-0008PF-Ct for 47789@debbugs.gnu.org; Thu, 15 Apr 2021 21:26:27 -0400 Received: from fencepost.gnu.org ([2001:470:142:3::e]:47747) by eggs.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lXDFW-00030I-6B for 47789@debbugs.gnu.org; Thu, 15 Apr 2021 21:26:22 -0400 Received: from localhost ([::1]:39222 helo=mikegerwitz-pc) by fencepost.gnu.org with esmtps (TLS1.2:RSA_AES_256_CBC_SHA1:256) (Exim 4.82) (envelope-from ) id 1lXDFS-0000Zy-IF for 47789@debbugs.gnu.org; Thu, 15 Apr 2021 21:26:21 -0400 From: Mike Gerwitz In-Reply-To: Date: Thu, 15 Apr 2021 21:23:42 -0400 References: User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/27.1 (gnu/linux) X-From-Line: 3f7bbd67919d869d70b267f8fd8d8edb90d59b65 Mon Sep 17 00:00:00 2001 Message-Id: <3f7bbd67919d869d70b267f8fd8d8edb90d59b65.1618536137.git.mtg@gnu.org> 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 This introduces a new package rather than upgrading the exist java-gson package because it is built using OpenJDK11; I didn't want to have to propagate that JDK dependency to the other packages that use it. OpenJDK 11 was chosen becuase this dependency was introduced for tla2tools. * gnu/packages/java.scm (java-gson-2.8.6): New variable. --- gnu/packages/java.scm | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm index 207f136513..62f684a74c 100644 --- a/gnu/packages/java.scm +++ b/gnu/packages/java.scm @@ -15,6 +15,7 @@ ;;; Copyright © 2020 Raghav Gururajan ;;; Copyright © 2020 Maxim Cournoyer ;;; Copyright © 2021 Vincent Legoll +;;; Copyright © 2021 Mike Gerwitz ;;; ;;; This file is part of GNU Guix. ;;; @@ -11724,6 +11725,37 @@ string to an equivalent Java object. Gson can work with arbitrary Java objects including pre-existing objects that you do not have source-code of.") (license license:asl2.0))) +;; This requires a different Java version than 2.8.2 above +(define-public java-gson-2.8.6 + (package + (inherit java-gson) + (name "java-gson") + (version "2.8.6") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/google/gson") + (commit (string-append "gson-parent-" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0kk5p3vichdb0ph1lzknrcpbklgnmq455mngmjpxvvj29p3rgpk3")))) + (arguments + `(#:jar-name "gson.jar" + #:jdk ,openjdk11 + #:source-dir "gson/src/main/java" + #:test-dir "gson/src/test" + #:phases + (modify-phases %standard-phases + ;; avoid Maven dependency + (add-before 'build 'fill-template + (lambda _ + (with-directory-excursion "gson/src/main" + (copy-file "java-templates/com/google/gson/internal/GsonBuildConfig.java" + "java/com/google/gson/internal/GsonBuildConfig.java") + (substitute* "java/com/google/gson/internal/GsonBuildConfig.java" + (("\\$\\{project.version\\}") ,version)))))))))) + (define-public java-hawtjni (package (name "java-hawtjni")