From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp11.migadu.com ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms0.migadu.com with LMTPS id iAsRLjoVEmIR9gAAgWs5BA (envelope-from ) for ; Sun, 20 Feb 2022 11:17:30 +0100 Received: from aspmx1.migadu.com ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp11.migadu.com with LMTPS id CCNoKzoVEmKf+AAA9RJhRA (envelope-from ) for ; Sun, 20 Feb 2022 11:17:30 +0100 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id C1A8921A7E for ; Sun, 20 Feb 2022 11:17:29 +0100 (CET) Received: from localhost ([::1]:46102 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nLjHU-00088i-Jl for larch@yhetil.org; Sun, 20 Feb 2022 05:17:28 -0500 Received: from eggs.gnu.org ([209.51.188.92]:60554) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nLjH4-00084l-Gz for guix-patches@gnu.org; Sun, 20 Feb 2022 05:17:02 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:37273) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nLjH4-0006Sv-4Y for guix-patches@gnu.org; Sun, 20 Feb 2022 05:17:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1nLjH4-0008AC-1s for guix-patches@gnu.org; Sun, 20 Feb 2022 05:17:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#53878] [PATCH v4 15/15] gnu: racket: Update to 8.4. Resent-From: Liliana Marie Prikler Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 20 Feb 2022 10:17:02 +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: Philip McGrath , 53878@debbugs.gnu.org, Liliana Marie Prikler , Ludovic =?UTF-8?Q?Court=C3=A8s?= Cc: Attila Lendvai , zimoun , Malte Gerdes , raingloom Received: via spool by 53878-submit@debbugs.gnu.org id=B53878.164535218131317 (code B ref 53878); Sun, 20 Feb 2022 10:17:02 +0000 Received: (at 53878) by debbugs.gnu.org; 20 Feb 2022 10:16:21 +0000 Received: from localhost ([127.0.0.1]:59402 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nLjGI-00088w-Mc for submit@debbugs.gnu.org; Sun, 20 Feb 2022 05:16:21 -0500 Received: from mail-ed1-f66.google.com ([209.85.208.66]:33371) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nLjGG-00088h-U7 for 53878@debbugs.gnu.org; Sun, 20 Feb 2022 05:16:13 -0500 Received: by mail-ed1-f66.google.com with SMTP id s14so6086619edw.0 for <53878@debbugs.gnu.org>; Sun, 20 Feb 2022 02:16:12 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=message-id:subject:from:to:cc:date:in-reply-to:references :user-agent:mime-version:content-transfer-encoding; bh=215CgoyXIbSXVG7Cm/sa/Drp0lz5lncSk/mJKN+eRk0=; b=WyoHFkiyJKVWZ+t5IO6Na8je+zqQmo0TfTTq243Oa1pQ7FHPuvCeQixDt7vl01jPQt gJA8m09+WluCedA3+wfOkiSFg0VDpidupLNkCZ1Q86LSmAU0eGz2ZOBRahUnYgd4+rkj SMAqX2zknsxLZWQ/7pdIKx3CFaGpJxVhwZRvaROEtsAXig6J8JSSYM/cURfOdBQYeGyE 8jwVrvh1sRGtTShx/zudWzEPn34iJw5Zr1K2Ec30nKN+o+xWJpXzo0uuwFfdPg/ku8ze 3udGGGGAW/PPEprGcToKHfKz+VkGdKqJ/XbAlm5z/RaTzqiLZd/GeWK8YXIRfHBxarY1 PJ6A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:message-id:subject:from:to:cc:date:in-reply-to :references:user-agent:mime-version:content-transfer-encoding; bh=215CgoyXIbSXVG7Cm/sa/Drp0lz5lncSk/mJKN+eRk0=; b=UXh50DcRGCzku8SDBGqmCHb47AwYAhSc82KeRCOVPsigopSfzGFqwHmeoPSg2u6OsP EfEnRxvKkJazA5D3tvanM5Q/m7lnEne6bTEE0P44FK4adSrEjNjQJtTP1XkoUnAzKrFx Bs1+PWZU1uJg20OtP9umoqfxQHbNZMbrXjXIbyOOw6cV4F/od1bFFcftu3m81XA5EPb6 XlYWcBUeMIynYN9Gs7A8vnwxRnQNw8Oz7jkAZLd2wpNkf6QyEhn/CSO5jWO+gL1yI5qJ lLZ9B4kPhb7nlf+DIepTrSfR7J8S+RwVFyafwjBZnXDQHOFj+7ciaLl/TEN9MA3oJcjA PTcQ== X-Gm-Message-State: AOAM531aRdDN9u1y0vFRX3AHUBGG9uHTrL4b7CvoYtHqL+qNLOsDmlUy QNVeOdHFesbU7plwqdFb/LY= X-Google-Smtp-Source: ABdhPJxrMp3m6kIcfzcUtfnZhDsP9WBzGWkvJkbXg2523+fNTJJFztyleiHpxMc5GBcmX+lLvThY/w== X-Received: by 2002:a50:9f8e:0:b0:410:8c:5dcc with SMTP id c14-20020a509f8e000000b00410008c5dccmr16185967edf.94.1645352166695; Sun, 20 Feb 2022 02:16:06 -0800 (PST) Received: from nijino.fritz.box (85-127-52-93.dsl.dynamic.surfer.at. [85.127.52.93]) by smtp.gmail.com with ESMTPSA id s2sm4051390ejs.113.2022.02.20.02.16.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 20 Feb 2022 02:16:06 -0800 (PST) Message-ID: <39bfc6f557bf2ef03ce22067d5c73adcbb67b167.camel@gmail.com> From: Liliana Marie Prikler Date: Sun, 20 Feb 2022 11:16:04 +0100 In-Reply-To: <20220220060610.178131-16-philip@philipmcgrath.com> References: <20220208151316.1897345-1-philip@philipmcgrath.com> <20220220060610.178131-1-philip@philipmcgrath.com> <20220220060610.178131-16-philip@philipmcgrath.com> Content-Type: text/plain; charset="UTF-8" User-Agent: Evolution 3.42.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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+larch=yhetil.org@gnu.org Sender: "Guix-patches" X-Migadu-Flow: FLOW_IN X-Migadu-Country: US ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1645352250; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding:resent-cc: resent-from:resent-sender:resent-message-id:in-reply-to:in-reply-to: references:references:list-id:list-help:list-unsubscribe: list-subscribe:list-post:dkim-signature; bh=215CgoyXIbSXVG7Cm/sa/Drp0lz5lncSk/mJKN+eRk0=; b=PzITarfgKsff05fLybeSYHLWoCVQ6JJcN+dEo8aDTs6VC7ypHRPMGFUnqbRiolNoSmbkCM 9S/AhavwZbQ9BjK7qRzsb7NCDBjEp7Ya9peRz6Fl/G+4e7oUXmm1OUHb3K4ocRpAUUB4NM XnEh+ogO8vG30iiBXGqPWTQDrr3rTkx03nA71JBvEcb9nuK3CqSLOnOZgvOaVxf4abdgyG SHGtCHRGtQcaB8hBOAL6+/IEG1m2rx89vxg9a/FzRwCcqJsdBN1rVyek/vrPrec7x7Nmlu ueqrNQdz9fWhWAdAiY86idM8hYESCjTp1GWkKikT2os4uFXd3i2jk35fE41CIg== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1645352250; a=rsa-sha256; cv=none; b=ZYELhmwGK0Zb3kUfK4QWcnQnRvYxUDFbwA3sw/G4GyhZLm0KL2E3B8hKASSg1VXqEGenfS ynYbvV1lvjq4FiCXG2ikRTRL8Eje427N5V9jd0fGZ5M7AUY203++HB1sdHx6lTEAXJTsR0 grU80M3cjzgtkv37Ne0F7BJLNBqe3SET5vGOd7ISpehGwFak/npTjaqbD7nRcjXCPQ/1UA pPab+2u1WE2IquQF6RKAN5Xh8HTEO7srqYRH6wR0GDcQJ+bRi9gDl6oI9vx9kDBMuY9GZW Q94lUGWda2e3UEqyRnaSXQNdEyCQvO78rv4zgrDyVvzLtDc8dJFuWmDK0fEuzQ== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20210112 header.b=WyoHFkiy; dmarc=fail reason="SPF not aligned (relaxed)" header.from=gmail.com (policy=none); spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" X-Migadu-Spam-Score: -0.53 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20210112 header.b=WyoHFkiy; dmarc=fail reason="SPF not aligned (relaxed)" header.from=gmail.com (policy=none); spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" X-Migadu-Queue-Id: C1A8921A7E X-Spam-Score: -0.53 X-Migadu-Scanner: scn1.migadu.com X-TUID: UCSGIdLftvGr Hi, Am Sonntag, dem 20.02.2022 um 01:06 -0500 schrieb Philip McGrath: > * gnu/packages/patches/racket-gui-tethered-launcher-backport.patch: > New > file. > * gnu/local.mk (dist_patch_DATA): Add it. > * gnu/packages/chez-and-racket-bootstrap.scm (racket-vm-for-system): > New > procedure. > * gnu/packages/racket.scm (racket-minimal, racket): Update to 8.4. > Rewrite to use 'racket-vm-for-system', label-less inputs, G- > expressions, > and Git origins for main-distribution packages. > --- >  gnu/local.mk                                  |    3 +- >  gnu/packages/chez-and-racket-bootstrap.scm    |   15 +- >  ...acket-gui-tethered-launcher-backport.patch |   26 + >  gnu/packages/racket.scm                       | 1596 +++++++++++---- > -- >  4 files changed, 1118 insertions(+), 522 deletions(-) >  create mode 100644 gnu/packages/patches/racket-gui-tethered- > launcher-backport.patch > > diff --git a/gnu/local.mk b/gnu/local.mk > index 5fcbe3a391..2fb4440eee 100644 > --- a/gnu/local.mk > +++ b/gnu/local.mk > @@ -41,7 +41,7 @@ >  # Copyright © 2020 Vinicius Monego >  # Copyright © 2021 Björn Höfling >  # Copyright © 2021 Greg Hogan > -# Copyright © 2021 Philip McGrath > +# Copyright © 2021, 2022 Philip McGrath >  # Copyright © 2021 Arun Isaac >  # Copyright © 2021 Sharlatan Hellseher >  # Copyright © 2021 Dmitry Polyakov > @@ -1751,6 +1751,7 @@ dist_patch_DATA > =                                         \ >    %D%/packages/patches/rpcbind-CVE-2017-8779.patch             \ >    %D%/packages/patches/rtags-separate- > rct.patch                        \ >    %D%/packages/patches/racket-enable-scheme-backport.patch     \ > +  %D%/packages/patches/racket-gui-tethered-launcher- > backport.patch     \ >    %D%/packages/patches/racket-minimal-sh-via-rktio.patch       \ >    %D%/packages/patches/remake-impure- > dirs.patch                        \ >    %D%/packages/patches/restic-0.9.6-fix-tests-for-go1.15.patch \ > diff --git a/gnu/packages/chez-and-racket-bootstrap.scm > b/gnu/packages/chez-and-racket-bootstrap.scm > index e837d49c63..b779099fb3 100644 > --- a/gnu/packages/chez-and-racket-bootstrap.scm > +++ b/gnu/packages/chez-and-racket-bootstrap.scm > @@ -46,7 +46,8 @@ (define-module (gnu packages chez-and-racket- > bootstrap) >    #:use-module (gnu packages xorg) >    #:use-module ((guix licenses) >                  #:prefix license:) Small note, #:prefix license: should be on the same line as #:use- module. > -(define %racket-version "8.4") > +(define %racket-version "8.4") ; MUST match "racket.scm" > +;; The definition of %racket-version is duplicated to avoid an > import cycle: > +;; see . >  (define %chez-scheme-for-racket-version "9.5.7.3") > [...] > +(define %racket-version "8.4") ; MUST match "chez-and-racket- > bootstrap.scm" > +;; The definition of %racket-version is duplicated to avoid an > import cycle: > +;; see . > +(define %racket-commit > +  (string-append "v" %racket-version)) That works, but it's not really nice. I did send my mail w.r.t. making the bootstrap packages procedures that take racket-version and origin as arguments before reading this mail, but I think my comment still applies mostly. WDYT? > +(define (extract-package-source origin spec) > +  "Extract the source for a Racket package specified by SPEC from > ORIGIN into > +a new file-like object.  In the resulting file-like object, the > package source > +will be in the directory \"/share/racket/pkgs/NAME/\", where NAME is > the Racket > +name for the package. > + > +SPEC is a list of the form: > + > +  (NAME PATH) > + > +where PATH is the path to the package source relative to ORIGIN--- > possibly > +`\".\"`.  As a special case, SPEC may also be given a string, which > is > +equivalent to: > + > +  (NAME NAME) > + > +Examples: Would it make sense to use this procedure for our bootstrap packages already? (In particular for bootfiles or extracting chez-scheme from the racket source). Regarding the big racket package, the recipe currently looks a little nicer in that it no longer overrides `build', but I think we could still do a union-build with #:symlink copy-recursively if the full racket is just racket plus a bunch of packages on top. This would have the benefit that we could declare each of them as a package. Not sure if this is something we ought to address here or in a separate patch set, though.