From patchwork Sat Oct 21 02:01:11 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Philip McGrath X-Patchwork-Id: 55103 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 6A8A727BBE9; Sat, 21 Oct 2023 03:02:56 +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 6E71327BBE2 for ; Sat, 21 Oct 2023 03:02:51 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qu1K3-0000AU-0u; Fri, 20 Oct 2023 22:02:39 -0400 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 1qu1Jz-00009o-Hm for guix-patches@gnu.org; Fri, 20 Oct 2023 22:02:36 -0400 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 1qu1Jz-0007nS-0h for guix-patches@gnu.org; Fri, 20 Oct 2023 22:02:35 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qu1KQ-0001X7-FA for guix-patches@gnu.org; Fri, 20 Oct 2023 22:03:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#56534] [PATCH v2 1/4] gnu: racket: Fix layered documentation rendering. Resent-From: Philip McGrath Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 21 Oct 2023 02:03:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 56534 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 56534@debbugs.gnu.org Cc: Ludovic =?utf-8?q?Court=C3=A8s?= , Philip McGrath , Rostislav Svoboda Received: via spool by 56534-submit@debbugs.gnu.org id=B56534.16978537415810 (code B ref 56534); Sat, 21 Oct 2023 02:03:02 +0000 Received: (at 56534) by debbugs.gnu.org; 21 Oct 2023 02:02:21 +0000 Received: from localhost ([127.0.0.1]:41934 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qu1Jl-0001Vc-A2 for submit@debbugs.gnu.org; Fri, 20 Oct 2023 22:02:21 -0400 Received: from wout5-smtp.messagingengine.com ([64.147.123.21]:44135) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qu1Jj-0001VM-KF for 56534@debbugs.gnu.org; Fri, 20 Oct 2023 22:02:20 -0400 Received: from compute2.internal (compute2.nyi.internal [10.202.2.46]) by mailout.west.internal (Postfix) with ESMTP id 33B8C320096C; Fri, 20 Oct 2023 22:01:46 -0400 (EDT) Received: from mailfrontend1 ([10.202.2.162]) by compute2.internal (MEProxy); Fri, 20 Oct 2023 22:01:46 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= philipmcgrath.com; h=cc:cc:content-transfer-encoding :content-type:content-type:date:date:from:from:in-reply-to :in-reply-to:message-id:mime-version:references:reply-to:sender :subject:subject:to:to; s=fm3; t=1697853705; x=1697940105; bh=Lb NKyNojkk15iD68mbn+2NxZ4DcmxcdlZV4KZTnFocA=; b=NkTdJJp/Fb4qQU5vWH OvQTfCmWXlfg5ZMwCPN5VDB3nG6qBiGnd4NaPWeQ/G4H85THy6R9GUUFALzNkzln I+D6MgX8typ4HYTI200O6fxpPyK2fuekJ4xmUS8fGtOUyyJO+ib+UFr0d+Fda57K yMJusIiEwhZxl07m767jP7ujvbhC3H5+L3c7RUheQzJ2hnwMZUUzlGPWwGiQwmBQ Ok2o0/+eEAJpNOsFdx0JQdXGa8KJegKotBKWoncxwqsfhp6dkHeZKrKTubDWsRQx JWv+l6J3sOJJ0bvNapdRr5HVglac8lx2SWy17gTY+i5bv0HCS+CmYKhYrPeDQDl9 y0kw== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:cc:content-transfer-encoding :content-type:content-type:date:date:feedback-id:feedback-id :from:from:in-reply-to:in-reply-to:message-id:mime-version :references:reply-to:sender:subject:subject:to:to:x-me-proxy :x-me-proxy:x-me-sender:x-me-sender:x-sasl-enc; s=fm3; t= 1697853705; x=1697940105; bh=LbNKyNojkk15iD68mbn+2NxZ4DcmxcdlZV4 KZTnFocA=; b=NhV3EkfKucwKnAsi87jTspCDZMtAMmdlEM0aPH7oN7BM3SPsw7R CP10ZVOwKHRERLb1bcnTZLegY3XfAkU/845TBTqdSVmSEHTAw3ANoBzkt6oQzQjw NRvpEMqMVN1DUiKkSFgvys/kbnLI3xGuWH/wKMAjRn+zVuSpsrb/pCcd1TIhOlfO wa2KAiK3BBBX5LOo6Iw9oys9KBMRJGK/J2pKnrmPmQ8M4EuTeZkjsDFZeYaqI+eE ex2w+V5LaRqa5fsrUNYxU2J0vWHJYpj5SzBLoTQTRf4KyQHdet8Oivt+K/0lYsLN Gj8ZJ00eaDKVIWDb27ZqZNytwfpeVdZz67Q== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvkedrjeelgdehudcutefuodetggdotefrodftvf curfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfghnecu uegrihhlohhuthemuceftddtnecusecvtfgvtghiphhivghnthhsucdlqddutddtmdenuc fjughrpefhvfevufffkffojghfgggtgfesthekredtredtjeenucfhrhhomheprfhhihhl ihhpucfotgfirhgrthhhuceophhhihhlihhpsehphhhilhhiphhmtghgrhgrthhhrdgtoh hmqeenucggtffrrghtthgvrhhnpeeggfeugfeftddvjefhtedtuedvudehheegvedvkefg leevffeftdfhhfekteegffenucffohhmrghinhepghhithhhuhgsrdgtohhmnecuvehluh hsthgvrhfuihiivgeptdenucfrrghrrghmpehmrghilhhfrhhomhepphhhihhlihhpsehp hhhilhhiphhmtghgrhgrthhhrdgtohhm X-ME-Proxy: Feedback-ID: i2b1146f3:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Fri, 20 Oct 2023 22:01:44 -0400 (EDT) From: Philip McGrath Date: Fri, 20 Oct 2023 22:01:11 -0400 Message-ID: <159d655db30eea3a45d9f75e30fd875010ae7aa6.1697849395.git.philip@philipmcgrath.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: References: <80cbe78b-921b-4b05-baa6-7216fec01297@app.fastmail.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-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches We want to create additional Guix packages (e.g. 'racket-with-video') that extend our 'racket' package as the 'racket' package extends 'racket-minimal', using Racket’s support for “layered installations”. Without this fix, rendering the documentation for the new layer would try to write to the parent layer in the store, breaking the build. See upstream discussion at . * gnu/packages/racket.scm (racket)[inputs]: Add an additional snippet to '%racket-origin' when used for the Racket package 'racket-index'. --- gnu/packages/racket.scm | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/gnu/packages/racket.scm b/gnu/packages/racket.scm index 1e97f19dbb..a127f75669 100644 --- a/gnu/packages/racket.scm +++ b/gnu/packages/racket.scm @@ -676,7 +676,18 @@ (define-public racket "algol60" (base32 "03akd7xhn4l7y66qgaimvdbn6gq7ay6j03dc11mz80n06z21dfb6") '(("algol60" "."))) (racket-packages-origin - "racket" %racket-origin + "racket" (origin + (inherit %racket-origin) + (snippet + ;; Workaround for https://github.com/racket/racket/pull/4802 + ;; TODO: When updating to Racket 8.11, include the upstream + ;; fix in %racket-origin (probably as a patch). + #~(begin + #$(origin-snippet %racket-origin) + (substitute* + "pkgs/racket-index/scribblings/main/info.rkt" + (("no-depend-on[)]") + "no-depend-on every-main-layer)"))))) '(("at-exp-lib" "pkgs/at-exp-lib") ("compiler" "pkgs/compiler") ("compiler-lib" "pkgs/compiler-lib")