From patchwork Mon Mar 13 22:52:30 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?b?QmrDtnJuIEjDtmZsaW5n?= X-Patchwork-Id: 47949 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 342E616E86; Mon, 13 Mar 2023 22:53:21 +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=-2.0 required=5.0 tests=MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham 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 8EF2616E04 for ; Mon, 13 Mar 2023 22:53:20 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pbr2O-0007sp-0k; Mon, 13 Mar 2023 18:53:04 -0400 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 1pbr2M-0007sa-AX for guix-patches@gnu.org; Mon, 13 Mar 2023 18:53:02 -0400 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 1pbr2L-00054o-PH for guix-patches@gnu.org; Mon, 13 Mar 2023 18:53:01 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pbr2L-0008Nj-Ld for guix-patches@gnu.org; Mon, 13 Mar 2023 18:53:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#62171] [PATCH 1/2] gnu: openjdk9: Build from hg. Resent-From: =?utf-8?b?QmrDtnJuIEjDtmZsaW5n?= Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 13 Mar 2023 22:53:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 62171 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 62171@debbugs.gnu.org Cc: Julien Lepiller Received: via spool by 62171-submit@debbugs.gnu.org id=B62171.167874796032191 (code B ref 62171); Mon, 13 Mar 2023 22:53:01 +0000 Received: (at 62171) by debbugs.gnu.org; 13 Mar 2023 22:52:40 +0000 Received: from localhost ([127.0.0.1]:35778 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pbr20-0008N8-7k for submit@debbugs.gnu.org; Mon, 13 Mar 2023 18:52:40 -0400 Received: from m4s11.vlinux.de ([83.151.27.109]:43816 helo=bjoernhoefling.de) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pbr1x-0008N0-Sh for 62171@debbugs.gnu.org; Mon, 13 Mar 2023 18:52:38 -0400 Received: from tangletp (pd951ff75.dip0.t-ipconnect.de [217.81.255.117]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by bjoernhoefling.de (Postfix) with ESMTPSA id 03D293FC5F; Mon, 13 Mar 2023 23:52:31 +0100 (CET) Date: Mon, 13 Mar 2023 23:52:30 +0100 From: =?utf-8?b?QmrDtnJuIEjDtmZsaW5n?= Message-ID: <20230313235230.6d78a2e5@tangletp> In-Reply-To: <20230313234935.39a40ac0@tangletp> References: <20230313234935.39a40ac0@tangletp> X-Mailer: Claws Mail 4.0.0 (GTK+ 3.24.33; x86_64-pc-linux-gnu) 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 (openjdk9)[source]: Use HG-DOWNLOAD. [homepage]: Update. This fixes for OpenJDK 9. --- gnu/packages/java.scm | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-) (build-system gnu-build-system) (outputs '("out" "jdk" "doc")) (arguments @@ -1024,7 +1023,7 @@ (define (icedtea-or-openjdk? path) ("unzip" ,unzip) ("which" ,which) ("zip" ,zip))) - (home-page "https://openjdk.java.net/projects/jdk9/") + (home-page "https://openjdk.org/projects/jdk9/") (synopsis "Java development kit") (description "This package provides the Java development kit OpenJDK.") diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm index 388e9d127f..dff513913c 100644 --- a/gnu/packages/java.scm +++ b/gnu/packages/java.scm @@ -852,18 +852,17 @@ (define-public openjdk9 (name "openjdk") (version "9.181") (source (origin - (method url-fetch) - (uri "https://hg.openjdk.java.net/jdk/jdk/archive/3cc80be736f2.tar.bz2") - (file-name (string-append name "-" version ".tar.bz2")) + (method hg-fetch) + (uri (hg-reference (url "https://hg.openjdk.org/jdk/jdk") + (changeset "jdk-9+181"))) + (file-name (hg-file-name name version)) + (modules '((guix build utils))) + (snippet `(begin + (for-each delete-file + (find-files "." ".*.(bin|exe|jar)$")) #t)) (sha256 (base32 - "01ihmyf7k5z17wbr7xig7y40l9f01d5zjgkcmawn1102hw5kchpq")) - (modules '((guix build utils))) - (snippet - `(begin - (for-each delete-file - (find-files "." ".*.(bin|exe|jar)$")) - #t)))) + "1v92nzdqx07c35x945awzir4yk0fk22vky6fpp8mq9js930sxsz0"))))