From patchwork Thu Jan 18 21:59:33 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg Hogan X-Patchwork-Id: 59104 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 4403F27BBEA; Thu, 18 Jan 2024 22:00:20 +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=-3.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H5,RCVD_IN_MSPIKE_WL, SPF_HELO_PASS 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 1637827BBE2 for ; Thu, 18 Jan 2024 22:00:16 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rQaQf-0006c2-ER; Thu, 18 Jan 2024 17:00:05 -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 1rQaQb-0006am-81 for guix-patches@gnu.org; Thu, 18 Jan 2024 17:00:01 -0500 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rQaQa-0004Zg-VB for guix-patches@gnu.org; Thu, 18 Jan 2024 17:00:00 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rQaQc-0005Ew-Nr for guix-patches@gnu.org; Thu, 18 Jan 2024 17:00:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#68575] [PATCH core-updates 1/3] gnu: icedtea-7: Fix build. References: <20240118215737.4976-1-code@greghogan.com> In-Reply-To: <20240118215737.4976-1-code@greghogan.com> Resent-From: Greg Hogan Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 18 Jan 2024 22:00:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 68575 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 68575@debbugs.gnu.org Cc: Greg Hogan Received: via spool by 68575-submit@debbugs.gnu.org id=B68575.170561519020079 (code B ref 68575); Thu, 18 Jan 2024 22:00:02 +0000 Received: (at 68575) by debbugs.gnu.org; 18 Jan 2024 21:59:50 +0000 Received: from localhost ([127.0.0.1]:56882 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rQaQP-0005Dm-PH for submit@debbugs.gnu.org; Thu, 18 Jan 2024 16:59:50 -0500 Received: from mail-qv1-xf35.google.com ([2607:f8b0:4864:20::f35]:44188) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rQaQO-0005DM-5X for 68575@debbugs.gnu.org; Thu, 18 Jan 2024 16:59:48 -0500 Received: by mail-qv1-xf35.google.com with SMTP id 6a1803df08f44-67f91d48863so931776d6.0 for <68575@debbugs.gnu.org>; Thu, 18 Jan 2024 13:59:46 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=greghogan-com.20230601.gappssmtp.com; s=20230601; t=1705615180; x=1706219980; darn=debbugs.gnu.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=CUob9yOYznY7xPhPLXG0UEWtW6z3tAgcwsKmsxWStug=; b=twep7TpKFpdrqEMd3NLbym3S/aa1VQLiy+giWsfYir0rgqlDR3/p+iiDW1OGOtcfiO gomfw7JnriUtv4SrIDnMuDeSF2EM1WMUWWmSpZjhaDPnPbBMmqFBXJPeWztk4WhbwrcN 9Ay0DFFkDGlhN+9CJQhBro6vVUFKVeysim2CX2Cts58WP/0zfGjU6twLsOFhWhmII/lK VaOZ0CTKTEK0F6lOWpUwF65AvuCaQdgZnqmXP4GmQmTifHQ5vBOLgGTzpHWmeWRxNKfG TZAELt3l8IqmbDcI9biDoMbfFg/FoJf1b1P1/pq+BN7gQQ0zqGKlhTWRfdr7cQXOiwQw Vm/Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1705615180; x=1706219980; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=CUob9yOYznY7xPhPLXG0UEWtW6z3tAgcwsKmsxWStug=; b=B85VoFyrvzjiOjy+enOlXX2yB/8D89D15TuMEGWRwjgad8LO0pVAyypJ8zeB7cKybB lCYUWZoFQolkWSrJmf1WsdDPLzgKdbgftS/tCnoQeevqLIFZONEW+e7kVjwZ18O0zvIo 8fBNNAHSICmvWN9GiTNL8jNn3mPSXiYCH7KQxYJ2GdC1R1g6+TmkyEDpeRfhopgeSMx0 YGBn6g2jv1NbJd5uuH5IZvFqFKB1pjSsFwhW2Xy9SOifUleaTAialn+NT1807zZYOJ5h WulLmzheDD6tW/IdcszY/QJm/D48LiBnb1g+8HRaQ+CHwz/xPo9MEnoHv1cQ2Yz266jz 5gMw== X-Gm-Message-State: AOJu0Yxsh1ilb1/LkNASbQQspdzKAP8Np38yr3cOwImJVDW/cvDPTj7Y mZsU8GjNXHsJGkqht5FIZ1EL6dluJnfYXixz2kVZCHTzSLIHIam+1H1Dyjudo4I4EOTkiGuNwFy D X-Google-Smtp-Source: AGHT+IGIbIQT29oP5J41XWIYLpH5vpMww6IKnu9OJ9cGuQur+6lsk3dOg8B8VSvhYVsCAH1ltW9FYA== X-Received: by 2002:a05:6214:2622:b0:681:7e9c:25f5 with SMTP id gv2-20020a056214262200b006817e9c25f5mr1460918qvb.48.1705615180392; Thu, 18 Jan 2024 13:59:40 -0800 (PST) Received: from ip-172-31-16-52.us-east-2.compute.internal (ec2-3-141-183-131.us-east-2.compute.amazonaws.com. [3.141.183.131]) by smtp.gmail.com with ESMTPSA id cv16-20020ad44d90000000b0068179afede6sm1856601qvb.100.2024.01.18.13.59.39 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 18 Jan 2024 13:59:40 -0800 (PST) From: Greg Hogan Date: Thu, 18 Jan 2024 21:59:33 +0000 Message-Id: <20240118215935.5178-1-code@greghogan.com> X-Mailer: git-send-email 2.40.1 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 (icedtea-7)[arguments]: Use C.UTF-8 locale in 'install-keystore phase. Change-Id: I6da65dd8aaea6fc95f7f0d269ed5ab45c26ce21d --- gnu/packages/java.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm index 5e910e9749..ce75c1cadb 100644 --- a/gnu/packages/java.scm +++ b/gnu/packages/java.scm @@ -577,8 +577,8 @@ (define (import-cert cert) ;; This is necessary because the certificate directory contains ;; files with non-ASCII characters in their names. - (setlocale LC_ALL "en_US.utf8") - (setenv "LC_ALL" "en_US.utf8") + (setlocale LC_ALL "C.UTF-8") + (setenv "LC_ALL" "C.UTF-8") (for-each import-cert (find-files certs-dir "\\.pem$")) (mkdir-p (string-append (assoc-ref outputs "out") From patchwork Thu Jan 18 21:59:34 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg Hogan X-Patchwork-Id: 59106 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 D173527BBEA; Thu, 18 Jan 2024 22:00:38 +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=-3.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H5,RCVD_IN_MSPIKE_WL, SPF_HELO_PASS 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 66DBC27BBE9 for ; Thu, 18 Jan 2024 22:00:38 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rQaQg-0006cB-2T; Thu, 18 Jan 2024 17:00:06 -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 1rQaQb-0006au-Rw for guix-patches@gnu.org; Thu, 18 Jan 2024 17:00:01 -0500 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rQaQb-0004Zr-FN for guix-patches@gnu.org; Thu, 18 Jan 2024 17:00:01 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rQaQd-0005FT-83 for guix-patches@gnu.org; Thu, 18 Jan 2024 17:00:03 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#68575] [PATCH core-updates 2/3] gnu: openjdk9: Fix build. Resent-From: Greg Hogan Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 18 Jan 2024 22:00:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 68575 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 68575@debbugs.gnu.org Cc: Greg Hogan Received: via spool by 68575-submit@debbugs.gnu.org id=B68575.170561519020087 (code B ref 68575); Thu, 18 Jan 2024 22:00:03 +0000 Received: (at 68575) by debbugs.gnu.org; 18 Jan 2024 21:59:50 +0000 Received: from localhost ([127.0.0.1]:56884 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rQaQQ-0005Do-3O for submit@debbugs.gnu.org; Thu, 18 Jan 2024 16:59:50 -0500 Received: from mail-qv1-xf29.google.com ([2607:f8b0:4864:20::f29]:60511) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rQaQO-0005DO-Ku for 68575@debbugs.gnu.org; Thu, 18 Jan 2024 16:59:48 -0500 Received: by mail-qv1-xf29.google.com with SMTP id 6a1803df08f44-6818aa07d81so1043166d6.0 for <68575@debbugs.gnu.org>; Thu, 18 Jan 2024 13:59:46 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=greghogan-com.20230601.gappssmtp.com; s=20230601; t=1705615181; x=1706219981; darn=debbugs.gnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=/KdlsVypcaHrWCKMUnA0OzgoIShZwPQBNnZRyXgI+4c=; b=MjClRkp/qhKD5pT03pg4o4hqWMJjRrdiXD6ppGOBcLXWSgeiUp2al4n1vAoRb/EbFN 5V2EORw/aPRpvqqsLrZGBCjRD4AfVJ74GZAJT5210f+8wRnSqWDBLXNI+5KacKph1uRT hKtMg+W18wuecWOWSC9nGJBgVTuQE5nDzffNkiowMm+4lL9xNY72xRqtagMoc7MpSIOE YrpTQ/FIs4+9BdnlSpHUVqqHTX0hVjXbrZpF3TbMvYa0cK+YU773s5LPuhPM9xFJVe+X vRd1z5FqKMU4lgnFwbqT6Qbgn7f5IkeBJzxou2L7gVqtL2VezZaRQiidqKr/DTMg5N5p VWgA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1705615181; x=1706219981; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=/KdlsVypcaHrWCKMUnA0OzgoIShZwPQBNnZRyXgI+4c=; b=cUITo126ukAzfHO8ILjGmhHsSyUftn9zaZQtiK7uUXmxQpETbaT5br4FKwNdGAF8CE ajfBTxR7r4jX51hPeFQAOt8ZBlg8u5OCx+28FW94VEANBij8oXROFDSJBrAatYpO63jD tIGTD7Gbc+QAuZ744sqMEk2j5syntB0nP8fFnFEGavfmKqAIxYw/qyEVZtyPP2NbFKZ8 9SXiojsQOXgBmT0rRp521vCBFWL+0kT6wkrT2PwloTjuJY+ZojCYrwhhHWT7pUZQ10vh Mw23Zt8iVJmaOP/0p+iYHrsjcc2RfGARwN3IQzRkCdJCB6i3a8w5vRuXU8eo09VUQDUO WH3w== X-Gm-Message-State: AOJu0YxF/Qz9QnB9NO8VBDMQs7XY0A3dRKn7o5pz+/R82u/bgkWMXF/G JaEbX37HUT+lSYnmGhF+1imp/p0liGYcMSx7AwQdSpsgLq7u0NPLrplrvo5Btt4i1ERYOINi4WO o X-Google-Smtp-Source: AGHT+IFm6vuChL+jwKQggEhmNWAT2JgmFoR0khzIxEy20q0IsgA45e7V7gfRKO0zietp3TN3MtkRPA== X-Received: by 2002:a05:6214:2426:b0:681:2506:2bd8 with SMTP id gy6-20020a056214242600b0068125062bd8mr1364274qvb.19.1705615181088; Thu, 18 Jan 2024 13:59:41 -0800 (PST) Received: from ip-172-31-16-52.us-east-2.compute.internal (ec2-3-141-183-131.us-east-2.compute.amazonaws.com. [3.141.183.131]) by smtp.gmail.com with ESMTPSA id cv16-20020ad44d90000000b0068179afede6sm1856601qvb.100.2024.01.18.13.59.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 18 Jan 2024 13:59:40 -0800 (PST) From: Greg Hogan Date: Thu, 18 Jan 2024 21:59:34 +0000 Message-Id: <20240118215935.5178-2-code@greghogan.com> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20240118215935.5178-1-code@greghogan.com> References: <20240118215935.5178-1-code@greghogan.com> 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)[arguments]: Use C.UTF-8 locale in 'install-keystore phase. Change-Id: I7fb54b917a058584bcdee0fb5575b8eaba4f7edd --- gnu/packages/java.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm index ce75c1cadb..9ff85355d5 100644 --- a/gnu/packages/java.scm +++ b/gnu/packages/java.scm @@ -1032,8 +1032,8 @@ (define (import-cert cert) ;; This is necessary because the certificate directory contains ;; files with non-ASCII characters in their names. - (setlocale LC_ALL "en_US.utf8") - (setenv "LC_ALL" "en_US.utf8") + (setlocale LC_ALL "C.UTF-8") + (setenv "LC_ALL" "C.UTF-8") (copy-file (string-append (assoc-ref outputs "out") "/lib/security/cacerts") From patchwork Thu Jan 18 21:59:35 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg Hogan X-Patchwork-Id: 59105 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 9A86B27BBEA; Thu, 18 Jan 2024 22:00:31 +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=-3.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H5,RCVD_IN_MSPIKE_WL, SPF_HELO_PASS 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 8210327BBE2 for ; Thu, 18 Jan 2024 22:00:27 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rQaQg-0006cF-M9; Thu, 18 Jan 2024 17:00:06 -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 1rQaQc-0006bg-8A for guix-patches@gnu.org; Thu, 18 Jan 2024 17:00:03 -0500 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rQaQb-0004a8-UB for guix-patches@gnu.org; Thu, 18 Jan 2024 17:00:01 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rQaQd-0005GM-N2 for guix-patches@gnu.org; Thu, 18 Jan 2024 17:00:03 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#68575] [PATCH core-updates 3/3] gnu: openjdk11: Fix build. Resent-From: Greg Hogan Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 18 Jan 2024 22:00:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 68575 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 68575@debbugs.gnu.org Cc: Greg Hogan Received: via spool by 68575-submit@debbugs.gnu.org id=B68575.170561519120093 (code B ref 68575); Thu, 18 Jan 2024 22:00:03 +0000 Received: (at 68575) by debbugs.gnu.org; 18 Jan 2024 21:59:51 +0000 Received: from localhost ([127.0.0.1]:56886 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rQaQQ-0005Dx-NY for submit@debbugs.gnu.org; Thu, 18 Jan 2024 16:59:50 -0500 Received: from mail-qv1-xf34.google.com ([2607:f8b0:4864:20::f34]:50594) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rQaQP-0005DP-6v for 68575@debbugs.gnu.org; Thu, 18 Jan 2024 16:59:49 -0500 Received: by mail-qv1-xf34.google.com with SMTP id 6a1803df08f44-681397137afso1069796d6.1 for <68575@debbugs.gnu.org>; Thu, 18 Jan 2024 13:59:47 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=greghogan-com.20230601.gappssmtp.com; s=20230601; t=1705615181; x=1706219981; darn=debbugs.gnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=S/jz9dCLlJmQAIAon9ct6/eX/xcu56qmvBsajcDT5/Y=; b=OyYYU0nWAoB1w3ebcsZOlDtvWNxDbRV+/OhNqFCZwrWQl09H5mfhwssvgDSElm8lx6 w6TPAznqLwOVtx2FZmNIva9jJf06EH7dCwy7X6nOg7U9CN4Q+9cwzx2F+BtqlkNOIH/p YqFnUnXKATUKurwIw8tFrDPWujOeD2Dn4Uu4KFa+uBlJyN7sDKZ0xSxWSJ2ctF7kn//T seUAv8aLNMrJ5ZrKWCg73bmlAnMjI+c8JMat5clCDhq8NoF57HJzzH2A/Oq9Gva5EMCw UjnKDCSsar+jH0O8q7vCV8/J4X9C1IeB7SYFQALhJA1Sp1DeTiNhLLlKLyKp7kJMU1uC CmJQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1705615181; x=1706219981; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=S/jz9dCLlJmQAIAon9ct6/eX/xcu56qmvBsajcDT5/Y=; b=UuwE+sRjmWruMj4QDhaa7JtWDdNsBA7/StamJEHGgJF20tTkfon6g52wsj/7E0Mwdt +fn6m3skaJHTie8C3qEklGcQhrGCzrBVNTcdoOU9OG/d5USy2cKcCWrx9ZUBiX0Wxwjg yjDRKOMgAuDXT96R3Pvnj0yHZt5nePvgqlhGemBzrVjRrZGjUCXVkFskqnFkaPm959wk x8YjOISWh2867nXfSmJKRye4BwGlyvmWNgB/2ARjaqhDSUenYpjDz3V9hYMhg0zqAHB2 ixVhIyqIxb+4dp5C/yAtVDzGLg5RR5JYqM0wqUasyHUJLGP4pmSYBWc3YvbQpHwozIGl R0Pg== X-Gm-Message-State: AOJu0YxYZ3j3l67ZKEOfGCLZ1Yo/KFNSIf26rVLBNjUofAflj+ifgzeb 7yNpAZ4XuEVdcIK/Pk/klfFuPkltjjAvKdklBocVHdJKt4RqgBmHWiw5fVn9jT2yELxjQ3Z1UDo t X-Google-Smtp-Source: AGHT+IE+znbMC03BQgJbDJw9Q6FNPlGDUiWDY2WmWvyo1C0M3nWo4rK9Xr678bHE9TRtxZwSGsgM7A== X-Received: by 2002:a05:6214:27c4:b0:67f:641e:bfc5 with SMTP id ge4-20020a05621427c400b0067f641ebfc5mr2173119qvb.26.1705615181712; Thu, 18 Jan 2024 13:59:41 -0800 (PST) Received: from ip-172-31-16-52.us-east-2.compute.internal (ec2-3-141-183-131.us-east-2.compute.amazonaws.com. [3.141.183.131]) by smtp.gmail.com with ESMTPSA id cv16-20020ad44d90000000b0068179afede6sm1856601qvb.100.2024.01.18.13.59.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 18 Jan 2024 13:59:41 -0800 (PST) From: Greg Hogan Date: Thu, 18 Jan 2024 21:59:35 +0000 Message-Id: <20240118215935.5178-3-code@greghogan.com> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20240118215935.5178-1-code@greghogan.com> References: <20240118215935.5178-1-code@greghogan.com> 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 (openjdk11)[arguments]: Replace reference to 'remove-diz-file phase with 'remove-extraneous-files. Change-Id: I932be9202459b41d82686839d309d1785011bf90 --- gnu/packages/java.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm index 9ff85355d5..2efb435698 100644 --- a/gnu/packages/java.scm +++ b/gnu/packages/java.scm @@ -1399,7 +1399,7 @@ (define (icedtea-or-openjdk? path) ((name . dir) dir)) outputs))))) - (add-after 'remove-diz-file 'strip-archive-timestamps + (add-after 'remove-extraneous-files 'strip-archive-timestamps (lambda _ (use-modules (ice-9 binary-ports) (rnrs bytevectors))