From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp12.migadu.com ([2001:41d0:303:e16b::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms8.migadu.com with LMTPS id 2L1NIYtcVWUUzgAAauVa8A:P1 (envelope-from ) for ; Thu, 16 Nov 2023 01:04:27 +0100 Received: from aspmx1.migadu.com ([2001:41d0:303:e16b::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp12.migadu.com with LMTPS id 2L1NIYtcVWUUzgAAauVa8A (envelope-from ) for ; Thu, 16 Nov 2023 01:04:27 +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 2A88A5CB11 for ; Thu, 16 Nov 2023 01:04:27 +0100 (CET) Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=philipmcgrath.com header.s=fm1 header.b=sEFKSIp7; dkim=fail ("headers rsa verify failed") header.d=messagingengine.com header.s=fm1 header.b="M 6B7jDr"; 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"; dmarc=none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1700093067; 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:autocrypt:autocrypt; bh=5zj2DCTseSzWpMO9REZm5BMyVzLzDdbD6qTaqkG9lRo=; b=rsjVzUwM/hAfXMJ8jNAjxMzh6+CJJCMtsacWEwGXjvlB6sVUqo7W8ArVCtRStYaUdysXf/ LL1lfMXdrHpShmC73/7S9K80IZTkF6nDbq4wVSxxOLRCXguYsnFdt0nh0ABlKYKIjgJRt4 QHzf8SN1s8DSGugbiC7buGIl2LGMLZcr0JytfmaqIHtCZWlZc8bai1qoAdNUGtfv+4JJPY WParEiTlGMGNXTHx7q2REbgY4x9ysNGaeNUDn2JENXXAfJhRypZAQusCR1Xgiv5e5kvS7i e44eVmHQ1c4XWBrYYyNWhcYHXJirTBRUunPPztSb+fNe4RKu+BGL0f58WeTnDg== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=philipmcgrath.com header.s=fm1 header.b=sEFKSIp7; dkim=fail ("headers rsa verify failed") header.d=messagingengine.com header.s=fm1 header.b="M 6B7jDr"; 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"; dmarc=none ARC-Seal: i=1; s=key1; d=yhetil.org; t=1700093067; a=rsa-sha256; cv=none; b=c7j04QvDL6AbgRS6ZjRFgbgU1F6H5FWENAU6QZgJTXH/OXnymlEa5l8gKmwRJLISh2uEXS eQblnrNrAo82QYiFtnuncdijl2bKnokoC1/Igh7LkxTpTLMGWPTbTCx8fpGHO5oJ1NwjYT tOQb4/pXy8Jhbb4KMKF4DDjWDTz/+eLXu/7HJ1i4WCF24KZkaAZYKfZfyEjlNYErOJHTcJ q0KwZnXpacKyPhrdAWktvgj2oTi2wdGeELAYRRpW8e9lBXy8iU1ALq84+tjQ1aI7c1Q8of zGWOVKVPGuA5bjvfAvdkx6OJea6anEiBATUGnJIs7eMvtfW9UtyB58f5Rp3rpg== Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1r3Prg-00070B-08; Wed, 15 Nov 2023 19:04:13 -0500 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 1r3PrX-0006zU-MS for guix-patches@gnu.org; Wed, 15 Nov 2023 19:04:04 -0500 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 1r3PrX-0004at-D8 for guix-patches@gnu.org; Wed, 15 Nov 2023 19:04:03 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1r3PrW-0005tz-EM for guix-patches@gnu.org; Wed, 15 Nov 2023 19:04:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#67019] [PATCH 03/16] gnu: Add lessc. Resent-From: Philip McGrath Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 16 Nov 2023 00:04:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 67019 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Liliana Marie Prikler , 67019@debbugs.gnu.org Received: via spool by 67019-submit@debbugs.gnu.org id=B67019.170009301922654 (code B ref 67019); Thu, 16 Nov 2023 00:04:02 +0000 Received: (at 67019) by debbugs.gnu.org; 16 Nov 2023 00:03:39 +0000 Received: from localhost ([127.0.0.1]:54184 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1r3Pr8-0005tI-Nj for submit@debbugs.gnu.org; Wed, 15 Nov 2023 19:03:39 -0500 Received: from wout1-smtp.messagingengine.com ([64.147.123.24]:48791) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1r3Pr4-0005t3-Vl for 67019@debbugs.gnu.org; Wed, 15 Nov 2023 19:03:37 -0500 Received: from compute2.internal (compute2.nyi.internal [10.202.2.46]) by mailout.west.internal (Postfix) with ESMTP id E20213200A07; Wed, 15 Nov 2023 19:03:28 -0500 (EST) Received: from mailfrontend1 ([10.202.2.162]) by compute2.internal (MEProxy); Wed, 15 Nov 2023 19:03:29 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= philipmcgrath.com; h=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=fm1; t=1700093008; x=1700179408; bh=5zj2DCTseS zWpMO9REZm5BMyVzLzDdbD6qTaqkG9lRo=; b=sEFKSIp7gU5waldxVZTrKzFOB2 oZE7gPEEr+SjWavfs9Bp+0iCjm0DTmqnTInWUN1G0I68TfGbtOyM4r30sV8pnXkk JNWLw3FqGUt9hSgCR2I0T2Gxvqpomc1qhySUFS0neOWc92WHGmA+x8qbgnbKTtyX D9qAZjEw6gY3CKQpRWF1gi5YqlE7Te6gwOK8Lc0OoBSTJkPYkPFMxVRo8k3d37Fh 8HSl0s3rKyowjzbYfiIaetLkuVDSQut8p54x+mz+Yw/XSK1Wa0W6m87jC5yyowcU SwTb4oOGmcMx62Zupc0+YlDy6q0Zog68W45mI3bJuoPj+5ibASDYaUHIYYSQ== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=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=fm1; t=1700093008; x= 1700179408; bh=5zj2DCTseSzWpMO9REZm5BMyVzLzDdbD6qTaqkG9lRo=; b=M 6B7jDr3iaHLGbP6ADxzFNE+Ggi+s74pDCLk07ismP4coXotuJWptSHRa6J45RnlL MZzK0/n9NR/C815neERgv2Nv0izQPbWnNIYpa+1VM3lqmpXaFHL2GXFimJcARcbI fP3snYiwl+3gEOQNGDDWEYKME3+izdZBO3KeIczmIWza16EYqiTGntvRiP5jdjNM l7oLj4kSnrIMDGo32zW2UI0CiA7kdv+OuPMqPKBB0HUBuaZ724fEdvVlhVi/nNZp H9mpKsgg/lzeYHJ5aotMoMar2aDkbvkHdw64uo9RSaPoNi+7BpW5N6t5QIbiNmX6 Vb6s2eDqbs+69UGS57e6A== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvkedrudefjedgudejucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucesvcftvggtihhpihgvnhhtshculddquddttddmne cujfgurhepkfffgggfuffvfhfhjggtgfesthekredttddvjeenucfhrhhomheprfhhihhl ihhpucfotgfirhgrthhhuceophhhihhlihhpsehphhhilhhiphhmtghgrhgrthhhrdgtoh hmqeenucggtffrrghtthgvrhhnpedvieekfffgtdeiiedtjeejjeffvefghfdtvddvleel udejhfevuddttedugfejfeenucevlhhushhtvghrufhiiigvpedtnecurfgrrhgrmhepmh grihhlfhhrohhmpehphhhilhhiphesphhhihhlihhpmhgtghhrrghthhdrtghomh X-ME-Proxy: Feedback-ID: i2b1146f3:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Wed, 15 Nov 2023 19:03:27 -0500 (EST) Message-ID: <13a1da53-4273-4ebf-aa58-4c23d1f5a641@philipmcgrath.com> Date: Wed, 15 Nov 2023 19:03:26 -0500 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Content-Language: en-US References: <522f4e2a30c81dc738096bac21f46be50ddd8563.camel@gmail.com> From: Philip McGrath Autocrypt: addr=philip@philipmcgrath.com; keydata= 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 FFu7icw= In-Reply-To: <522f4e2a30c81dc738096bac21f46be50ddd8563.camel@gmail.com> Content-Type: text/plain; charset=UTF-8; format=flowed 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-bounces+larch=yhetil.org@gnu.org X-Migadu-Flow: FLOW_IN X-Migadu-Country: US X-Migadu-Spam-Score: -2.18 X-Spam-Score: -2.18 X-Migadu-Queue-Id: 2A88A5CB11 X-Migadu-Scanner: mx13.migadu.com X-TUID: sQnycUAwRIpD Hi, On 11/15/23 15:23, Liliana Marie Prikler wrote: > Am Mittwoch, dem 15.11.2023 um 14:35 -0500 schrieb Philip McGrath: >> On 11/10/23 19:56, Liliana Marie Prikler wrote: >>> Am Donnerstag, dem 09.11.2023 um 11:26 -0500 schrieb Philip >>> McGrath: >>>> * gnu/packages/web.scm (lessc): New variable. >>>> >>>> [...] >>  >> >>>> +          (add-after 'avoid-parse-node-version 'do-not-target- >>>> es5 >>>> +            (lambda args >>>> +              ;; esbuild can't compile all features to ES5 >>>> +              (with-atomic-json-file-replacement "tsconfig.json" >>>> +                (match-lambda >>>> +                  (('@ . alist) >>>> +                   (cons '@ >>>> +                    (map (match-lambda >>>> +                           (("compilerOptions" '@ . alist) >>>> +                            `("scripts" @ ,@(filter (match- >>>> lambda >>>> +                                                      (("target" >>>> "ES5") >>>> +                                                       #f) >>>> +                                                      (_ >>>> +                                                       #t)) >>>> +                                                    alist))) >>>> +                           (other >>>> +                            other)) >>>> +                         alist))))))) >>>> +          (add-after 'do-not-target-es5 'patch-build-script >>>> +            (lambda args >>>> +              (define new-build-script >>>> +                (string-join >>>> +                 `("esbuild" >>>> +                   "--platform=node" >>>> +                   "--format=cjs" >>>> +                   "--outdir=lib" >>>> +                   ,@(find-files "src/less" "\\.js$") >>>> +                   ,@(find-files "src/less-node" "\\.js$")))) >>>> +              (with-atomic-json-file-replacement "package.json" >>>> +                (match-lambda >>>> +                  (('@ . alist) >>>> +                   (cons '@ >>>> +                    (map (match-lambda >>>> +                           (("scripts" @ . alist) >>>> +                            `("scripts" @ ,@(map (match-lambda >>>> +                                                   (("build" . >>>> _) >>>> +                                                    (cons >>>> "build" >>>> +                                                          new- >>>> build- >>>> script)) >>>> +                                                   (other >>>> +                                                    other)) >>>> +                                                 alist))) >>>> +                           (other >>>> +                            other)) >>>> +                         alist))))))) >>> Can we somehow save a bit of horizontal real-estate here?  Same >>> goes >>> for 1 and 2. >> >> To clarify, do you mean vertical or horizontal? > I do mean horizontal. > > [...] > >> >> I could also imagine breaking these lines: >> >>  >> +                           (("scripts" @ . alist) >>  >> +                            `("scripts" @ ,@(map (match-lambda >> >> instead as: >> >>  >> +                           (("scripts" >>  >> +                             @ . alist) >>  >> +                            `("scripts" >>  >> +                              @ ,@(map (match-lambda >> >> but that doesn't seem like much of an improvement to me. > But what about breaking lines before (match-lambda? That ought to at > least give us enough to get (_ #f) onto a single line, no? > Maybe I'm confused: there isn't (_ #f) anywhere. There is currently enough space to put (other other) on a single line, but I thought it was better style to put a newline between the match pattern and the expression, especially when the pattern is not _. Breaking before match-lambda gets enough space to put (cons "build" new-build-script) on a single line, but I don't think it looks better overall: > (add-after 'do-not-target-es5 'patch-build-script > (lambda args > (define new-build-script > (string-join > `("esbuild" > "--platform=node" > "--format=cjs" > "--outdir=lib" > ,@(find-files "src/less" "\\.js$") > ,@(find-files "src/less-node" "\\.js$")))) > (with-atomic-json-file-replacement "package.json" > (match-lambda > (('@ . alist) > (cons '@ > (map > (match-lambda > (("scripts" @ . alist) > `("scripts" @ ,@(map > (match-lambda > (("build" . _) > (cons "build" new-build-script)) > (other > other)) > alist))) > (other > other)) > alist))))))) Using delete in do-not-target-es5 does seem like a minor improvement: > (add-after 'avoid-parse-node-version 'do-not-target-es5 > (lambda args > ;; esbuild can't compile all features to ES5 > (with-atomic-json-file-replacement "tsconfig.json" > (match-lambda > (('@ . alist) > (cons '@ > (map (match-lambda > (("compilerOptions" '@ . alist) > `("scripts" @ ,@(delete '("target" "ES5") > alist))) > (other > other)) > alist))))))) Philip