From patchwork Thu Aug 25 08:54:16 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Philip McGrath X-Patchwork-Id: 41949 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 C285327BBEA; Thu, 25 Aug 2022 10:20:04 +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_INVALID, DKIM_SIGNED,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 4242027BBE9 for ; Thu, 25 Aug 2022 10:20:04 +0100 (BST) Received: from localhost ([::1]:44346 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oR91v-0002uh-DF for patchwork@mira.cbaines.net; Thu, 25 Aug 2022 05:20:03 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:43476) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oR8fg-00025w-Vn for guix-patches@gnu.org; Thu, 25 Aug 2022 04:57:05 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:59164) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oR8fg-0003Ct-NW for guix-patches@gnu.org; Thu, 25 Aug 2022 04:57:04 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1oR8fg-0002cy-KK for guix-patches@gnu.org; Thu, 25 Aug 2022 04:57:04 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#57050] [PATCH v3 14/14] gnu: racket: Use Racket CS on all systems. Resent-From: Philip McGrath Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 25 Aug 2022 08:57:04 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 57050 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 57050@debbugs.gnu.org Cc: Philip McGrath , Thiago Jung Bauermann , "\(" , Maxime Devos , Liliana Marie Prikler , Efraim Flashner , Liliana Marie Prikler Received: via spool by 57050-submit@debbugs.gnu.org id=B57050.166141782110049 (code B ref 57050); Thu, 25 Aug 2022 08:57:04 +0000 Received: (at 57050) by debbugs.gnu.org; 25 Aug 2022 08:57:01 +0000 Received: from localhost ([127.0.0.1]:48907 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oR8fd-0002c0-2v for submit@debbugs.gnu.org; Thu, 25 Aug 2022 04:57:01 -0400 Received: from mail-ua1-f46.google.com ([209.85.222.46]:33682) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oR8ev-0002aI-Bl for 57050@debbugs.gnu.org; Thu, 25 Aug 2022 04:56:17 -0400 Received: by mail-ua1-f46.google.com with SMTP id x12so7713780uaf.0 for <57050@debbugs.gnu.org>; Thu, 25 Aug 2022 01:56:17 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=philipmcgrath.com; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc; bh=qcG8nUWE2bT+aW0ZpsFpRuuOBnS9NUTQSy0PurD9LSQ=; b=M4wpXOnifbfdmhaiuPqBguelP91h78p/lSFLgn5QJyi1IidfAgLgvhBnUYrYE7ZSDr WgDCZCgfeCNbY1b99rhsaOZmJ/NOeLi5XRs7oMfXQeuMa15eNARFeCaYAdKfNvPkUd/8 7iZOhavrZ93IH4QgMfGRgT6h8akUItHp3kgS+D6XtVXp2ZSgEe/PwlxmRA/EKGKRnig2 g+LehReWseEICN3WSuK3cKfGDdxrIT0bL7apKeTJJV+P7JoyJuHs2iHiO4B4hSq6uaIB Mw4jdpKk4aBiv8+KpkTce2aH2YQat+/pjRBXAu5veMb+ACPQcVossc0X53aBIwIeEvLk SuRg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc; bh=qcG8nUWE2bT+aW0ZpsFpRuuOBnS9NUTQSy0PurD9LSQ=; b=kJ5nRvlvjJSuz6Y+z9rLS9f3fdAua0PDtbXP3hZr4u4FPkBtBB6wI9ubcpAbpYfMmM gP+QE21RwTKmRwqpYq3DORKdLmiutLLXiI0QYkQMEkYDlbvgGlE7HyypommqLCR5D3FN rNuPF+RnTJsOm4CHRszQtmhK5wbbSjSYi3gtVbWFKbhIbhokWalJdS715Dxcy73qngfs eZh7yPXvdSJqWoJFezuJj3YWtnP4zTXwH0PH7AataQWWGSYEfObKUV5Zm7jO49Q+MR5A lz7g1cZG1yvM8wdLFRwQlXT1NfBLKkcKW/3v0Gbcyv56iXcGDJxbhcmL1jXNCoynsnE5 /2ww== X-Gm-Message-State: ACgBeo28Jmg39dGPXUFbrDFVOQypWa/7lLpwmCc4ktFuIIGHSy4u7ZPu MG1mhHMFodXcv1hBpdK06I/H6CFZb7v2VQz6 X-Google-Smtp-Source: AA6agR7srd2ipHnE9XdHQMiZf66xqbKpCz/cD4odkJ7Wy6PclttrEXFwSVGAq4P7EvXwseLwLEw5XQ== X-Received: by 2002:ab0:c19:0:b0:381:cadf:91b3 with SMTP id a25-20020ab00c19000000b00381cadf91b3mr989389uak.93.1661417771946; Thu, 25 Aug 2022 01:56:11 -0700 (PDT) Received: from localhost (c-73-125-98-51.hsd1.fl.comcast.net. [73.125.98.51]) by smtp.gmail.com with UTF8SMTPSA id y3-20020ab07843000000b0038467d003e3sm15276777uaq.38.2022.08.25.01.56.11 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Thu, 25 Aug 2022 01:56:11 -0700 (PDT) From: Philip McGrath Date: Thu, 25 Aug 2022 04:54:16 -0400 Message-Id: <9b429caf1d9cd6574debcb11065b957874d2a31a.1661416343.git.philip@philipmcgrath.com> X-Mailer: git-send-email 2.32.0 In-Reply-To: References: 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 This patch uses the 'pbarch' support added to 'racket-vm-cs' to make it the default Racket VM implementation on all systems. * gnu/packages/racket.scm (racket-vm-for-system): Remove. (racket-minimal, racket)[inputs]: Replace '(racket-vm-for-system)' with 'racket-vm-cs'. --- gnu/packages/racket.scm | 20 ++++---------------- 1 file changed, 4 insertions(+), 16 deletions(-) diff --git a/gnu/packages/racket.scm b/gnu/packages/racket.scm index 2d6bebf10e..16ad6eef8f 100644 --- a/gnu/packages/racket.scm +++ b/gnu/packages/racket.scm @@ -128,10 +128,9 @@ (define-module (gnu packages racket) ;; This file defines the packages 'racket-vm-cgc', 'racket-vm-bc', and ;; 'racket-vm-cs'. All three are in-place builds of 'racket/src/' and ;; 'racket/collects/' and are installed to 'opt/racket-vm/' in the store -;; output. The function 'racket-vm-for-system' returns the recomended Racket -;; VM package for a given system. +;; output. ;; -;; We then define the packages 'racket-minimal' and +;; Using 'racket-vm-cs', we then define the packages 'racket-minimal' and ;; 'racket'. These use Racket's support for ``layered installations'', which ;; allow an immutable base layer to be extended with additional packages. ;; They use the layer configuration directly provide ready-to-install FHS-like @@ -192,17 +191,6 @@ (define-module (gnu packages racket) ;; ;; CODE: -(define* (racket-vm-for-system #:optional - (system (or (%current-target-system) - (%current-system)))) - "Return 'racket-vm-cs' if we are able to build it for SYSTEM; 'racket-vm-bc' -otherwise." - ;; Once we figure out the issues in https://racket.discourse.group/t/950, - ;; we can use 'racket-vm-cs' everywhere. - (if (racket-cs-native-supported-system? system) - racket-vm-cs - racket-vm-bc)) - (define %racket-version "8.6") ; Remember to update chez-scheme-for-racket! (define %zuo-version "1.0") ; defined in racket/src/zuo/zuo.c (define %racket-commit @@ -568,7 +556,7 @@ (define-public racket-minimal (inputs (list openssl sqlite - (racket-vm-for-system) + racket-vm-cs (racket-packages-origin "base" %racket-origin '(("base" "pkgs/base") @@ -686,7 +674,7 @@ (define-public racket unixodbc libedit ;; TODO reconsider in light of expeditor and readline-gpl racket-minimal ;; <-- TODO non-tethered layer - (racket-vm-for-system) + racket-vm-cs (simple-racket-origin "2d" (base32 "0fb5v6058ls08xw3zbmqyr2ym0psm119gl9ffgmhm9w8rs9i4dq7") '("2d" "2d-doc" "2d-lib"))