From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp0 ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms11 with LMTPS id kMuOJAFhUGDnEgAA0tVLHw (envelope-from ) for ; Tue, 16 Mar 2021 07:40:49 +0000 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp0 with LMTPS id sBdUIAFhUGB1NAAA1q6Kng (envelope-from ) for ; Tue, 16 Mar 2021 07:40:49 +0000 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 10C7B13FEC for ; Tue, 16 Mar 2021 08:40:49 +0100 (CET) Received: from localhost ([::1]:39760 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lM4Js-0006jn-1Z for larch@yhetil.org; Tue, 16 Mar 2021 03:40:48 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:60074) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lM4IC-0004O6-2B for guix-patches@gnu.org; Tue, 16 Mar 2021 03:39:05 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:54687) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lM4I9-0003Ex-N7 for guix-patches@gnu.org; Tue, 16 Mar 2021 03:39:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lM4I9-00034j-KQ for guix-patches@gnu.org; Tue, 16 Mar 2021 03:39:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#47153] [PATCH v2] gnu: chez-scheme: Update nanopass to 1.9.2. Resent-From: Leo Prikler Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 16 Mar 2021 07:39:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 47153 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Philip McGrath , 47153@debbugs.gnu.org Received: via spool by 47153-submit@debbugs.gnu.org id=B47153.161588028311731 (code B ref 47153); Tue, 16 Mar 2021 07:39:01 +0000 Received: (at 47153) by debbugs.gnu.org; 16 Mar 2021 07:38:03 +0000 Received: from localhost ([127.0.0.1]:38000 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lM4HC-000336-Mt for submit@debbugs.gnu.org; Tue, 16 Mar 2021 03:38:03 -0400 Received: from mailrelay.tugraz.at ([129.27.2.202]:31551) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lM4HA-00032g-Ed for 47153@debbugs.gnu.org; Tue, 16 Mar 2021 03:38:01 -0400 Received: from nijino.local (217-149-164-20.nat.highway.telekom.at [217.149.164.20]) by mailrelay.tugraz.at (Postfix) with ESMTPSA id 4F04rj10ZGz1LBRx; Tue, 16 Mar 2021 08:37:56 +0100 (CET) DKIM-Filter: OpenDKIM Filter v2.11.0 mailrelay.tugraz.at 4F04rj10ZGz1LBRx DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=tugraz.at; s=mailrelay; t=1615880277; bh=WnQr200Qk9SnkVOKojj7BriLtwiVOpUJJq7v5/oTBac=; h=Subject:From:To:Date:In-Reply-To:References:From; b=b2CPKwIBQwmDWFly3T2QArCEoqLudG9P6WtbqT3Ap/7YtDs5+GnGXLtMbJpeofdLn 8woice21gJFaQ2ZuN9hj3cldu/Iy2ug7bYZNNoTB6asE6w/AJHqzlV9gJje2NGvR7Q uluQYdyTHaU8+f2mjyS+NR6GNZ1DLzksoFCbr9uQ= Message-ID: <6e49888aaab2d2b2284d198eca51d0b9944be613.camel@student.tugraz.at> From: Leo Prikler Date: Tue, 16 Mar 2021 08:37:56 +0100 In-Reply-To: <20210315225302.6597-1-philip@philipmcgrath.com> References: <9581850ed011d311db0388fcda41f8fbcd479730.camel@student.tugraz.at> <20210315225302.6597-1-philip@philipmcgrath.com> Content-Type: text/plain; charset="UTF-8" User-Agent: Evolution 3.34.2 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-TUG-Backscatter-control: bt4lQm5Tva3SBgCuw0EnZw X-Spam-Scanner: SpamAssassin 3.003001 X-Spam-Score-relay: -1.9 X-Scanned-By: MIMEDefang 2.74 on 129.27.10.116 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 ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1615880449; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to: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=WnQr200Qk9SnkVOKojj7BriLtwiVOpUJJq7v5/oTBac=; b=X5XUvpF3Am2pd9cL6TKyYcrjsDVgYND0bCPSURHQKD1DclKijHnxyXGcy8evbMNKzfWsVm wlaCi0eLEMc25uD2EkJaWaFvt0MKMRqiMmyjx4v6WFhssWZ53WVbniRVqj0CivPrAsVlEr 84dWTIrPmtsh7kn+bqSUdeUbdRZwEpPUZ7v7dTOrkrrb59/cei30uiLgSoE4rqqDyxEbQk pnteiL/Fq3z48bjHAWrKPKxqfIvAdr9GlJsws9M6+bPg9CiZvWEFeaO0KTQ4rkdJqkjam+ TOrI96o1uJOl0hRDoEqUd278ywuOcDfryHgiyL735WG3XYOARttEdw0UmYnI6A== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1615880449; a=rsa-sha256; cv=none; b=mZwgM2WVRdxVzYRVh2Yuw4wF/koq/TiCDXkSc2xYuqQh+OyS1uhKdD4raxpNy3IYk+1Zr1 7y6C4rFTXnhL+s1TndlG378j+0Y+bt0z4D+YjYOSRsaynCLLAp0pmaHUUMpWEM12e2oOyG ZFhCS/vQrSu3NhrK5C4S9zJjDlAspzHIH7ygfS+6mN/Hd3m89Ps3sSwI5b86V4kD0gYKPc 6sYRhccK77xpAoJWCL7zY18LoWLhoge/iZc8+p+ZuYQgd8ZEQdY180KJBR3rCJPeu1gd+C tvGu7aBd31EOuRzyr/BbvgkzvhlMEXomRkmjoSIXzjNtbCy8j8jdlfaKhOS9aQ== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=tugraz.at header.s=mailrelay header.b=b2CPKwIB; spf=pass (aspmx1.migadu.com: domain of guix-patches-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-patches-bounces@gnu.org X-Migadu-Spam-Score: -1.30 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=tugraz.at header.s=mailrelay header.b=b2CPKwIB; dmarc=fail reason="SPF not aligned (relaxed)" header.from=student.tugraz.at (policy=none); spf=pass (aspmx1.migadu.com: domain of guix-patches-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-patches-bounces@gnu.org X-Migadu-Queue-Id: 10C7B13FEC X-Spam-Score: -1.30 X-Migadu-Scanner: scn0.migadu.com X-TUID: IWpsAjI+f7uC Hi, Am Montag, den 15.03.2021, 18:53 -0400 schrieb Philip McGrath: > - (sha256 (base32 > "1synadgaycca39jfx525975ss9y0lkl516sdrc62wrrllamm8n21")) > + (sha256 > "16vjsik9rrzbabbhbxbaha51ppi3f9n8rk59pc6zdyffs0vziy4i") You're inadvertently stripping away base32. > - (sha256 (base32 > "1q5i8pf4cdfjsj6r2k1rih7ljbfggyxdng2p2fvsgarzihpsin2i")) > + (sha256 > "01jnvw8qw33gnpzwrakwhsr05h6b609lm180jnspcrb7lds2p23d") Same here. > - (commit (string-append "v" version)))) > + ;; This commit includes a fix for which we would > + ;; otherwise want to use a snippet. > + ;; When there's a new tagged release, > + ;; go back to using (string-append "v" version) > + (commit "54051494434a197772bf6ca5b4e6cf6be55f39a5"))) Could we then not cherry-pick this commit as a patch? Or is there more needed? > + ;; pre-built bootfiles for unsupported > systems: > + "boot/a6nt" > + "boot/a6osx" > + "boot/i3nt" > + "boot/i3osx" > + "boot/ta6nt" > + "boot/ta6osx" > + "boot/ti3nt" > + "boot/ti3osx"))))))) What about pre-built bootfiles for supported systems? Do we still need those? If we so, I don't think it is right to delete anything in boot; if not we should delete it altogether. > + ;; put these where configure expects them to be > + (add-after 'unpack 'unpack-nanopass+stex > + (lambda* (#:key native-inputs inputs #:allow-other-keys) > + (let ((patch-source-shebangs > (assoc-ref %standard-phases 'patch-source- > shebangs))) I don't think you need patch-source-shebangs directly after unpack. Those shebangs would be patched in their phase anyway – the only reason we needed it before was because we delayed unpacking until configure. > + (setenv "CC" "gcc") This should be determined via cc-for-target. > + (apply invoke > + "./configure" > + flags) This can very likely be one line. Also, it should probably be done via configure-flags. > [outputs]: Add "stex" I don't think an stex output is justified in and of itself, or is it needed for chez to function? (Even if it was, it would then need to be part of the "out" output.) I personally doubt this; if you need stex itself for your purposes, you can try packaging it later. > + (flags (if (assoc-ref inputs "ncurses") > + flags > + (cons "--disable-curses" > + flags))) > + (flags (if (assoc-ref inputs "libx11") > + flags > + (cons "--disable-x11" > + flags)))) These will probably be detected by the build system itself, there's no need for you to add them. If not, then it's up to the packager of other variants to specify them, not you. > + (flags (list > + (string-append "--installprefix=" out) > + (string-append "ZLIB=" zlib-static > "/lib/libz.a") > + (string-append "LZ4=" lz4-static > "/lib/liblz4.a") > + "--nogzip-man-pages" ;; guix will do it > + "--threads")) This should be done via #:configure-flags. Now that I think of it… > + (replace 'configure I don't think this is needed at all. At most, you should filter the incompatible flags from configure-flags in some way, but you might also want to patch configure, so that it swallows them. > Refactor 'install-doc' phase into 'build+install-stex' and > 'build+install-doc' 'build+install' implies, that it should actually be two phases, build and install. I already talked about install-stex, so you should only refactor install-doc insofar as it is needed to accommodate changes in the build system. Regards, Leo