From patchwork Tue Dec 5 19:50:55 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg Hogan X-Patchwork-Id: 57328 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 930C127BBEA; Tue, 5 Dec 2023 19:52:00 +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.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,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 9F13D27BBE2 for ; Tue, 5 Dec 2023 19:51:59 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rAbSS-0005zX-54; Tue, 05 Dec 2023 14:51:52 -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 1rAbSR-0005z6-3Q for guix-patches@gnu.org; Tue, 05 Dec 2023 14:51:51 -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 1rAbSQ-0004ut-PP for guix-patches@gnu.org; Tue, 05 Dec 2023 14:51:50 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rAbSc-0005ZV-0n for guix-patches@gnu.org; Tue, 05 Dec 2023 14:52:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#67644] [PATCH] gnu: pypy: Update to 7.3.13. Resent-From: Greg Hogan Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 05 Dec 2023 19:52:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 67644 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 67644@debbugs.gnu.org Cc: Greg Hogan X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.170180588221312 (code B ref -1); Tue, 05 Dec 2023 19:52:01 +0000 Received: (at submit) by debbugs.gnu.org; 5 Dec 2023 19:51:22 +0000 Received: from localhost ([127.0.0.1]:38409 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rAbRy-0005Xg-0n for submit@debbugs.gnu.org; Tue, 05 Dec 2023 14:51:22 -0500 Received: from lists.gnu.org ([2001:470:142::17]:35548) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rAbRv-0005XP-97 for submit@debbugs.gnu.org; Tue, 05 Dec 2023 14:51:20 -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 1rAbRd-0005t0-Rh for guix-patches@gnu.org; Tue, 05 Dec 2023 14:51:01 -0500 Received: from mail-qk1-x72c.google.com ([2607:f8b0:4864:20::72c]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rAbRc-0004lw-1q for guix-patches@gnu.org; Tue, 05 Dec 2023 14:51:01 -0500 Received: by mail-qk1-x72c.google.com with SMTP id af79cd13be357-77efe9be09fso107838385a.3 for ; Tue, 05 Dec 2023 11:50:59 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=greghogan-com.20230601.gappssmtp.com; s=20230601; t=1701805858; x=1702410658; darn=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=KA57OnTnYS/DBZtXPVFNxSbom48u4oFZfMjZpujN58o=; b=D6lqo3VvegmSAYRMkKV8L3wIIPOMAmIKZmf1t7Ecxl+uwV+QtVi5RKgyXdn0fZoKiu 5qc8U0vJ1CjNM0d/n1ztdRX5xmfDMdovC4bzUSV0/Kks17HmyApKDr1OSLucqJ4jRxuj Xzo3xPn68npDCoDkzfZD6uSTJdk5gshwnaJsFYLVkPIvQHZBHJVatz5WVTMzGAfghIEe uB57gRzPycW52szY3vzLCQagq8U7wNyQR6I/VMZax3N66SjSouzmUmlVwpzZtHMj0ETu aHmg2kMF1OHZKqtusBkpv/IDfZxuL4ss7hET/UMmrREdIm/r5VyO43JDnv8kGaTkgcTn 6Cww== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1701805858; x=1702410658; 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=KA57OnTnYS/DBZtXPVFNxSbom48u4oFZfMjZpujN58o=; b=LnI8vkOtLfRkmt+hG3dcu2QLI8nJ4+RfoFgQaGEsIqjhE/aN7K84OLhc8yw8VHsmqU iFcNMeMkCYqGUfzpVua0Q27l2cugnCIbs9RwWqBEWdTZ6edc/ZYYgUtdcWqJSz3UE2+/ riOr1wT7zMPT4bot7wcboJ7EwYxElFrbRat4AKgMAQu/8pL/EaatNbnf/LiZutu6UpMJ T5Ibe0G6/JOSbA5nb8RcLbj5R0UVwudGOVlanc+0/faMvu1JHXNUp4828zBfhwXvEAQM QozU7EwvSsqgIC92PiMQgtCTlrnlBfw1Vw5yPkIW9MdFW1MKSQAr8M+4bhIYo2X7J8RM Ax/A== X-Gm-Message-State: AOJu0YzUX7BII2HyuxvRpsJ+ciwSK25g6kbsH5r0KKDO+oJXqndX+j/+ fXTm4su1DmZ39XCYWJ91XHThInXfwxQ0Tw2PQGw= X-Google-Smtp-Source: AGHT+IH1dpqZyB+UBq7+ATRP8C2D9wzpY/xeA0H+XQL4xD/sKTQi859dxnVmOzaAAP2dqLkL5U/TGA== X-Received: by 2002:a05:620a:8016:b0:778:8ec4:e046 with SMTP id ee22-20020a05620a801600b007788ec4e046mr1833845qkb.29.1701805858566; Tue, 05 Dec 2023 11:50:58 -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 ow15-20020a05620a820f00b0077db614cb7fsm5348988qkn.8.2023.12.05.11.50.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 05 Dec 2023 11:50:58 -0800 (PST) From: Greg Hogan Date: Tue, 5 Dec 2023 19:50:55 +0000 Message-Id: <20231205195055.10424-1-code@greghogan.com> X-Mailer: git-send-email 2.40.1 MIME-Version: 1.0 Received-SPF: none client-ip=2607:f8b0:4864:20::72c; envelope-from=code@greghogan.com; helo=mail-qk1-x72c.google.com X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_NONE=0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action 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 The validate-runpath error was previously reported in #57653. Version update fixes the existing build errors. * gnu/packages/python.scm (pypy3): Update to 7.3.13. [source]: Update origin URI. [arguments]<#:validate-runpath>: Disable check. [arguments]<#:phases>: Update directory paths. Change-Id: Ic6ab7dd77e30fa85d6fa5f000f9aa2528951b81e --- gnu/packages/pypy.scm | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/gnu/packages/pypy.scm b/gnu/packages/pypy.scm index c7c74c5c34..59c368417e 100644 --- a/gnu/packages/pypy.scm +++ b/gnu/packages/pypy.scm @@ -42,18 +42,19 @@ (define-module (gnu packages pypy) (define-public pypy (package (name "pypy") - (version "7.3.5") + (version "7.3.13") (source (origin (method url-fetch) (uri (string-append "https://downloads.python.org/pypy/" - "pypy3.7-v" version "-src.tar.bz2")) + "pypy3.10-v" version "-src.tar.bz2")) (sha256 (base32 - "18lrdmpcczlbk3cfarkgwqdmilrybz56i1dafk8dkjlyk90gw86r")))) + "0v9s6pwrnaxqi5h1pvmaphj6kgyczx07ykl07hcx656h34y77haa")))) (build-system gnu-build-system) (arguments (list #:tests? #f ;FIXME: 43 out of 364 tests are failing + #:validate-runpath? #f #:modules '((ice-9 ftw) (ice-9 match) (guix build utils) (guix build gnu-build-system)) #:disallowed-references (list nss-certs) @@ -151,7 +152,7 @@ (define-public pypy (for-each (lambda (x) (delete-file-recursively (string-append - "lib-python/3/" x))) + "lib/pypy3.10/" x))) '("tkinter/test" "test" "sqlite3/test" @@ -161,12 +162,12 @@ (define-public pypy "ctypes/test" "unittest/test")) ;; Patch shebang referencing python. - (substitute* '("lib-python/3/cgi.py" - "lib-python/3/encodings/rot_13.py") + (substitute* '("lib/pypy3.10/cgi.py" + "lib/pypy3.10/encodings/rot_13.py") ((shebang-match-python) shebang-pypy3)) (with-fluids ((%default-port-encoding "ISO-8859-1")) - (substitute* '("lib_pypy/_md5.py" - "lib_pypy/_sha1.py") + (substitute* '("lib/pypy3.10/_md5.py" + "lib/pypy3.10/_sha1.py") ((shebang-match-python) shebang-pypy3)))) (copy-recursively dist-dir #$output))))))) (native-inputs