From patchwork Fri Apr 16 21:11:37 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Philip McGrath X-Patchwork-Id: 28594 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 4F6EC27BC77; Fri, 16 Apr 2021 23:09:21 +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.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL,SPF_HELO_PASS, T_DKIM_INVALID,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 AF60827BC6C for ; Fri, 16 Apr 2021 23:09:17 +0100 (BST) Received: from localhost ([::1]:41650 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lXWeK-0003T7-St for patchwork@mira.cbaines.net; Fri, 16 Apr 2021 18:09:16 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:46996) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lXVlu-0001IN-J7 for guix-patches@gnu.org; Fri, 16 Apr 2021 17:13:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:58509) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lXVlu-0006Wk-5A for guix-patches@gnu.org; Fri, 16 Apr 2021 17:13:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lXVlt-0004ni-VP for guix-patches@gnu.org; Fri, 16 Apr 2021 17:13:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#47829] [PATCH 2/4] gnu: racket: Remove obsolete patch. Resent-From: Philip McGrath Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 16 Apr 2021 21:13:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 47829 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 47829@debbugs.gnu.org Cc: Philip McGrath Received: via spool by 47829-submit@debbugs.gnu.org id=B47829.161860752418362 (code B ref 47829); Fri, 16 Apr 2021 21:13:01 +0000 Received: (at 47829) by debbugs.gnu.org; 16 Apr 2021 21:12:04 +0000 Received: from localhost ([127.0.0.1]:41816 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lXVky-0004m6-2T for submit@debbugs.gnu.org; Fri, 16 Apr 2021 17:12:04 -0400 Received: from mail-qk1-f175.google.com ([209.85.222.175]:35824) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lXVkw-0004lc-SD for 47829@debbugs.gnu.org; Fri, 16 Apr 2021 17:12:03 -0400 Received: by mail-qk1-f175.google.com with SMTP id h13so11667745qka.2 for <47829@debbugs.gnu.org>; Fri, 16 Apr 2021 14:12:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=philipmcgrath.com; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=FeAVo5hGbHMT8sZ/38LcvtAxvqiMojxBkiZuTpieLOU=; b=QYhwiUvc6T1rE9DwjlBZcJW9BEdGpcxFHUIQSXbXht6ZT5oQfFFhTFAxs3pKhxp+fo sGlWzvpB5pg+r2q5+MJdvC9r7IIE3dLAyi1gHGeWuYaQU6wgxuiyqDU7+YacpJhrBch4 Lo5Aa04Nv8voHtOgiLRdFiNvv7piTPPFEZwRiUfFaa6GtlPT+DNH+AHnx77yqCwVPDzz 4XWfG7DFjqFrvLKmU7/9zUxwT92w4TUEhhUYH7LfDy0+/UXp4DDu/RVNXTotwuv/kKok PCLFGa0l624HdupAxByvGl82l++oZecKH4XsssgNY+ElYeSyLBT4GJE4YQIGfQmkAgfE OsiQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=FeAVo5hGbHMT8sZ/38LcvtAxvqiMojxBkiZuTpieLOU=; b=BFjrRSsLUxrPpMOKjd/rw/2Xy6uND5WvIhWlzPBZZhtAKvCPus8bJ2RtEprQTjBZKE Sv9ZSUBv6YhOfB3IT8DOv/jaMv783LASATexux1s0wcawBgFhqK3TIHVoHeTI9gb7R5K UHCIi0S5PtWKgCyYMCneb/yLhsxM76Gxncd0b/huqg+S3dn7VuJzP5TKKTA4mGzWEaLG G3GZT0T10fv9pErqr0V2wogz6gu3XdMVts8KzM/feDqasuFMzbgM/MPe1izJVXUsdMvS QzFInBE+EBtA6dHBpcwgY8vZvJIG+d8PD17Hl2nHqKX4BjlZnJdbBMEa84LKNTWuC/vz /0pw== X-Gm-Message-State: AOAM532kDRREOPOCsck5kl+QjpBQr3uzQc7iyIoJx4v0HbPIOvq6DvGL jwl2Y75qEY/pANv/0ziPOPXNArfWcnqp1A2uY/s= X-Google-Smtp-Source: ABdhPJzcQqfycG4m542plM16tWu+wT1l+eVEX2bOkTGtSPSYeRXT2ikeTIdRlaUb0AQ9ISqdy521Nw== X-Received: by 2002:ae9:e8d5:: with SMTP id a204mr1168655qkg.409.1618607516860; Fri, 16 Apr 2021 14:11:56 -0700 (PDT) Received: from localhost (c-73-125-89-242.hsd1.fl.comcast.net. [73.125.89.242]) by smtp.gmail.com with ESMTPSA id q15sm4389011qtx.47.2021.04.16.14.11.56 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Fri, 16 Apr 2021 14:11:56 -0700 (PDT) From: Philip McGrath Date: Fri, 16 Apr 2021 17:11:37 -0400 Message-Id: <20210416211139.21825-1-philip@philipmcgrath.com> X-Mailer: git-send-email 2.21.1 (Apple Git-122.3) In-Reply-To: <20210416210822.21536-1-philip@philipmcgrath.com> References: <20210416210822.21536-1-philip@philipmcgrath.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" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/racket.scm (racket)[source](patches): Remove "racket-store-checksum-override.patch", which is no longer needed since we stopped injecting store paths into Racket files in commit 834aa48: see . * gnu/packages/patches/racket-store-checksum-override.patch: Delete file. * gnu/local.mk (dist_patch_DATA): Remove it. --- gnu/local.mk | 1 - .../racket-store-checksum-override.patch | 42 ------------------- gnu/packages/racket.scm | 6 +-- 3 files changed, 1 insertion(+), 48 deletions(-) delete mode 100644 gnu/packages/patches/racket-store-checksum-override.patch diff --git a/gnu/local.mk b/gnu/local.mk index 92ec4b4589..26c93885ef 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1642,7 +1642,6 @@ dist_patch_DATA = \ %D%/packages/patches/rpcbind-CVE-2017-8779.patch \ %D%/packages/patches/rtags-separate-rct.patch \ %D%/packages/patches/racket-sh-via-rktio.patch \ - %D%/packages/patches/racket-store-checksum-override.patch \ %D%/packages/patches/remake-impure-dirs.patch \ %D%/packages/patches/retroarch-LIBRETRO_DIRECTORY.patch \ %D%/packages/patches/rnp-add-version.cmake.patch \ diff --git a/gnu/packages/patches/racket-store-checksum-override.patch b/gnu/packages/patches/racket-store-checksum-override.patch deleted file mode 100644 index 6c4ebcf022..0000000000 --- a/gnu/packages/patches/racket-store-checksum-override.patch +++ /dev/null @@ -1,42 +0,0 @@ -Racket uses checksums to test if it needs to recompile its source -files to bytecode. If Racket is updated by grafting, the source and -bytecode files get updated, but the checksum stays the same. Since -the checksum no longer matches the source file, Racket tries to -regenerate the bytecode and write it to the store, causing errors -because the store is immutable. This patch makes Racket ignore -checksums for files in the store. - -See for details. - ---- ---- a/collects/compiler/private/cm-minimal.rkt -+++ b/collects/compiler/private/cm-minimal.rkt -@@ -6,6 +6,7 @@ - racket/list - racket/path - racket/promise -+ racket/string - file/sha1 - setup/cross-system - compiler/compilation-path -@@ -268,7 +269,8 @@ - (trace-printf "newer src... ~a > ~a" path-time path-zo-time) - (maybe-compile-zo deps path->mode roots path orig-path read-src-syntax up-to-date collection-cache new-seen - #:trying-sha1? sha1-only?)] -- [(different-source-sha1-and-dep-recorded path deps) -+ [(and (not (store-reference? path)) -+ (different-source-sha1-and-dep-recorded path deps)) - => (lambda (difference) - (trace-printf "different src hash ~a for ~a..." difference path) - (maybe-compile-zo deps path->mode roots path orig-path read-src-syntax up-to-date collection-cache new-seen -@@ -1012,5 +1014,9 @@ - #f - (list src-hash recorded-hash))) - -+(define (store-reference? path) -+ (let ([store-prefix (or (getenv "NIX_STORE") "/gnu/store")]) -+ (string-prefix? (path->string path) store-prefix))) -+ - ;; Make sure `recompile-from` is machine-independent so that - ;; recompilation makes sense. - ;; The compilation lock must is held for the source of `recompile-from`. \ No newline at end of file diff --git a/gnu/packages/racket.scm b/gnu/packages/racket.scm index 925a6391f5..6cb72e592c 100644 --- a/gnu/packages/racket.scm +++ b/gnu/packages/racket.scm @@ -63,11 +63,7 @@ (base32 "047wpjblfzmf1msz7snrp2c2h0zxyzlmbsqr9bwsyvz3frcg0888")) (patches (search-patches - "racket-sh-via-rktio.patch" - ;; TODO: If we're no longer patching Racket source - ;; files with store paths, we may also fix the - ;; issue that necessitated the following patch: - "racket-store-checksum-override.patch")))) + "racket-sh-via-rktio.patch")))) (build-system gnu-build-system) (arguments `(#:configure-flags