From patchwork Sun Feb 13 21:51:25 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Philip McGrath X-Patchwork-Id: 37231 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 2CEFD27BBEA; Sun, 13 Feb 2022 21:55:10 +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 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 EADD027BBE9 for ; Sun, 13 Feb 2022 21:55:09 +0000 (GMT) Received: from localhost ([::1]:57702 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nJMpp-0006Bw-3o for patchwork@mira.cbaines.net; Sun, 13 Feb 2022 16:55:09 -0500 Received: from eggs.gnu.org ([209.51.188.92]:43424) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nJMon-0005eV-Sn for guix-patches@gnu.org; Sun, 13 Feb 2022 16:54:06 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:45187) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nJMon-0001uV-Iu for guix-patches@gnu.org; Sun, 13 Feb 2022 16:54:05 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1nJMon-0003Eb-IZ for guix-patches@gnu.org; Sun, 13 Feb 2022 16:54:05 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#53878] [PATCH 09/11] gnu: chez-mit: Support chez-scheme-for-racket. Resent-From: Philip McGrath Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 13 Feb 2022 21:54:05 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 53878 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 53878@debbugs.gnu.org Cc: Liliana Marie Prikler , Philip McGrath Received: via spool by 53878-submit@debbugs.gnu.org id=B53878.164478921312315 (code B ref 53878); Sun, 13 Feb 2022 21:54:05 +0000 Received: (at 53878) by debbugs.gnu.org; 13 Feb 2022 21:53:33 +0000 Received: from localhost ([127.0.0.1]:39073 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nJMoH-0003CS-Ij for submit@debbugs.gnu.org; Sun, 13 Feb 2022 16:53:33 -0500 Received: from mail-qk1-f177.google.com ([209.85.222.177]:40888) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nJMo8-0003Bo-HU for 53878@debbugs.gnu.org; Sun, 13 Feb 2022 16:53:24 -0500 Received: by mail-qk1-f177.google.com with SMTP id o25so12986533qkj.7 for <53878@debbugs.gnu.org>; Sun, 13 Feb 2022 13:53:24 -0800 (PST) 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=ZRi6asVXV+QTTkm+7nvM8RjAeYcMCR/ik7tKnX79K+k=; b=D9ElHnIfUqET0Zw4Uib32IqeQb3gmR5v5cDifIOP6pU1LcUzXkv4H+NPPF4KQiPXlw ul4DRBzLOsv+d+Ld5LQ31RU85M5r86DptHV5OgCwYWq3myv7pTgtOTD4NGLjPKpVXnQd 3jDSFOYidEGIlReXyFEAzrH30j2PEKb/JPdqRG1bYdnhmdGYAEWyL4GXRlIFoSfNHl9z vU0RsATyYsDA8H8Dbk8Uzc0s/ubNoOehxbFA6pKAhc/BWBKjgv8Zl+p3hwfxMOSIaxZg /gDIGy16w8Nhvga19gxu712SYb3nLiruMnWpynLtgsAA92BS8pCe6xEWebXYEp3alGS2 Yuyw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=ZRi6asVXV+QTTkm+7nvM8RjAeYcMCR/ik7tKnX79K+k=; b=whkijgWgPo/PXfIuFyj9Het+xshqR62KhTi0wQrYR0N47x3OG1eh8Il42l+T2Krbej fAiWNlsyR7RtkGuPGbPmA+5lKXPiHZjUQVQh4dA3PoYqRMKxMnzUGQ+b9Y/Zt7iZ6RLC tf9CO38erUXksjzKr5iDykO4lPrOoRf2YvFekPdi+5A95DCOsX8jY1qnQ9SQ2TfISZjt KRK5Sz+r/uUYtKSOWlU5uqSwbv9YOz544ASwGev326KSDNruqSSFR2fdG2O0NsCloM+9 PYhlu4TsoBP5CPruZd5hlR8HhsmBH8kadrKEaihnsK7NkCu0I/GcNMNwUxkluGvxiZzK /B8g== X-Gm-Message-State: AOAM531LGvtdvdZJAT09sludDgOVUZCMIyXq4JRKoLuDvSDmbsDNus7P 6nSDUJN+HXVCD/g3fn0FZGpSfmElD6Lqg8shlr4= X-Google-Smtp-Source: ABdhPJydaC1tj/XqIc+8GwBmEDB0n+ZOObxcStbVA0YniesG7fdgTwrQqRT1wccnVzq41R2Ma1rEoA== X-Received: by 2002:a05:620a:44d4:: with SMTP id y20mr5774041qkp.33.1644789199035; Sun, 13 Feb 2022 13:53:19 -0800 (PST) Received: from localhost (c-73-125-98-51.hsd1.fl.comcast.net. [73.125.98.51]) by smtp.gmail.com with UTF8SMTPSA id v22sm16517456qta.60.2022.02.13.13.53.18 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Sun, 13 Feb 2022 13:53:18 -0800 (PST) From: Philip McGrath Date: Sun, 13 Feb 2022 16:51:25 -0500 Message-Id: <20220213215127.218952-10-philip@philipmcgrath.com> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20220213215127.218952-1-philip@philipmcgrath.com> References: <20220213215127.218952-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 Racket's variant of Chez Scheme defines 'string->uninterned-symbol', which conflicts with the definition from '(chez mit)'. See discussion at . * gnu/packages/chez.scm (chez-mit)[origin]: Add workaround for chez-scheme-for-racket. --- gnu/packages/chez.scm | 24 +++++++++++++++++++++++- 1 file changed, 23 insertions(+), 1 deletion(-) diff --git a/gnu/packages/chez.scm b/gnu/packages/chez.scm index 54bbee7923..be251798c3 100644 --- a/gnu/packages/chez.scm +++ b/gnu/packages/chez.scm @@ -355,7 +355,29 @@ (define-public chez-mit (commit (string-append "v" version)))) (sha256 (base32 "0c7i3b6i90xk96nmxn1pc9272a4yal4v40dm1a4ybdi87x53zkk0")) - (file-name (git-file-name name version)))) + (file-name (git-file-name name version)) + (snippet + ;; Workaround for chez-scheme-for-racket. + ;; See: https://github.com/racket/racket/issues/4151 + #~(begin + (use-modules (guix build utils)) + (substitute* "mit/core.sls" + (("[(]import ") + "(import (only (chezscheme) import)\n") + (("[(]define string->uninterned-symbol gensym[)]") + (format #f "~s" + '(begin + (import (only (chezscheme) + meta-cond + library-exports)) + (meta-cond + ((memq 'string->uninterned-symbol + (library-exports '(chezscheme))) + (import (only (chezscheme) + string->uninterned-symbol))) + (else + (define string->uninterned-symbol + gensym))))))))))) (build-system gnu-build-system) (inputs (list chez-srfi)) ; for tests