From patchwork Tue Apr 12 13:24:30 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Rostislav Svoboda X-Patchwork-Id: 38540 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 69AFA27BBEA; Tue, 12 Apr 2022 14:26:32 +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=-2.7 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI, 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 265E927BBE9 for ; Tue, 12 Apr 2022 14:26:32 +0100 (BST) Received: from localhost ([::1]:60266 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1neGXP-00031g-AZ for patchwork@mira.cbaines.net; Tue, 12 Apr 2022 09:26:31 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:34128) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1neGWw-000315-GS for guix-patches@gnu.org; Tue, 12 Apr 2022 09:26:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:54124) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1neGWw-0007t1-82 for guix-patches@gnu.org; Tue, 12 Apr 2022 09:26:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1neGWw-00013X-4l for guix-patches@gnu.org; Tue, 12 Apr 2022 09:26:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#54852] [PATCH] gnu: Add openjdk18. Resent-From: Rostislav Svoboda Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 12 Apr 2022 13:26:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 54852 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Maxime Devos , Julien Lepiller Cc: 54852@debbugs.gnu.org Received: via spool by 54852-submit@debbugs.gnu.org id=B54852.16497699163991 (code B ref 54852); Tue, 12 Apr 2022 13:26:02 +0000 Received: (at 54852) by debbugs.gnu.org; 12 Apr 2022 13:25:16 +0000 Received: from localhost ([127.0.0.1]:48021 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1neGWB-00012J-Md for submit@debbugs.gnu.org; Tue, 12 Apr 2022 09:25:16 -0400 Received: from mail-ej1-f46.google.com ([209.85.218.46]:39541) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1neGW9-000120-1o for 54852@debbugs.gnu.org; Tue, 12 Apr 2022 09:25:14 -0400 Received: by mail-ej1-f46.google.com with SMTP id bv19so14314473ejb.6 for <54852@debbugs.gnu.org>; Tue, 12 Apr 2022 06:25:13 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc:content-transfer-encoding; bh=2YaMG7IZJLdgoFMRs8QyVxQLPq93WJI0PbSebXzcfU0=; b=Vrn9fQSGwd9U5eqqKkfP5GP1SyWMIv1AiMCsMwweD34ZZpaHDX1yWz/w+oknc914fx q0k4vWJBae1jLu6qFmQ8JlnsdRnP2vlTEUVx/Sns6hH93na23dFseMwmWeU78Vj8GpVQ S3V4Pf14irYDiJ1pyg4HLicIEjRusgTBQWJxJD94/7S/q13y8tiBeqwRS424tpUBzWNx 9PXWCexk3A4SVj28fOp8KbXqP/YB+EzTwcKIG07Jma5qA3Zf0curILpYWCzFjEZC9vtU ECBZK/SnKmkx0sReVTT/L1vJSGBJj5mx9RX1cCpO5/p5InSKkpHylfTAkVbQ4a7he5y/ LODQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc:content-transfer-encoding; bh=2YaMG7IZJLdgoFMRs8QyVxQLPq93WJI0PbSebXzcfU0=; b=TH4MZzXqsYsia2aASc+disvvP0sBcGL2yUV5Ecfc6xdxBPygDKaKmwnnyZYHw333Wk HpQhghVKaYVZ+YUw+m+WMhWfJJUkUbeivmCteQ04MWfj1vhTCeVEvTCV1RJz+dYFHYHm ENWQnH0DycMYOWwy7htmmJEJ55G943AMJocnk//JNXq3alsTtU8KkTD7lmi1KNmWHxhu bWEM9W0rUIxbFSzgQB5xGFdDMCXNWtNrDIXDPQhFGqA8i9ldayX691+vg9s3ud1K+W67 3GSU1SR0ZGdH4vDch5nEyUKIFpMF2x9BnTA/grkvWsSWOzkfDoHMMh6C1BdovEepF7YY V67A== X-Gm-Message-State: AOAM531PTKw98+qvec020IpJFS220SjQ59wQOOr+SEwe4l6OZocT9U5x S0U1jhWlAGjGizzRgzdSdHBuDa6bfeI/YVYmwPc= X-Google-Smtp-Source: ABdhPJx3KUgo3YLLjlQaLFkGsgN4A+kZfQBXulBVMW+u/uwUkrpxhaw5t48iPRKFwZISE1nJLMWaMLaHwckp0FmiWao= X-Received: by 2002:a17:907:6297:b0:6da:6388:dc58 with SMTP id nd23-20020a170907629700b006da6388dc58mr35387391ejc.472.1649769906983; Tue, 12 Apr 2022 06:25:06 -0700 (PDT) MIME-Version: 1.0 References: <20220411125335.4047-1-Rostislav.Svoboda@gmail.com> In-Reply-To: From: Rostislav Svoboda Date: Tue, 12 Apr 2022 15:24:30 +0200 Message-ID: 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 Le lun. 11 avr. 2022 à 15:44, Maxime Devos a écrit : > > + (arguments > > + (substitute-keyword-arguments (package-arguments openjdk16) > > + ((#:phases phases) > > + `(modify-phases ,phases > > + (replace 'fix-java-shebangs > > + (lambda _ > > + ;; This file was "fixed" by patch-source-shebangs, but it requires > > + ;; this exact first line. > > + (substitute* "make/data/blockedcertsconverter/blocked.certs.pem" > > + (("^#!.*") "#! java BlockedCertsConverter SHA-256\n")))))))) > > Why is this duplicated? It is exactly the same phase as for openjdk17, > so inherit should take care of it. Le lun. 11 avr. 2022 à 16:16, Julien Lepiller a écrit : > The patch looks great, but I wonder why you need to change che phases to tomething that looks like openjdk 17's phases? Am I missing something? Wouldn't it work without any change to the arguments? You're both right. We don't need that. (Sorry) I'm sending correction below. Cheers Bost From 543aa7797308ea66d1d1140e72a48908a2e73419 Mon Sep 17 00:00:00 2001 From: Rostislav Svoboda Date: Mon, 11 Apr 2022 11:55:55 +0200 Subject: [PATCH] gnu: Add openjdk18. --- gnu/packages/java.scm | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm index 6738b5dc35..ec0b956388 100644 --- a/gnu/packages/java.scm +++ b/gnu/packages/java.scm @@ -2263,6 +2263,29 @@ (define-public openjdk17 (("^#!.*") "#! java BlockedCertsConverter SHA-256\n")))))))) (home-page "https://openjdk.java.net/projects/jdk/17"))) +(define-public openjdk18 + (package + (inherit openjdk17) + (name "openjdk") + (version "18") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/openjdk/jdk18u") + (commit (string-append "jdk-" version "-ga")))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1bv6bdhkmwvn10l0xy8yi9xibds640hs5zsvx0jp7wrxa3qw4qy8")))) + (native-inputs + `(("autoconf" ,autoconf) + ("openjdk17:jdk" ,openjdk17 "jdk") + ("pkg-config" ,pkg-config) + ("unzip" ,unzip) + ("which" ,which) + ("zip" ,zip))) + (home-page "https://openjdk.java.net/projects/jdk/18"))) + (define-public icedtea icedtea-8)