From patchwork Sat Aug 27 18:55:54 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Philip McGrath X-Patchwork-Id: 42011 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 2B58127BBEA; Sat, 27 Aug 2022 19:59:28 +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 97FDB27BBE9 for ; Sat, 27 Aug 2022 19:59:27 +0100 (BST) Received: from localhost ([::1]:42390 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oS11i-00064v-PV for patchwork@mira.cbaines.net; Sat, 27 Aug 2022 14:59:26 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:36428) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oS10Q-0004Pe-6j for guix-patches@gnu.org; Sat, 27 Aug 2022 14:58:06 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:39111) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oS10P-0001ie-S9 for guix-patches@gnu.org; Sat, 27 Aug 2022 14:58:05 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1oS10P-0008Jl-Od for guix-patches@gnu.org; Sat, 27 Aug 2022 14:58:05 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#57050] [PATCH v4 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: Sat, 27 Aug 2022 18:58:05 +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.166162665631881 (code B ref 57050); Sat, 27 Aug 2022 18:58:05 +0000 Received: (at 57050) by debbugs.gnu.org; 27 Aug 2022 18:57:36 +0000 Received: from localhost ([127.0.0.1]:57085 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oS0zv-0008I5-Nc for submit@debbugs.gnu.org; Sat, 27 Aug 2022 14:57:36 -0400 Received: from mail-ua1-f50.google.com ([209.85.222.50]:40725) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oS0zj-0008Gr-SI for 57050@debbugs.gnu.org; Sat, 27 Aug 2022 14:57:24 -0400 Received: by mail-ua1-f50.google.com with SMTP id i11so1672915ual.7 for <57050@debbugs.gnu.org>; Sat, 27 Aug 2022 11:57:23 -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=K6VMqV4XxLH2WG0Se6j4cPrQ0FaxrHYwnuyjyKquvEM=; b=V4QX8hF46bjXO14oXoAUWqQAr49U+0+CTJkDag2agt+KfBWUJSGV5xa5S+xz/gD7K5 iSe/sJqgPrq//JmV+uxe87/jZKEQx9nVBrNdY/uBJnrGyP4Z7MmjRE8Z5hRNaGc3yCNN eZfkt+j6FMYYBQBuc+ygOkoShyr99tlIpsYUGPXhaOKaow80G9V9MlPNvBhClFuNxHHN c3ydhP/1B6GnhGJ8K7QmEsPJw3BcqzlSBNd/NP/xSdPEBnW/su80sM2VHR82XzRXDuRp iNOWNrbaPumvTQffio+gm05LVO0s6Hf3HZTnaW32vUPm2bZ0MARMhAUwIdQHqzJ3F90f QVzQ== 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=K6VMqV4XxLH2WG0Se6j4cPrQ0FaxrHYwnuyjyKquvEM=; b=hwxKZRqZf2WyBf/vGpU8kZ+nKeoh+W1HHWtW15KT21ZFM81dX4cPguX2RM6ugBC0zU +BY0ZqR1Mo6KX5gKRqnmVTT2up4EVhLjIRwqhEHOGo5vx1iG7CpBVEtJujhBnDfr0GUF PMFzPX/rCOiyfu3a2lsfRPAZTwVXxqtObbpcUp1diJtabDz4wdED8ZcAWb76SUDYDPeu uZ9KnlhvN80w8urfCa1qMBfpHqM+SfMautcSM7d3p2d9ehZKmkHA7tMuCH/4iELbXH88 CGZa6JfvMZ4GAMWGeHg6bGaLdAnzfDGr963D6pExXj3iLe9Pa1sb/01C+w1f9OFACK3L 7uFA== X-Gm-Message-State: ACgBeo0o0g5+u5iAZCrOan4MJ0K13FOCnW2w4v4wtF1Dyr8XL0ZOWXsS /GP7TtCmAU10ZZdDYV/k96NFwlI+pSyZxR9G X-Google-Smtp-Source: AA6agR72htVr9ckmvDuSCI3HT8IMI0lIHEnVvtfaHAYgKkBm4JD0Ol7iKF7i6YUL1nkRwRgd4XjZ7A== X-Received: by 2002:ab0:6685:0:b0:39f:6fb0:870a with SMTP id a5-20020ab06685000000b0039f6fb0870amr1560905uan.61.1661626638353; Sat, 27 Aug 2022 11:57:18 -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 l191-20020a1f25c8000000b003793fcd6747sm738177vkl.13.2022.08.27.11.57.17 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Sat, 27 Aug 2022 11:57:18 -0700 (PDT) From: Philip McGrath Date: Sat, 27 Aug 2022 14:55:54 -0400 Message-Id: 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 74052d47eb..32ea866bff 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 @@ -566,7 +554,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") @@ -684,7 +672,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"))