From unknown Fri Jun 20 07:17:02 2025 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 X-Mailer: MIME-tools 5.509 (Entity 5.509) Content-Type: text/plain; charset=utf-8 From: bug#67019 <67019@debbugs.gnu.org> To: bug#67019 <67019@debbugs.gnu.org> Subject: Status: [PATCH 00/16] gnu: Add KaTeX, lessc, and flow-remove-types. Reply-To: bug#67019 <67019@debbugs.gnu.org> Date: Fri, 20 Jun 2025 14:17:02 +0000 retitle 67019 [PATCH 00/16] gnu: Add KaTeX, lessc, and flow-remove-types. reassign 67019 guix-patches submitter 67019 Philip McGrath severity 67019 normal tag 67019 patch thanks From debbugs-submit-bounces@debbugs.gnu.org Thu Nov 09 11:08:07 2023 Received: (at submit) by debbugs.gnu.org; 9 Nov 2023 16:08:07 +0000 Received: from localhost ([127.0.0.1]:48435 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1r17ZQ-000423-Gr for submit@debbugs.gnu.org; Thu, 09 Nov 2023 11:08:07 -0500 Received: from lists.gnu.org ([2001:470:142::17]:41990) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1r17ZL-00041D-47 for submit@debbugs.gnu.org; Thu, 09 Nov 2023 11:07:50 -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 1r17Yc-0002vm-7o for guix-patches@gnu.org; Thu, 09 Nov 2023 11:07:02 -0500 Received: from wout5-smtp.messagingengine.com ([64.147.123.21]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1r17Ya-00026T-8u for guix-patches@gnu.org; Thu, 09 Nov 2023 11:07:01 -0500 Received: from compute3.internal (compute3.nyi.internal [10.202.2.43]) by mailout.west.internal (Postfix) with ESMTP id 026283200B23 for ; Thu, 9 Nov 2023 11:06:56 -0500 (EST) Received: from mailfrontend1 ([10.202.2.162]) by compute3.internal (MEProxy); Thu, 09 Nov 2023 11:06:57 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= philipmcgrath.com; h=cc:content-transfer-encoding:content-type :date:date:from:from:in-reply-to:message-id:mime-version :reply-to:sender:subject:subject:to:to; s=fm3; t=1699546016; x= 1699632416; bh=OU/ULF/irqS7voIl9RkjQ1EOnPVP3CF0cAjRI0hPVms=; b=L V6rFuoa4lDx3arqwZJf/MWSZ7NveVPQ/H7zzJhn+qFhJ/hGirwvzMCMs9pBAB/mA HqSuCy08B2IBsF82kTS/sGGXLphUOIRIHzuz/QvLFe0KIvI0UdFpaGrBYVdZMgJS RpKbhNKvRmqeIIoHkSxft5QVYUkJHpifNQjYXcWO6J929zApXeYreMwX1KlU8zbd xfjD3eNYpwXC2UXgyvySxyAnXz/yn/MjnrqBG/BRBmjtThSOSyF3EKBEecJPLfq4 IV197gykNcmw3JXKhSSKFk4UoCmW04lBTcsCcuiNI2ty/dwQMlSiI7SflTL3WdYq 44DTFW1B8nAI1j8mGPPxA== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-transfer-encoding:content-type :date:date:feedback-id:feedback-id:from:from:in-reply-to :message-id:mime-version: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=1699546016; x=1699632416; bh=OU/ULF/irqS7voIl9RkjQ1EOnPVP 3CF0cAjRI0hPVms=; b=ofjCZVv4AgQdhd7lS0t9uQydiQtmSa/98f4bza3zOssi tJHwlpgkHnxDwxf7TIDzuQn8yFcC9m8aSLJQ/DLotFt/RZ8lPp0X7p7yRYeARR8S 9tlOvYVOO+ZbeYPZVcPid8bGA9QRMmaoQk2WlCZGHO1RRydBx81YvpFWbnP1i/l9 8V9ji8Ybbf/LkgI/ugQN+KjxLnJ1NbTCgRb9hjCOT2ovvEW3Ub0viotxHL9dfWyX QMqxSgmvJaWT4dV6o/Ccm+KNUhNy8IMNrZiRjQVwTT6OHlmM3vIUys+sW7sN3a6l gX16ug/k7ObT7Ve3KDR2rVGEYcirp/PSHsMtOV930A== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvkedruddvuddgkedvucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucenucfjughrpefhvffufffkofgggfestdekredtre dttdenucfhrhhomheprfhhihhlihhpucfotgfirhgrthhhuceophhhihhlihhpsehphhhi lhhiphhmtghgrhgrthhhrdgtohhmqeenucggtffrrghtthgvrhhnpefgleekieeiffehff ffhefhheethfduhefhueejvdeiieffheefffeftdeiudekieenucevlhhushhtvghrufhi iigvpedtnecurfgrrhgrmhepmhgrihhlfhhrohhmpehphhhilhhiphesphhhihhlihhpmh gtghhrrghthhdrtghomh X-ME-Proxy: Feedback-ID: i2b1146f3:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA for ; Thu, 9 Nov 2023 11:06:55 -0500 (EST) From: Philip McGrath To: guix-patches@gnu.org Subject: [PATCH 00/16] gnu: Add KaTeX, lessc, and flow-remove-types. Date: Thu, 9 Nov 2023 11:06:29 -0500 Message-ID: X-Mailer: git-send-email 2.41.0 MIME-Version: 1.0 X-Debbugs-Cc: Philip McGrath , Julien Lepiller , pukkamustard Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=64.147.123.21; envelope-from=philip@philipmcgrath.com; helo=wout5-smtp.messagingengine.com X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: submit X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Hi, This patch series adds KaTeX, which renders TeX math notation to HTML and/or MathML. (It's somewhat similar to MathJax, but with different emphases: in particular, the rendered output from KaTeX doesn't require JavaScript.) Along the way, this series adds two dependencies of KaTeX that are especially notable in their own right: 1. Patches 01/16 to 03/16 add lessc, the compiler for the Less CSS extension language (not to be confused with the pager less). 2. Patches 04/16 to 11/16 add flow-remove-types, which erases Flow type annotations from JavaScript source code. This enables Guix to build software written using Flow somewhat analagously to how esbuild does with TypeScript. Philip Philip McGrath (16): gnu: Add node-is-what. gnu: Add node-copy-anything. gnu: Add lessc. gnu: Add ocaml-wtf8. gnu: Add ocaml-visitors. gnu: Add ocaml-ppx-gen-rec. gnu: Add ocaml-dtoa. gnu: Add node-vlq. gnu: Add ocaml-flow-parser. gnu: Add node-flow-parser. gnu: Add flow-remove-types. gnu: js-commander: Update to 11.1.0. gnu: js-commander: Install as a node module. gnu: Add mftrace. gnu: Add font-katex. gnu: Add katex. gnu/packages/fontutils.scm | 45 +++++ gnu/packages/javascript.scm | 381 +++++++++++++++++++++++++++++++++-- gnu/packages/node-xyz.scm | 220 +++++++++++++++++++++ gnu/packages/ocaml.scm | 99 ++++++++++ gnu/packages/web.scm | 385 ++++++++++++++++++++++++++++++++++++ 5 files changed, 1113 insertions(+), 17 deletions(-) base-commit: 19fe24c5b978a16cbca3cddbfa3ab9d1ee2c68f2 -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Thu Nov 09 11:15:02 2023 Received: (at 67019) by debbugs.gnu.org; 9 Nov 2023 16:15:03 +0000 Received: from localhost ([127.0.0.1]:48448 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1r17gM-0004GP-Ey for submit@debbugs.gnu.org; Thu, 09 Nov 2023 11:15:02 -0500 Received: from wout5-smtp.messagingengine.com ([64.147.123.21]:58017) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1r17gJ-0004Fc-Bs for 67019@debbugs.gnu.org; Thu, 09 Nov 2023 11:15:00 -0500 Received: from compute1.internal (compute1.nyi.internal [10.202.2.41]) by mailout.west.internal (Postfix) with ESMTP id 334543200754; Thu, 9 Nov 2023 11:14:14 -0500 (EST) Received: from mailfrontend1 ([10.202.2.162]) by compute1.internal (MEProxy); Thu, 09 Nov 2023 11:14:14 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= philipmcgrath.com; h=cc:cc:content-transfer-encoding :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=1699546453; x=1699632853; bh=E5IupjeBbL q8FEGOhGUFOfGxUd7pyAq4UrFRk0wuaQY=; b=OEUhb0xP0sEKT8wtbHTU2s0vC5 ilDFP4jwyQXrFpuUAixIJuHRBHjn0zvY6SkJOo0Fyh3qd6OKPLaulekglXtoxCEu PVuhnglXpJ2CthORCaHo9G8C8bVIMcPbFe0thnOA2h0Xer7yIHvH8eZO4rCX0aij rj87hCQXPQGlTyTnvBKf6jC9NRn6ulyDXiL+FhnQk7VBcV0cUOHAnfSZlTBhzTey GD47YoS91OKuxwEecUKTl0SSv64KuQOpOjd55aOeQgUZ6y+FmUUAc90Tu0onl/F1 7QlcG1inozxZdnDy6TmNO6aMq+gcqE3kF9GssZ6jKeA3SQBLRZBWb/40vcew== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:cc:content-transfer-encoding :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=1699546453; x= 1699632853; bh=E5IupjeBbLq8FEGOhGUFOfGxUd7pyAq4UrFRk0wuaQY=; b=R rNAzz3DaWs0K72uVEr28rVgsDmpfhyGAJa8YWjUiMz5qwe359dDfAioPhHLFD7vx ggI4ZY3XVIiyWtS457zvcVyTEczooDMEovrYZ/uU2fwovY2/IGZAEUDnzQxclwCP pw1A+cc9wHVTszhhz1sXxzgegL1tkV46PDHyLZGmxSS4B4YC4QSAn9dMnAg2RYL5 nkiyMILGGxuHIuODJSLaSXMoRttVQdVNFYG8HhjewbN2GvqBMeTaVdEQ8J6s0CbZ wGdjfC+3oqNqhfqZcwHEub7uL14H4BGjNdkTAUob89+GyiUSO3mMYn9+LDnWW9ju 0fe+YGg2K2HUnblWav24Q== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvkedruddvuddgkeehucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucenucfjughrpefhvfevufffkffojghfggfgsedtke ertdertddtnecuhfhrohhmpefrhhhilhhiphcuofgtifhrrghthhcuoehphhhilhhiphes phhhihhlihhpmhgtghhrrghthhdrtghomheqnecuggftrfgrthhtvghrnhepgfevgfelje ekgefhgeeigfdvhfeukefgvdduieegtdetvdfhvdffjeeggfduffeknecuffhomhgrihhn pehgihhthhhusgdrtghomhdpnhhpmhhjshdrtghomhenucevlhhushhtvghrufhiiigvpe dtnecurfgrrhgrmhepmhgrihhlfhhrohhmpehphhhilhhiphesphhhihhlihhpmhgtghhr rghthhdrtghomh X-ME-Proxy: Feedback-ID: i2b1146f3:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Thu, 9 Nov 2023 11:14:12 -0500 (EST) From: Philip McGrath To: 67019@debbugs.gnu.org Subject: [PATCH 01/16] gnu: Add node-is-what. Date: Thu, 9 Nov 2023 11:12:18 -0500 Message-ID: <2ac6934211cc66575c8c0c53461effc3bcf8fbdf.1699540553.git.philip@philipmcgrath.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 67019 Cc: Philip McGrath X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) * gnu/packages/node-xyz.scm (node-is-what): New variable. --- gnu/packages/node-xyz.scm | 81 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 81 insertions(+) diff --git a/gnu/packages/node-xyz.scm b/gnu/packages/node-xyz.scm index 6c16417309..49760ded2b 100644 --- a/gnu/packages/node-xyz.scm +++ b/gnu/packages/node-xyz.scm @@ -1631,3 +1631,84 @@ (define-public node-yazl @item Prefer to open input files one at a time than all at once. @end enumerate") (license license:expat))) + +(define-public node-is-what + (package + (name "node-is-what") + (version "4.1.16") + (source + (origin (method git-fetch) + (uri (git-reference + (url "https://github.com/mesqueeb/is-what") + (commit (string-append "v" version)))) + (sha256 + (base32 "02h76klvjxgk0cl8a7sq4wbi7l4pvdimbams08l34k5carg03bdx")) + (snippet + #~(for-each delete-file + '("dist/cjs/index.cjs" + "dist/index.js"))) + (file-name (git-file-name name version)))) + (build-system node-build-system) + (native-inputs (list esbuild)) + (arguments + (list + #:tests? #f ; needs more dependencies + #:modules + `((guix build node-build-system) + (ice-9 match) + (guix build utils)) + #:phases + #~(modify-phases %standard-phases + (add-after 'patch-dependencies 'delete-dependencies + (lambda args + (delete-dependencies + '(;; devDependencies + "@typescript-eslint/eslint-plugin" + "@typescript-eslint/parser" + "del-cli" + "eslint" + "eslint-config-prettier" + "eslint-plugin-tree-shaking" + "np" + "prettier" + "prettier-plugin-jsdoc" + "rollup" + "rollup-plugin-dts" + "rollup-plugin-esbuild" + "rollup-plugin-typescript2" + "typedoc" + "typescript" + "vitest")))) + (add-after 'delete-dependencies 'patch-build-script + (lambda args + (define esbuild + "esbuild --bundle --platform=node") + (define new-build-script + (string-append + esbuild + " --format=cjs --outfile=dist/cjs/index.cjs src/index.ts" + " && " + esbuild + " --format=esm --outfile=dist/index.js src/index.ts")) + (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)))))))))) + (home-page "https://npmjs.com/is-what") + (synopsis "Type predicate functions for JavaScript") + (description "This package provides simple and small type predicate +functions for JavaScript, such as @code{isString}, @code{isDate}, and +@code{isPlainObject}.") + (license license:expat))) -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Thu Nov 09 11:27:56 2023 Received: (at 67019) by debbugs.gnu.org; 9 Nov 2023 16:27:56 +0000 Received: from localhost ([127.0.0.1]:48467 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1r17sp-0004Zy-J3 for submit@debbugs.gnu.org; Thu, 09 Nov 2023 11:27:55 -0500 Received: from wout5-smtp.messagingengine.com ([64.147.123.21]:56719) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1r17sm-0004Zf-52 for 67019@debbugs.gnu.org; Thu, 09 Nov 2023 11:27:54 -0500 Received: from compute5.internal (compute5.nyi.internal [10.202.2.45]) by mailout.west.internal (Postfix) with ESMTP id 00348320095C; Thu, 9 Nov 2023 11:27:06 -0500 (EST) Received: from mailfrontend1 ([10.202.2.162]) by compute5.internal (MEProxy); Thu, 09 Nov 2023 11:27:07 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= philipmcgrath.com; h=cc:cc:content-transfer-encoding :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=1699547226; x=1699633626; bh=wTfCkR6nx9 494RMShtidiWRHC466SgApjQMOOyLBocE=; b=vVoiFk4buHHWV4tr3yYr/e0cze hjAPYYRj7QZpnfQWtrskCeVi8YxPad5U6XEYZo2JWFVPvGK2r5wCGyM2190ZH3g4 Stucf+enwo8e9bHqZk/zxFRIaQhzgrgK2wl74fjsJrLHg70Kwm+aLyj4GmHNX6Qg ycGR9nZpQTgDY46zzelku/LYYh4sG/jgrxSVWPlNv4+RfOXuKaHwSrZgTGWr+BHv JIPLWzbJA7X2UP8rDR137sN5g8ZxH+YBnD6wcg93wjX3Dh4ZVL0iY1tPysGjV1/c 2eMPTi/UgYVQ5FByuFI8RLnFvq5H+r2ygZ4SENZfaQ5lMbrSpymexE9oikiw== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:cc:content-transfer-encoding :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=1699547226; x= 1699633626; bh=wTfCkR6nx9494RMShtidiWRHC466SgApjQMOOyLBocE=; b=J ZEJagDjaXRgIH6RZMIzwtMZ0oEZbWbg+diM8yWZJniNjDsGv4XFNinBC2QwO+Ngk PgQiDFF6U2TU3zBEz/mBxXbMVUhEPQZPDv0bv+QeYkeBslQW3NqoHbuKRPCST+b6 Ykn7GfHlm4b3TQqlvrEJ/pcTrFHo9tYn2/IBOkhBqeiC6UCwA3YN4idrji5e7qT/ L9Scy/NWRQp+mkr+Y6vhZisnhkoL4IsvMEV4mudM4E54CCzO2rUHxiMtjcRlhqEj rHvK5ulVjpAYCzi7pNk0JkpyJQttP7z6sS5nRknIYop6OR2hfLSkM79D731+ur64 LNsTOZXA1qjaGwqTMbK/g== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvkedruddvuddgkeejucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucenucfjughrpefhvfevufffkffojghfggfgsedtke ertdertddtnecuhfhrohhmpefrhhhilhhiphcuofgtifhrrghthhcuoehphhhilhhiphes phhhihhlihhpmhgtghhrrghthhdrtghomheqnecuggftrfgrthhtvghrnhepgfevgfelje ekgefhgeeigfdvhfeukefgvdduieegtdetvdfhvdffjeeggfduffeknecuffhomhgrihhn pehgihhthhhusgdrtghomhdpnhhpmhhjshdrtghomhenucevlhhushhtvghrufhiiigvpe dtnecurfgrrhgrmhepmhgrihhlfhhrohhmpehphhhilhhiphesphhhihhlihhpmhgtghhr rghthhdrtghomh X-ME-Proxy: Feedback-ID: i2b1146f3:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Thu, 9 Nov 2023 11:27:05 -0500 (EST) From: Philip McGrath To: 67019@debbugs.gnu.org Subject: [PATCH 02/16] gnu: Add node-copy-anything. Date: Thu, 9 Nov 2023 11:26:24 -0500 Message-ID: <0e821283aa47a488700cd018e7487ed5498a01ba.1699540553.git.philip@philipmcgrath.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: References: MIME-Version: 1.0 X-Debbugs-Cc: Philip McGrath , Julien Lepiller , pukkamustard Content-Transfer-Encoding: 8bit X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 67019 Cc: Philip McGrath X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) * gnu/packages/node-xyz.scm (node-copy-anything): New variable. --- gnu/packages/node-xyz.scm | 81 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 81 insertions(+) diff --git a/gnu/packages/node-xyz.scm b/gnu/packages/node-xyz.scm index 49760ded2b..ee96dee767 100644 --- a/gnu/packages/node-xyz.scm +++ b/gnu/packages/node-xyz.scm @@ -1712,3 +1712,84 @@ (define-public node-is-what functions for JavaScript, such as @code{isString}, @code{isDate}, and @code{isPlainObject}.") (license license:expat))) + +(define-public node-copy-anything + (package + (name "node-copy-anything") + (version "3.0.5") + (source + (origin (method git-fetch) + (uri (git-reference + (url "https://github.com/mesqueeb/copy-anything") + (commit (string-append "v" version)))) + (sha256 + (base32 "1lpjqanjl04k088banpns4yvp6hgf97snaj7gfbfancjpd3i8gk6")) + (snippet + #~(for-each delete-file + '("dist/cjs/index.cjs" + "dist/index.js"))) + (file-name (git-file-name name version)))) + (build-system node-build-system) + (native-inputs (list esbuild)) + (inputs (list node-is-what)) + (arguments + (list + #:tests? #f ; needs more dependencies + #:modules + `((guix build node-build-system) + (ice-9 match) + (guix build utils)) + #:phases + #~(modify-phases %standard-phases + (add-after 'patch-dependencies 'delete-dependencies + (lambda args + (delete-dependencies + '(;; devDependencies + "@typescript-eslint/eslint-plugin" + "@typescript-eslint/parser" + "del-cli" + "eslint" + "eslint-config-prettier" + "eslint-plugin-tree-shaking" + "np" + "prettier" + "rollup" + "rollup-plugin-dts" + "rollup-plugin-esbuild" + "rollup-plugin-typescript2" + "typescript" + "vitest")))) + (add-after 'delete-dependencies 'patch-build-script + (lambda args + (define esbuild + "esbuild --bundle --platform=node --external:is-what") + (define new-build-script + (string-append + esbuild + " --format=cjs --outfile=dist/cjs/index.cjs src/index.ts" + " && " + esbuild + " --format=esm --outfile=dist/index.js src/index.ts")) + (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)))))))))) + (home-page "https://npmjs.com/copy-anything") + (synopsis "JavaScript library for copying objects and arrays") + (description "This library provides deep copying for JavaScript objects +and arrays. Its design emphasizes speed, simplicity, and correctness in the +face of complications like special objects, symbols, and non-enumerable +properties.") + (license license:expat))) -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Thu Nov 09 11:27:59 2023 Received: (at 67019) by debbugs.gnu.org; 9 Nov 2023 16:27:59 +0000 Received: from localhost ([127.0.0.1]:48475 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1r17st-0004aH-19 for submit@debbugs.gnu.org; Thu, 09 Nov 2023 11:27:59 -0500 Received: from wout5-smtp.messagingengine.com ([64.147.123.21]:49067) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1r17sq-0004Zl-Uk for 67019@debbugs.gnu.org; Thu, 09 Nov 2023 11:27:58 -0500 Received: from compute1.internal (compute1.nyi.internal [10.202.2.41]) by mailout.west.internal (Postfix) with ESMTP id EDC823200A47; Thu, 9 Nov 2023 11:27:11 -0500 (EST) Received: from mailfrontend1 ([10.202.2.162]) by compute1.internal (MEProxy); Thu, 09 Nov 2023 11:27:12 -0500 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=1699547231; x=1699633631; bh=X8 T714oE9ZipKjkX5kE5e32FxrrxamzQp48QtiM0e6g=; b=2eblErYI8SGjrYgUud D9CG72SfcRpcdGQNIRPbLQHn4VqLqPp6bhQqVf8O2U8TcOI5WBdtfWbtL9/6A00x Lodx9OYbs67DiKh1R1ZkSmjIPxq+gyyZpPruJHqRKSvQJI1EQJFXoNtFIMuZLGYn 2inAHiZzOgkt/mOWksKpxWpH6A8Y9Gx4ObFMyXCkCsClDifzbL1JP/0eaCoQNE/A Tdv0xyrmL3SbMWS4RHvjv3YOsOQAPyxSOalY8RR0Ado8c3fr7yZ41s7XZ/uToYUr XcuA6FH1hoTKxTnJIqHgMmfPLBZNxKS4pN418vIP+fIQwzq8sVOavKbXr9XR4j+V 4zhA== 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= 1699547231; x=1699633631; bh=X8T714oE9ZipKjkX5kE5e32FxrrxamzQp48 QtiM0e6g=; b=ETpuIjVtnB9lDNnCqQ17SsmUJpEgFjCIrMzdAyGBjYIDVHLhCFI tbI9yy2OW6qJ5mIsG4vN1kairbq2RVIuhi0vrum4Bi04wyP8/zvCIUZZLj8tY2kq pGZrstZPhvwpKzrOQD1TkeNc03SZXyCSX1px8Dd4RdfkZ9lm6HX9LUmxWGdooOqT fauUGFQgz8g95+T7khjPJlMmkQ1dieniIUzMmfk6rIU4+D7Ao60X6cuEPNMK18Mj NQzKr2yxKQJ8+k2Ty0M8M//B+88bVXW13myY0dPqPoz8551MlzEnq4Ss5HXlr8wF k81h/KAiBvPg0/N7H6lkz0LC1j0Uwz5/g2w== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvkedruddvuddgkeejucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucenucfjughrpefhvfevufffkffojghfgggtgfesth ekredtredtjeenucfhrhhomheprfhhihhlihhpucfotgfirhgrthhhuceophhhihhlihhp sehphhhilhhiphhmtghgrhgrthhhrdgtohhmqeenucggtffrrghtthgvrhhnpefhgfekhf dtgfeitdetuefhvedvteefvdevuddtkefgvdevhfekveejuefgfeekheenucffohhmrghi nhepghhithhhuhgsrdgtohhmpdhlvghsshgtshhsrdhorhhgnecuvehluhhsthgvrhfuih iivgeptdenucfrrghrrghmpehmrghilhhfrhhomhepphhhihhlihhpsehphhhilhhiphhm tghgrhgrthhhrdgtohhm X-ME-Proxy: Feedback-ID: i2b1146f3:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Thu, 9 Nov 2023 11:27:10 -0500 (EST) From: Philip McGrath To: 67019@debbugs.gnu.org Subject: [PATCH 03/16] gnu: Add lessc. Date: Thu, 9 Nov 2023 11:26:25 -0500 Message-ID: X-Mailer: git-send-email 2.41.0 In-Reply-To: References: MIME-Version: 1.0 X-Debbugs-Cc: Philip McGrath , Julien Lepiller , pukkamustard Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 67019 Cc: Philip McGrath X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) * gnu/packages/web.scm (lessc): New variable. --- gnu/packages/web.scm | 187 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 187 insertions(+) diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index 66d09700db..8e22997957 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -64,6 +64,7 @@ ;;; Copyright © 2023 David Thompson ;;; Copyright © 2023 Christopher Howard ;;; Copyright © 2023 Felix Lechner +;;; Copyright © 2023 Philip McGrath ;;; ;;; This file is part of GNU Guix. ;;; @@ -98,6 +99,7 @@ (define-module (gnu packages web) #:use-module (guix build-system gnu) #:use-module (guix build-system go) #:use-module (guix build-system meson) + #:use-module (guix build-system node) #:use-module (guix build-system perl) #:use-module (guix build-system pyproject) #:use-module (guix build-system python) @@ -168,6 +170,7 @@ (define-module (gnu packages web) #:use-module (gnu packages ncurses) #:use-module (gnu packages networking) #:use-module (gnu packages node) + #:use-module (gnu packages node-xyz) #:use-module (gnu packages nss) #:use-module (gnu packages openldap) #:use-module (gnu packages openstack) @@ -2343,6 +2346,190 @@ (define-public sassc/libsass-3.5 "0830pjcvhzxh6yixj82x5k5r1xnadjqzi16kp53213icbly0r9ma"))))))) (properties '((hidden? . #t))))) +(define-public lessc + (package + (name "lessc") + (version "4.2.0") + (source + (origin (method git-fetch) + (uri (git-reference + (url "https://github.com/less/less.js") + (commit (string-append "v" version)))) + (sha256 + (base32 "1b6anlafk7lnayxy3vhsi474jcdah2ffaw2qyac5s2ibxb1wmr54")) + (snippet + #~(begin + (use-modules (guix build utils)) + (delete-file-recursively "packages/less/dist"))) + (file-name (git-file-name name version)))) + (build-system node-build-system) + (native-inputs (list esbuild)) + (inputs (list node-copy-anything)) + (arguments + (list + #:tests? #f ; many more dependencies + #:modules + `((guix build node-build-system) + (ice-9 match) + (guix build utils)) + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'chdir + (lambda args + (chdir "packages/less"))) + (add-after 'patch-dependencies 'delete-dependencies + (lambda args + (delete-dependencies + '(;; dependencies + "parse-node-version" ; patched out + "tslib" ; probably not needed w/ esbuild + ;; devDependencies + "@less/test-data" + "@less/test-import-module" + "@rollup/plugin-commonjs" + "@rollup/plugin-json" + "@rollup/plugin-node-resolve" + "@typescript-eslint/eslint-plugin" + "@typescript-eslint/parser" + "benny" + "bootstrap-less-port" + "chai" + "cross-env" + "diff" + "eslint" + "fs-extra" + "git-rev" + "globby" + "grunt" + "grunt-cli" + "grunt-contrib-clean" + "grunt-contrib-connect" + "grunt-eslint" + "grunt-saucelabs" + "grunt-shell" + "html-template-tag" + "jit-grunt" + "less-plugin-autoprefix" + "less-plugin-clean-css" + "minimist" + "mocha" + "mocha-headless-chrome" + "mocha-teamcity-reporter" + "nock" + "npm-run-all" + "performance-now" + "phin" + "promise" + "read-glob" + "resolve" + "rollup" + "rollup-plugin-terser" + "rollup-plugin-typescript2" + "semver" + "shx" + "time-grunt" + "ts-node" + "typescript" + "uikit" + ;; optionalDependencies + "errno" + "graceful-fs" + "image-size" + "make-dir" + "mime" + "needle" + "source-map")))) + (add-after 'delete-dependencies 'avoid-parse-node-version + (lambda args + (define version + #$(package-version this-package)) + (substitute* "src/less/index.js" + (("import [{] version [}]" orig) + (string-append "// " orig)) + (("import parseVersion from 'parse-node-version';" orig) + (string-append "// " orig)) + (("const v = parseVersion[(]`v\\$[{]version[}]`[)];" orig) + (string-append "// " orig)) + (("(version: )(\\[v\\.major, v\\.minor, v\\.patch],)" _ lhs rhs) + (string-append + lhs + "[" + (string-join + (list-head (string-split + version (char-set-complement char-set:digit)) + 3) + ", ") + "], // " + rhs))))) + (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))))))) + (add-after 'build 'build-browser + (lambda args + (invoke "esbuild" + "--bundle" + "--platform=browser" + "--format=cjs" + "--outfile=dist/less.js" + "src/less-browser/bootstrap.js") + (invoke "esbuild" + "--bundle" + "--minify" + "--sourcemap" + "--platform=browser" + "--format=cjs" + "--outfile=dist/less.min.js" + "src/less-browser/bootstrap.js")))))) + (home-page "https://lesscss.org") + (synopsis "Compiler for @acronym{Less} @acronym{CSS} language extension") + ;; XXX: @abbr{} seems better for Less (which is always capitalized that + ;; way), but it is rejected as invalid Texinfo markup here. + (description "@acronym{Less, Leaner Style Sheets} is a +backwards-compatible language extension for @acronym{CSS}. This package +provides @command{lessc}, which compiles Less files to plain @acronym{CSS}.") + (license license:asl2.0))) + (define-public perl-apache-logformat-compiler (package -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Thu Nov 09 11:28:02 2023 Received: (at 67019) by debbugs.gnu.org; 9 Nov 2023 16:28:02 +0000 Received: from localhost ([127.0.0.1]:48483 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1r17sv-0004ae-Mx for submit@debbugs.gnu.org; Thu, 09 Nov 2023 11:28:02 -0500 Received: from wout5-smtp.messagingengine.com ([64.147.123.21]:58459) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1r17st-0004Zr-Up for 67019@debbugs.gnu.org; Thu, 09 Nov 2023 11:28:00 -0500 Received: from compute4.internal (compute4.nyi.internal [10.202.2.44]) by mailout.west.internal (Postfix) with ESMTP id EDB8F3200B56; Thu, 9 Nov 2023 11:27:14 -0500 (EST) Received: from mailfrontend1 ([10.202.2.162]) by compute4.internal (MEProxy); Thu, 09 Nov 2023 11:27:15 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= philipmcgrath.com; h=cc:cc:content-transfer-encoding :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=1699547234; x=1699633634; bh=QvgChRQ5Cl uj4mlf8xoUQBN/Lo8HstlmvjAE0E2Cjdo=; b=AJ/gx5TTkpFVdHvPpEcS5jr0JF HifagEltYznBuEybWm8n9MKBw+3jnHM8b/qpIcoQE4W4btHV+WVKFzWkXRp/N21T 01fGSQqQizgPPcvdPN6e6kvuBMKLbcsU72pOfj+seDuvtZpye+9k9TAb+qms5Wjl 9aLevhIlaan3u/9W9q8krHXa6VnAyGxUSNEmIn6lRJ5+DyMu2/krGztTHlOQbnHK +ly+gpN+EIrqvUNbWMrk8z43RQOoUsbOPgsFhCZue0aOB/uwaIK0u6xZX+6TE9Pk 9e7vZCLJNAKIDVeEyI/dxO1rTaR7oV9RqTV4pqym2lRhPqnwz7RKevdxogrQ== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:cc:content-transfer-encoding :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=1699547234; x= 1699633634; bh=QvgChRQ5Cluj4mlf8xoUQBN/Lo8HstlmvjAE0E2Cjdo=; b=t tOxBHQAIaZkyAasi4xsTNmLqEfHXWKA/OtAzeS/NCIjljvvCTpLCsjErgWOgGRIb CzYp03v5zhU8gMEj007KHk7N9w9fUg8Z5l7ItG9Xl1oZ2/R/Vu/8UYrn0M5QUWDM 9rU2isVlr4LOoSwb0hBkYh3AtRUWlSn6YWgSnHhv9C7GlRXo0Qy/+1zszqiZ3PBC ddwVSd8dq1m8bhWgDw7TA/Aht++mnDHf/WOJ/2GEa2x+UILWQImxYZbXVDVfQIXh Xk6KWCx1oaaZaENxVWzkazP96hKE9ALVDmZdKCQMOKybyyb/4T8Fv7rr1YI85Ydn N+tjRnnqLkfQzFHcvJ6UA== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvkedruddvuddgkeejucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucenucfjughrpefhvfevufffkffojghfggfgsedtke ertdertddtnecuhfhrohhmpefrhhhilhhiphcuofgtifhrrghthhcuoehphhhilhhiphes phhhihhlihhpmhgtghhrrghthhdrtghomheqnecuggftrfgrthhtvghrnhepledtteevud euueduheefheeuieehudekiefgtddttdelfeevveehhfejudelkeegnecuffhomhgrihhn pehinhhrihgrrdhfrhenucevlhhushhtvghrufhiiigvpedtnecurfgrrhgrmhepmhgrih hlfhhrohhmpehphhhilhhiphesphhhihhlihhpmhgtghhrrghthhdrtghomh X-ME-Proxy: Feedback-ID: i2b1146f3:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Thu, 9 Nov 2023 11:27:13 -0500 (EST) From: Philip McGrath To: 67019@debbugs.gnu.org Subject: [PATCH 05/16] gnu: Add ocaml-visitors. Date: Thu, 9 Nov 2023 11:26:27 -0500 Message-ID: <75521995e3f961afa09fe9f7b382b518cfd7283c.1699540553.git.philip@philipmcgrath.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: References: MIME-Version: 1.0 X-Debbugs-Cc: Philip McGrath , Julien Lepiller , pukkamustard Content-Transfer-Encoding: 8bit X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 67019 Cc: Philip McGrath X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) * gnu/packages/ocaml.scm (ocaml-visitors): New variable. --- gnu/packages/ocaml.scm | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index 50b0d1ddb7..f9a3932d18 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -5232,6 +5232,28 @@ (define-public ocaml-graph (description "OCamlgraph is a generic graph library for OCaml.") (license license:lgpl2.1))) +(define-public ocaml-visitors + (package + (name "ocaml-visitors") + (version "20210608") + (source (origin + (method url-fetch) + (uri + (string-append "https://gitlab.inria.fr/fpottier/visitors/-/" + "archive/" version "/archive.tar.gz")) + (sha256 + (base32 + "1yx4bjw4yw3zi35yfp66x320xgb9f8jh7rqj1j7hrrvn0f60m2y2")))) + (build-system dune-build-system) + (propagated-inputs (list ocaml-ppxlib ocaml-ppx-deriving ocaml-result)) + (home-page "https://gitlab.inria.fr/fpottier/visitors") + (synopsis "OCaml syntax extension for generating visitor classes") + (description + "This package provides an OCaml syntax extension that automatically +generates object-oriented visitors for traversing and transforming data +structures.") + (license license:lgpl2.1))) + (define-public ocaml-piqi (package (name "ocaml-piqi") -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Thu Nov 09 11:28:06 2023 Received: (at 67019) by debbugs.gnu.org; 9 Nov 2023 16:28:06 +0000 Received: from localhost ([127.0.0.1]:48504 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1r17sz-0004bi-KR for submit@debbugs.gnu.org; Thu, 09 Nov 2023 11:28:06 -0500 Received: from wout5-smtp.messagingengine.com ([64.147.123.21]:52397) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1r17sv-0004a5-HP for 67019@debbugs.gnu.org; Thu, 09 Nov 2023 11:28:02 -0500 Received: from compute1.internal (compute1.nyi.internal [10.202.2.41]) by mailout.west.internal (Postfix) with ESMTP id 91FA63200B61; Thu, 9 Nov 2023 11:27:16 -0500 (EST) Received: from mailfrontend1 ([10.202.2.162]) by compute1.internal (MEProxy); Thu, 09 Nov 2023 11:27:16 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= philipmcgrath.com; h=cc:cc:content-transfer-encoding :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=1699547236; x=1699633636; bh=uBPGilGjd9 Aw7cXVuG4eXD+LGRM9MnxL+qpQY+GT7EU=; b=OizVtL385PLBBckDfGpDq0DTvS P5dmAbiGcFDmpad2qqw1fwUjGJHDV1ziyXtVp2qf/G6QCISUpljjdWpQqggmPMSr ayIr4FJncOUxcwrouGunJWJ8KKNzJOCKZ9oZaU9k9QLe6uDpAyoV2ZN5ZLi7xjPQ ZQsXjhx6Ok0f3b2Nnx6+XNh+kNR0BOtB+dWWO1Xb7fSl0rjohxCChPlUTRFD0qct cfntzeK4MLMfzjMDkeut/HW7l4RUz7l120m6q35eKcJIFl1hKc5HisMRsnlbPPhI lCaJl9aUIwkKprOHlguJnr/aEIeuQVmAPp4/Y0JM9PFYgMQYRfsrBMUd5WlQ== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:cc:content-transfer-encoding :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=1699547236; x= 1699633636; bh=uBPGilGjd9Aw7cXVuG4eXD+LGRM9MnxL+qpQY+GT7EU=; b=U 5WO2aJGq0pOmHNTGsS10DTa9SQI0WT9lWxe+jWzAg1eP8grTABNX/EP7URNCeY3Y VhwMZCgo4KsKs/kWN0sw56ZluZuHwZqrsDr/BVrmVKkKSVlIjJTS7qNgzyMDfhAW n49Br2FZZERQKNYEsUcQEtMTLVI8yINnqsLFYPHyRy0uBl+F9Q6X7WjuMtm+nZSr PNP9RnnA5tCscHEyoN6pf6MkNJI3cqvjwcSk37GVgNmYKLWU6QzQhdmpkHryUlIH KdWzYf2QEkroAf48R4zbWlewBseB5g0D/iCe+M40n8XIy3wLDtTghf1ZoUDqS9Hb E6C1K4Ol0yuePDqxuE3sQ== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvkedruddvuddgkeejucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucenucfjughrpefhvfevufffkffojghfggfgsedtke ertdertddtnecuhfhrohhmpefrhhhilhhiphcuofgtifhrrghthhcuoehphhhilhhiphes phhhihhlihhpmhgtghhrrghthhdrtghomheqnecuggftrfgrthhtvghrnhepudehvdefje etfffffeektdehtdetudfhtdfhuddtueeukefhveehhfehvdfhheffnecuffhomhgrihhn pehgihhthhhusgdrtghomhenucevlhhushhtvghrufhiiigvpedtnecurfgrrhgrmhepmh grihhlfhhrohhmpehphhhilhhiphesphhhihhlihhpmhgtghhrrghthhdrtghomh X-ME-Proxy: Feedback-ID: i2b1146f3:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Thu, 9 Nov 2023 11:27:15 -0500 (EST) From: Philip McGrath To: 67019@debbugs.gnu.org Subject: [PATCH 06/16] gnu: Add ocaml-ppx-gen-rec. Date: Thu, 9 Nov 2023 11:26:28 -0500 Message-ID: <68e5bf3706131231c8c9bb8736eb944bda35cd12.1699540553.git.philip@philipmcgrath.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: References: MIME-Version: 1.0 X-Debbugs-Cc: Philip McGrath , Julien Lepiller , pukkamustard Content-Transfer-Encoding: 8bit X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 67019 Cc: Philip McGrath X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) * gnu/packages/ocaml.scm (ocaml-ppx-gen-rec): New variable. --- gnu/packages/ocaml.scm | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index f9a3932d18..b12c12fad5 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -6722,6 +6722,34 @@ (define-public ocaml-ppx-deriving on type definitions, and a set of useful plugins for common tasks.") (license license:expat))) +(define-public ocaml-ppx-gen-rec + (package + (name "ocaml-ppx-gen-rec") + (version "2.0.0") + (source (origin + (method url-fetch) + (uri + (string-append "https://github.com/flow/ocaml-ppx_gen_rec/" + "releases/download/v" + version + "/ppx_gen_rec-v" version ".tbz")) + (sha256 + (base32 + "0ncy7ps0w3cnb3nk6y1j4v4g60rs500qwv1daw3a9n7n8kjj6qzy")))) + (build-system dune-build-system) + (propagated-inputs (list ocaml-ppxlib)) + (native-inputs (list ocaml-ppx-deriving)) + (properties `((upstream-name . "ppx_gen_rec"))) + (home-page "https://github.com/flow/ocaml-ppx_gen_rec") + (synopsis "Ppx rewriter for recursive module expressions") + (description + "This package provides a ppx rewriter that transforms a recursive module +expression into a struct. In a recursive module expression, the struct can be +derived from the signature automatically by the compiler. This package does +the same thing, but doing it this way allows @code{ppx_deriving} to transform +the signature and the struct separately.") + (license license:expat))) + (define-public ocaml-ppx-derivers (package (name "ocaml-ppx-derivers") -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Thu Nov 09 11:28:07 2023 Received: (at 67019) by debbugs.gnu.org; 9 Nov 2023 16:28:07 +0000 Received: from localhost ([127.0.0.1]:48513 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1r17t0-0004bq-7f for submit@debbugs.gnu.org; Thu, 09 Nov 2023 11:28:07 -0500 Received: from wout5-smtp.messagingengine.com ([64.147.123.21]:52397) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1r17sw-0004a5-C8 for 67019@debbugs.gnu.org; Thu, 09 Nov 2023 11:28:03 -0500 Received: from compute6.internal (compute6.nyi.internal [10.202.2.47]) by mailout.west.internal (Postfix) with ESMTP id 920193200BC9; Thu, 9 Nov 2023 11:27:22 -0500 (EST) Received: from mailfrontend1 ([10.202.2.162]) by compute6.internal (MEProxy); Thu, 09 Nov 2023 11:27:22 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= philipmcgrath.com; h=cc:cc:content-transfer-encoding :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=1699547242; x=1699633642; bh=oXyW5k3LoW QwMqn5DQHK7XqcSzj5s6qU/KLP/eITOMM=; b=mHZ6m9VlkZHDxe2dipAckenwrm pgAaTLqGTUbCnIKTmo83cZFiMHjh9WxJMs9wPNCHM2H5I3MlFR+U7+eFG+zYIKAx /nTPyh8uMV21jWz+jzkppVTtbGZxm9LnaLlcft0L12BU/ue8IA/HRGFysKddzj7V ewOBnniCfZ3yjiCIzMZX3KPxbTLBuSSzSeEBxEHnQycSutEU4b0uEHrSNyQUZDP4 VcLPhOcdIzYsXOn7UueR+uHNfw+cL0ZaH9fHL9PgXq7fu6svVhCDo9TL8LmE2VOj RU37ElWPSqPSzw5o6RN67WiFbCenZYHb49Dcf935LDVkroeq+pKauXYjPGsQ== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:cc:content-transfer-encoding :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=1699547242; x= 1699633642; bh=oXyW5k3LoWQwMqn5DQHK7XqcSzj5s6qU/KLP/eITOMM=; b=k kEO45nPLXKUg1p3cD17DYqAiR32slHvIm8pNose0kZcunfVIca+u47RayHRWT1kT LJm/y9L9Q7lcjDnORbAh9HM5Nqez2j2ZfJ2t9d1zt1Mq/g6mxztrDdlv6pMhnx7H oMH0eCSUXRlWEHjT6xrAtfLL5Ek96JSXkr9YVgRNO/PbMrh95/eh2fh5UQB9dq7D yNMQNTuV6qW0RGkLzWttOHVcu+iNHzMOmaZlCEjIhqupU90S6llaUIboQMqfvr6e 6ttZwsPP5j6vtbGYEQIV4TzHvs33K2HlXdTbf06zuubEZsprwxL1qDWx0h12qtTv 5PQXSe57EIxmrusxbKgQw== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvkedruddvuddgkeejucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucenucfjughrpefhvfevufffkffojghfggfgsedtke ertdertddtnecuhfhrohhmpefrhhhilhhiphcuofgtifhrrghthhcuoehphhhilhhiphes phhhihhlihhpmhgtghhrrghthhdrtghomheqnecuggftrfgrthhtvghrnhepgffhgfffje egudejvddvgedvheefveehvdffueduudeivdfhgeeileehvdfhfeefnecuvehluhhsthgv rhfuihiivgeptdenucfrrghrrghmpehmrghilhhfrhhomhepphhhihhlihhpsehphhhilh hiphhmtghgrhgrthhhrdgtohhm X-ME-Proxy: Feedback-ID: i2b1146f3:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Thu, 9 Nov 2023 11:27:21 -0500 (EST) From: Philip McGrath To: 67019@debbugs.gnu.org Subject: [PATCH 10/16] gnu: Add node-flow-parser. Date: Thu, 9 Nov 2023 11:26:32 -0500 Message-ID: X-Mailer: git-send-email 2.41.0 In-Reply-To: References: MIME-Version: 1.0 X-Debbugs-Cc: Philip McGrath , Julien Lepiller , pukkamustard Content-Transfer-Encoding: 8bit X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 67019 Cc: Philip McGrath X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) * gnu/packages/web.scm (node-flow-parser): New variable. (ocaml-flow-parser)[description]: Mention it. --- gnu/packages/web.scm | 45 +++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 44 insertions(+), 1 deletion(-) diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index 82923786f2..0ade9e46e3 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -2029,9 +2029,52 @@ (define-public ocaml-flow-parser (synopsis "Parser for the Flow JavaScript type system") (description "Flow is a gradual type system for JavaScript. This package provides the Flow parser, which is an OCaml library that can also be compiled -to JavaScript.") +to JavaScript. To use the compiled parser with Node.js or NPM, see the Guix +package @code{node-flow-parser}.") (license license:expat))) +(define-public node-flow-parser + (package + (inherit ocaml-flow-parser) + (name "node-flow-parser") + (properties '()) + (outputs '("out")) + (propagated-inputs '()) + (native-inputs '()) + (inputs (list `(,ocaml-flow-parser "js"))) + (build-system node-build-system) + (arguments + (list + #:tests? #f ; need unpackaged dependencies + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'delete-workspace-file + (lambda args + ;; this workspace file causes NPM to try to install dependencies + ;; of other packages developed in this source repository + (delete-file "package.json"))) + (add-after 'delete-workspace-file 'chdir + (lambda args + (chdir "packages/flow-parser"))) + (add-after 'chdir 'unpack-generated-js + (lambda* (#:key inputs #:allow-other-keys) + (install-file + (search-input-file inputs + "share/javascript/flow/flow_parser.js") + ".") + (delete-file "Makefile"))) + (add-after 'patch-dependencies 'delete-dependencies + (lambda args + (delete-dependencies + '("ast-types" + "colors" + "esprima-fb" + "minimist"))))))) + (synopsis "Parser for the Flow JavaScript type system") + (description "Flow is a gradual type system for JavaScript. This package +provides the Flow parser in its compiled-to-JavaScript form for use with +Node.js and NPM."))) + (define-public tinyproxy (package (name "tinyproxy") -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Thu Nov 09 11:28:07 2023 Received: (at 67019) by debbugs.gnu.org; 9 Nov 2023 16:28:07 +0000 Received: from localhost ([127.0.0.1]:48515 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1r17t1-0004cA-4q for submit@debbugs.gnu.org; Thu, 09 Nov 2023 11:28:07 -0500 Received: from wout5-smtp.messagingengine.com ([64.147.123.21]:52397) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1r17sx-0004a5-P7 for 67019@debbugs.gnu.org; Thu, 09 Nov 2023 11:28:04 -0500 Received: from compute5.internal (compute5.nyi.internal [10.202.2.45]) by mailout.west.internal (Postfix) with ESMTP id F34053200A47; Thu, 9 Nov 2023 11:27:23 -0500 (EST) Received: from mailfrontend1 ([10.202.2.162]) by compute5.internal (MEProxy); Thu, 09 Nov 2023 11:27:24 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= philipmcgrath.com; h=cc:cc:content-transfer-encoding :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=1699547243; x=1699633643; bh=5O60HOAYlT jPgPcakHiT+I7U5cLWEeogtKVlV1zaySM=; b=VYDfV2VnlVlPdTrZlfJUYsQUps pdKeJ+3QHgAAwJMZ5AnTLMRn9p1noqyOhi4F/hq4T48cVbSv2q0uc/ZH6NafZaow 6qIK6+GmEsPLfxAkBSDffSgy32ZgiqLHINRJ0tCHIX/TRTg93MgjTgW2L4n3+3gx rDJrZtn02eclKmB+W8ojlwcLDv826Q8b08IeISV5yhORGIuQd4qM5GZEltTtkZ8d atEGnh/HUA8bsLDpBimZ1EM5JfB7HjaO8nf2FMJRb5BZp9zYmZC4EDxYKLLsoy8G yBXCgkedWJ/MWC611nAWgTcD2YxgzXKBU3w91iqK7J9HyVc8XajJqr/Uf8BQ== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:cc:content-transfer-encoding :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=1699547243; x= 1699633643; bh=5O60HOAYlTjPgPcakHiT+I7U5cLWEeogtKVlV1zaySM=; b=r qryWAD/bklMv+ySLt3tAdEqBIUdem3EBALTM1I4z13PlXpso8mWJBHzT3+LJWc+x rjT7yx8S0adzv+9n+epQ1UDp+V+jV2pMQmUDVq6sGq804ZSBxgiBpadhoG6GqwxY EzThgGnunRi9KyYIkb+aV8R64ZhGCbiqxDycehpkeVPV7eZkDMK0BUE7lsIBaCh/ a6F9jamlnszzpnONi1pdPsfxwZPzkuuA30J3Xh/BqOc+slPNwXJy9yGkdeXg9Mkz MRcE6xqgrML2/vMssgD5vJk5HYmWqRM2UtoJmi9SdiZAQtQht1f11H0A37M8BnKN n6azDy4KPq/qjlAtjjSHA== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvkedruddvuddgkeejucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucenucfjughrpefhvfevufffkffojghfggfgsedtke ertdertddtnecuhfhrohhmpefrhhhilhhiphcuofgtifhrrghthhcuoehphhhilhhiphes phhhihhlihhpmhgtghhrrghthhdrtghomheqnecuggftrfgrthhtvghrnhepgffhgfffje egudejvddvgedvheefveehvdffueduudeivdfhgeeileehvdfhfeefnecuvehluhhsthgv rhfuihiivgeptdenucfrrghrrghmpehmrghilhhfrhhomhepphhhihhlihhpsehphhhilh hiphhmtghgrhgrthhhrdgtohhm X-ME-Proxy: Feedback-ID: i2b1146f3:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Thu, 9 Nov 2023 11:27:23 -0500 (EST) From: Philip McGrath To: 67019@debbugs.gnu.org Subject: [PATCH 11/16] gnu: Add flow-remove-types. Date: Thu, 9 Nov 2023 11:26:33 -0500 Message-ID: <00fd9449a17eb15c0816754c6e438fa399711573.1699540553.git.philip@philipmcgrath.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: References: MIME-Version: 1.0 X-Debbugs-Cc: Philip McGrath , Julien Lepiller , pukkamustard Content-Transfer-Encoding: 8bit X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 67019 Cc: Philip McGrath X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) * gnu/packages/web.scm (flow-remove-types): New variable. --- gnu/packages/web.scm | 60 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 60 insertions(+) diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index 0ade9e46e3..8f0295998a 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -2075,6 +2075,66 @@ (define-public node-flow-parser provides the Flow parser in its compiled-to-JavaScript form for use with Node.js and NPM."))) +(define-public flow-remove-types + (package + (inherit node-flow-parser) + (name "flow-remove-types") + (inputs (list node-flow-parser node-vlq)) + (arguments + (list + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'delete-workspace-file + (lambda args + ;; this workspace file causes NPM to try to install dependencies + ;; of other packages developed in this source repository + (delete-file "package.json"))) + (add-after 'delete-workspace-file 'chdir + (lambda args + (chdir "packages/flow-remove-types"))) + (add-after 'patch-dependencies 'delete-dependencies + (lambda args + (delete-dependencies '("pirates")))) + (add-after 'delete-dependencies 'remove-unsupported-features + (lambda args + (delete-file "register.js") + (with-output-to-file "register.js" + (lambda () + (for-each + display + '("console.warn('flow-remove-types/register.js does not add" + " a require hook on Guix');\n" + "module.exports =" + " function setOptions(newOptions) {};\n")))) + (substitute* "flow-node" + (("var flowRemoveTypes") + (string-append + "process.stderr.write('flow-node: not yet supported" + " on Guix');\n" + "return process.exit(1);\n" + "var flowRemoveTypes"))) + (substitute* "test.sh" + (("echo \"Test: node require hook\"") + "echo \"SKIPPING Test: node require hook\"") + (("RES=\\$[(]node -e 'require[(]\"\\./register\"[)];") + "RES=42 # ") + (("echo \"Test: flow-node\"") + "echo \"SKIPPING Test: flow-node\"") + (("FLOW_NODE=") + "FLOW_NODE=42 # ") + (("echo \"Test: flow-node with options\"") + "echo \"SKIPPING Test: flow-node with options\"") + (("FLOW_NODE_OPTS=") + "FLOW_NODE_OPTS=4 # "))))))) + (synopsis "Utility to erase Flow type annotations from JavaScript") + (description "Flow is a gradual type system for JavaScript. This package +provides @command{flow-remove-types}, a command-line tool that erases Flow +type annotations, producing standard JavaScript files. The functionality is +also provided as a JavaScript library. + +Note that the Guix package does not yet support the @command{flow-node} +command or the Node.js require hook for interactive development."))) + (define-public tinyproxy (package (name "tinyproxy") -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Thu Nov 09 11:28:11 2023 Received: (at 67019) by debbugs.gnu.org; 9 Nov 2023 16:28:11 +0000 Received: from localhost ([127.0.0.1]:48517 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1r17t4-0004cU-Kp for submit@debbugs.gnu.org; Thu, 09 Nov 2023 11:28:11 -0500 Received: from wout5-smtp.messagingengine.com ([64.147.123.21]:36915) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1r17ss-0004Zo-FX for 67019@debbugs.gnu.org; Thu, 09 Nov 2023 11:28:04 -0500 Received: from compute5.internal (compute5.nyi.internal [10.202.2.45]) by mailout.west.internal (Postfix) with ESMTP id 7CE123200ADA; Thu, 9 Nov 2023 11:27:13 -0500 (EST) Received: from mailfrontend1 ([10.202.2.162]) by compute5.internal (MEProxy); Thu, 09 Nov 2023 11:27:13 -0500 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=1699547233; x=1699633633; bh=Q1 91TlGayI1CczNXYQ0pMNiFs4iKQfeHjS5vyhHe1G4=; b=L4ind+pjm62v0Mv3Ta JBHgYEMCNqhBWqS1lB2sNDjIhRZ+633x6ipw9kATGifHW2AUyzfPUvlaUbgaPtFw XF424KjisShCb1aVL0x+LVuz1xRqq655rFfS4SMqkSJPSvQTuHB1ZDLIV3O3T2w7 RTwNhF2zKozHs+QF7llWW6AnWUkgcNFEJhWH02S3v4JcMtHwMTrMrvXz8mgVAjue TvRoeLeq0I6hri9EQlY2p1k9yArqMoy+qNrU86Gg0384y5Xu+5Sa4xF5L2MoFvPt sfdfTy4llCafIDd7WL+X5FDdaCDh6FPY2gmQoh7Asiy0EAUOmhjlGz7VJKImkwqs F8mA== 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= 1699547233; x=1699633633; bh=Q191TlGayI1CczNXYQ0pMNiFs4iKQfeHjS5 vyhHe1G4=; b=gU8/kcEyzCWprSXrOdQhSC0kNEsk96iCe21wex3k00mZhvpFTOQ +rUcIV1YffdM0PGMUfWaYjEQV7q+yXnjlmGZAuTN6/75j1XfMaz8uKAKpXpuF+Yw ydnzWefNXNyw01YisPG3oqYa0fy9yVbb5CqPLJjhu94e+aVXyhmySrz3HGduL0VM +o/Hmx/064aFHsM83A5fx2Y/DWna/pRoIu8w2Zxk36s9g8HHL8tola5nYgkWn0c0 YxJbo4Qrn2GZ/aiq56uF/9mx5FsqeD1NJkwW+GVzuSBjenU0/c12bsZTgMMXftai xFEQGbqqdJzzB5fGzg8NHtCriKq9Nw4NJZw== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvkedruddvuddgkeejucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucenucfjughrpefhvfevufffkffojghfgggtgfesth ekredtredtjeenucfhrhhomheprfhhihhlihhpucfotgfirhgrthhhuceophhhihhlihhp sehphhhilhhiphhmtghgrhgrthhhrdgtohhmqeenucggtffrrghtthgvrhhnpeeggfeugf eftddvjefhtedtuedvudehheegvedvkefgleevffeftdfhhfekteegffenucffohhmrghi nhepghhithhhuhgsrdgtohhmnecuvehluhhsthgvrhfuihiivgeptdenucfrrghrrghmpe hmrghilhhfrhhomhepphhhihhlihhpsehphhhilhhiphhmtghgrhgrthhhrdgtohhm X-ME-Proxy: Feedback-ID: i2b1146f3:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Thu, 9 Nov 2023 11:27:12 -0500 (EST) From: Philip McGrath To: 67019@debbugs.gnu.org Subject: [PATCH 04/16] gnu: Add ocaml-wtf8. Date: Thu, 9 Nov 2023 11:26:26 -0500 Message-ID: <065050593a0d2dc5d2743ed0b8f1af728f9bc18f.1699540553.git.philip@philipmcgrath.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: References: MIME-Version: 1.0 X-Debbugs-Cc: Philip McGrath , Julien Lepiller , pukkamustard Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 67019 Cc: Philip McGrath X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) * gnu/packages/ocaml.scm (ocaml-wtf8): New variable. --- gnu/packages/ocaml.scm | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index 7993dbaa73..50b0d1ddb7 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -29,6 +29,7 @@ ;;; Copyright © 2022 Garek Dyszel ;;; Copyright © 2023 Csepp ;;; Copyright © 2023 Foundation Devices, Inc. +;;; Copyright © 2023 Philip McGrath ;;; ;;; This file is part of GNU Guix. ;;; @@ -3655,6 +3656,30 @@ (define-public ocaml-uutf string values and to directly encode characters in OCaml Buffer.t values.") (license license:isc))) +(define-public ocaml-wtf8 + (package + (name "ocaml-wtf8") + (version "1.0.2") + (source (origin + (method url-fetch) + (uri (string-append + "https://github.com/flow/ocaml-wtf8/releases/download/" + "v" version "/wtf8-v" version ".tbz")) + (sha256 + (base32 + "09ygcxxd5warkdzz17rgpidrd0pg14cy2svvnvy1hna080lzg7vp")))) + (build-system dune-build-system) + (home-page "https://github.com/flow/ocaml-wtf8") + (synopsis "OCaml encoder and decoder for @acronym{WTF-8}") + (description + "This library provides an OCaml encoder and decoder for @acronym{WTF-8, +Wobbly Transformation Format---8 bit}, a superset of UTF-8 that allows +unpaired surrogates while preserving the other well-formedness constraints of +UTF-8. This format is useful for interoperating with systems that use +potentially ill-formed UTF-16, notably including ECMAScript strings and +Windows filesystems.") + (license license:expat))) + (define-public ocaml-uunf (package (name "ocaml-uunf") -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Thu Nov 09 11:28:11 2023 Received: (at 67019) by debbugs.gnu.org; 9 Nov 2023 16:28:11 +0000 Received: from localhost ([127.0.0.1]:48519 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1r17t5-0004cX-2o for submit@debbugs.gnu.org; Thu, 09 Nov 2023 11:28:11 -0500 Received: from wout5-smtp.messagingengine.com ([64.147.123.21]:55545) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1r17sy-0004aI-HX for 67019@debbugs.gnu.org; Thu, 09 Nov 2023 11:28:05 -0500 Received: from compute1.internal (compute1.nyi.internal [10.202.2.41]) by mailout.west.internal (Postfix) with ESMTP id 91D8D3200BC1; Thu, 9 Nov 2023 11:27:19 -0500 (EST) Received: from mailfrontend1 ([10.202.2.162]) by compute1.internal (MEProxy); Thu, 09 Nov 2023 11:27:19 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= philipmcgrath.com; h=cc:cc:content-transfer-encoding :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=1699547239; x=1699633639; bh=E9ocrdTfeE mbK+CG7oTU30PmquE0qggOBuAtfU+BvE4=; b=bygMIe/Jawbf6EXBkULwpbm1tk UeM4DCw0xirgD+9fJ1YdFcUHFcc7bngu1/NMFEjStERJd1jYtk/J0ljs1uCR1RmZ Mk+7f/m3eBxUQm11q82oYHr98dimS/IjylZgGTbtaMpXPmtF4/2ovza3w+Gcm+iv GPpQKGloUV1D/s0cHmjXRj+EXLmP/14mN8w3703krIenkln6i02q5FG3AjGCDCL1 cwFeJWEkKrW3ojOi324KwF7sr58R1uVg25oZMB/yQdBk4uNJBxJiZOLH7bNN90Lf WgbqkPU5EpLbKqn4qd0NXRef5+CZ+WJT9AIGBNjgmYoS8uNGQ1+GzoteHtmw== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:cc:content-transfer-encoding :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=1699547239; x= 1699633639; bh=E9ocrdTfeEmbK+CG7oTU30PmquE0qggOBuAtfU+BvE4=; b=M IYqIPlL4kFo3jsZqi063Gs5pz+N7AdZvncIneye98GxEeRh20OK2IPKFe24yGTfI OemasHHsG5ZRVvmrOv3+tPMEd1jILyt3f08FD+G2aqaCqpuNLjim+XiTmGm3ahVp u4xPzCr0afdX9YUHz8CYRUoWIPxRGml9m4GHDIl0xHC5aI/wr7y4lubQc71bCNLl ZKzpBAKU6ZK6iAawjggNUre2GQkpfL5Skj7buxzf7YwqschcNOE6mrFNzWiOgtF9 n3Rm6u9Zr8FhTmreCZqm8/HpyM5gJZ23S/qDXXoZFucBTpi582XE9lrWsINnJ9wu pPZkYQfyvT2JGwOM7jIjg== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvkedruddvuddgkeejucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucenucfjughrpefhvfevufffkffojghfggfgsedtke ertdertddtnecuhfhrohhmpefrhhhilhhiphcuofgtifhrrghthhcuoehphhhilhhiphes phhhihhlihhpmhgtghhrrghthhdrtghomheqnecuggftrfgrthhtvghrnhepudehvdefje etfffffeektdehtdetudfhtdfhuddtueeukefhveehhfehvdfhheffnecuffhomhgrihhn pehgihhthhhusgdrtghomhenucevlhhushhtvghrufhiiigvpedtnecurfgrrhgrmhepmh grihhlfhhrohhmpehphhhilhhiphesphhhihhlihhpmhgtghhrrghthhdrtghomh X-ME-Proxy: Feedback-ID: i2b1146f3:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Thu, 9 Nov 2023 11:27:18 -0500 (EST) From: Philip McGrath To: 67019@debbugs.gnu.org Subject: [PATCH 08/16] gnu: Add node-vlq. Date: Thu, 9 Nov 2023 11:26:30 -0500 Message-ID: <5114fc6c4d716300492b2e04d7af0389412bcf71.1699540553.git.philip@philipmcgrath.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: References: MIME-Version: 1.0 X-Debbugs-Cc: Philip McGrath , Julien Lepiller , pukkamustard Content-Transfer-Encoding: 8bit X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 67019 Cc: Philip McGrath X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) * gnu/packages/node-xyz.scm (node-vlq): New variable. --- gnu/packages/node-xyz.scm | 58 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 58 insertions(+) diff --git a/gnu/packages/node-xyz.scm b/gnu/packages/node-xyz.scm index ee96dee767..adbac8a6cd 100644 --- a/gnu/packages/node-xyz.scm +++ b/gnu/packages/node-xyz.scm @@ -1793,3 +1793,61 @@ (define-public node-copy-anything face of complications like special objects, symbols, and non-enumerable properties.") (license license:expat))) + +(define-public node-vlq + (package + (name "node-vlq") + (version "0.2.3") ; last version accepted by flow-remove-types ("^0.2.1") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/Rich-Harris/vlq") + (commit (string-append "v" version)))) + (sha256 + (base32 "1vdrarssrwxpcngyfx050ba0gnfinzi5jn3xs4w9rnjvxngx6m8f")) + (snippet + #~(delete-file "dist/vlq.js")) + (file-name (git-file-name name version)))) + (build-system node-build-system) + (native-inputs (list esbuild)) + (arguments + (list + #:modules + `((guix build node-build-system) + (ice-9 match) + (guix build utils)) + #:phases + #~(modify-phases %standard-phases + (add-after 'patch-dependencies 'delete-dependencies + (lambda args + (delete-dependencies + '("eslint" + "rollup")))) + (add-after 'delete-dependencies 'patch-build-script + (lambda args + (define new-build-script + "esbuild --bundle --platform=node --outdir=dist src/vlq.js") + (with-atomic-json-file-replacement "package.json" + (lambda (js) + (match js + (('@ . alist) + (cons '@ + (map (match-lambda + (("scripts" @ . alist) + `("scripts" @ ,@(map (match-lambda + (("build" . _) + (cons "build" + new-build-script)) + (other + other)) + alist))) + (other + other)) + alist))))))))))) + (home-page "https://github.com/Rich-Harris/vlq") + (synopsis "JavaScript library for @acronym{VLQ} encoding and decoding") + (description "This package provides a JavaScript library for converting +integers to and from Base64-encoded @acronym{VLQ, variable-length quantity} +strings.") + (license license:expat))) -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Thu Nov 09 11:28:12 2023 Received: (at 67019) by debbugs.gnu.org; 9 Nov 2023 16:28:12 +0000 Received: from localhost ([127.0.0.1]:48521 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1r17t5-0004cg-Mt for submit@debbugs.gnu.org; Thu, 09 Nov 2023 11:28:12 -0500 Received: from wout5-smtp.messagingengine.com ([64.147.123.21]:52397) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1r17sz-0004a5-Kv for 67019@debbugs.gnu.org; Thu, 09 Nov 2023 11:28:06 -0500 Received: from compute7.internal (compute7.nyi.internal [10.202.2.48]) by mailout.west.internal (Postfix) with ESMTP id 8ABB3320095C; Thu, 9 Nov 2023 11:27:25 -0500 (EST) Received: from mailfrontend1 ([10.202.2.162]) by compute7.internal (MEProxy); Thu, 09 Nov 2023 11:27:26 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= philipmcgrath.com; h=cc:cc:content-transfer-encoding :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=1699547245; x=1699633645; bh=WvZE3V0PDo TMe5ixoooqikSD6F6YmOVB9KyBxE7of/k=; b=vwDEhSLgQnVQs7d3+OQymmN7/e HwkdIq+OnhTsuZC3UvBVlbqefjjecP+X63y/w6iu5qQRMgOh7/wfrDRWhlnT8+bo g4y+V2oANABlaOGu02FtwbCv5dxEO5Pf2hWsXkaw1Z6lzxvVPZbxGHcieuxmpr42 VlGHqIOBy/5bpjgquQNMWtlHNS5EQdcg6gIjHtbslchJqBwnBEht5z8cq+mIYCXP 8zd8LKzj3QPZ/uqXqJV0gJdqB5Ps0XOZker+gzlUTlcM3QSTNLwCPMGVcCBl5tEn OljZys1nd4J11xj7h1uTolBRSYnV26tG9rtiaGb13pajykZNYv0oZ+Jd8a1A== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:cc:content-transfer-encoding :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=1699547245; x= 1699633645; bh=WvZE3V0PDoTMe5ixoooqikSD6F6YmOVB9KyBxE7of/k=; b=X 7JvjIcIh9QxaBC3rfson0D1Mmkz/9m7xdctKzU367FZ/ADrKD5PE3/eUYvBV4dzv 6hkSm1jP5I/1YtR9rEA9j/190hafodIeTRGHhYE8e7n2X4NeuZDHZXHoR52rBoVd YbbqHPvsqEE4ixkqiFFuIDDwArkpDoPzDfWNPsu2adbOWFmDAc8/b/Jy+tY94Qof 5y1R9bxnhXDRu5zX/2f6G7tEV8AfagX2UyPHf5KYH9EeDNRLyzO21iyaGc2Pyv7I ODG0IEfTt/gjAHs2cBoKPySCstmxZXS/4nKhc0jhIoTxgP4hWqrVstbiwU6W6Kav OKhEqbgVvGMu9Jkgy04Yg== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvkedruddvuddgkeejucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucenucfjughrpefhvfevufffkffojghfggfgsedtke ertdertddtnecuhfhrohhmpefrhhhilhhiphcuofgtifhrrghthhcuoehphhhilhhiphes phhhihhlihhpmhgtghhrrghthhdrtghomheqnecuggftrfgrthhtvghrnhepgffhgfffje egudejvddvgedvheefveehvdffueduudeivdfhgeeileehvdfhfeefnecuvehluhhsthgv rhfuihiivgeptdenucfrrghrrghmpehmrghilhhfrhhomhepphhhihhlihhpsehphhhilh hiphhmtghgrhgrthhhrdgtohhm X-ME-Proxy: Feedback-ID: i2b1146f3:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Thu, 9 Nov 2023 11:27:24 -0500 (EST) From: Philip McGrath To: 67019@debbugs.gnu.org Subject: [PATCH 12/16] gnu: js-commander: Update to 11.1.0. Date: Thu, 9 Nov 2023 11:26:34 -0500 Message-ID: <5db0b1d07088f030bf963ff6507b840a2a632e9b.1699540553.git.philip@philipmcgrath.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: References: MIME-Version: 1.0 X-Debbugs-Cc: Philip McGrath , Julien Lepiller , pukkamustard Content-Transfer-Encoding: 8bit X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 67019 Cc: Philip McGrath X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) * gnu/packages/javascript.scm (js-commander): Update to 11.1.0. --- gnu/packages/javascript.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/javascript.scm b/gnu/packages/javascript.scm index e70aa7d7e1..c62b23a4c4 100644 --- a/gnu/packages/javascript.scm +++ b/gnu/packages/javascript.scm @@ -373,7 +373,7 @@ (define-public js-mathjax-for-r-mathjaxr (define-public js-commander (package (name "js-commander") - (version "6.2.1") + (version "11.1.0") (source (origin (method git-fetch) @@ -383,7 +383,7 @@ (define-public js-commander (file-name (git-file-name name version)) (sha256 (base32 - "126m25s6mxpxmdj4aw5awz06b47r8r798lcf1c5bnmmh39cik5i1")))) + "1xwh85kbxj76ni41r2h0apl8mjbfcnmxzzp3vlspq30w8kwfckni")))) (build-system trivial-build-system) (arguments `(#:modules ((guix build utils)) -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Thu Nov 09 11:28:12 2023 Received: (at 67019) by debbugs.gnu.org; 9 Nov 2023 16:28:13 +0000 Received: from localhost ([127.0.0.1]:48523 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1r17t6-0004co-2Q for submit@debbugs.gnu.org; Thu, 09 Nov 2023 11:28:12 -0500 Received: from wout5-smtp.messagingengine.com ([64.147.123.21]:42497) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1r17t0-0004aV-1X for 67019@debbugs.gnu.org; Thu, 09 Nov 2023 11:28:06 -0500 Received: from compute4.internal (compute4.nyi.internal [10.202.2.44]) by mailout.west.internal (Postfix) with ESMTP id 1AAE43200B50; Thu, 9 Nov 2023 11:27:21 -0500 (EST) Received: from mailfrontend1 ([10.202.2.162]) by compute4.internal (MEProxy); Thu, 09 Nov 2023 11:27:21 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= philipmcgrath.com; h=cc:cc:content-transfer-encoding :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=1699547240; x=1699633640; bh=dbbwjGMy0P G9A9RedVapQka40Lxh/RkfEHjBVh7YTU4=; b=KvaY3XEGBDDy13NIp3s/5uKTII JfhxOkzHJoHbjDld+dUrE1AkUp9ftLXMEeCPVsR1tr8EVOyi/Uhjtfmw2I+w863X 3wkt7QaCfdWGZZsfySmykLK/ch2q9SN7/ee8XEyeQo3tDzuof/QIe/EWkMLijPxE GyZzU3X/gf9ARC5mhtQwiI/StOz4NlNrnff++BpvPolDsprB7M4/AQRnQjtg68cV Koa35OuhTL6X+dugWEQtCf4Tz+DFwN1yg0q8ZIAafmVbYRLsVn1MuXS/xAFCZZG8 ZZK/DeH9DB/ljTQlYLU5dym9B0GJiSPEHdf+brSbvYuLCtWabKZNTMrIdEFQ== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:cc:content-transfer-encoding :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=1699547240; x= 1699633640; bh=dbbwjGMy0PG9A9RedVapQka40Lxh/RkfEHjBVh7YTU4=; b=f eI9mOasHCWQcfuPAlth2qELTWjPD6FXoQZ49nOSsmOf7NHjlOlvt9PXmASz8TSyU HZu9U4TPutoGCaBZLBKLLf/KWWSTINXUiVRC2lr3jI/sAXvu498G0i28VLeiY5uw TiNPL7Vxh1hghwpLEigUz7OV5VSfa8fYVbg7Bbt2vbYlzXH5EfccMuP5lkorsRo7 JidJpip8I7iG/OULegToncWiMQJyOVF8lrK1BqiRIUwJHVW49QzVxrWlRxL8zDpi jieYPkfNip+pXsNb0lGP4iDyIgPM+3ojNZOJOKPlZZxzZ5gI8w8Oq/RIiAqDHYsu 6Au2ovcmrAEydRNyKdKgg== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvkedruddvuddgkeejucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucenucfjughrpefhvfevufffkffojghfggfgsedtke ertdertddtnecuhfhrohhmpefrhhhilhhiphcuofgtifhrrghthhcuoehphhhilhhiphes phhhihhlihhpmhgtghhrrghthhdrtghomheqnecuggftrfgrthhtvghrnhepvdekuefhte fhiedvkeegtdeljeehvdfhheefteefheduveelgeelleetvddvjeffnecuffhomhgrihhn pehgihhthhhusgdrtghomhdpfhhlohifrdhorhhgnecuvehluhhsthgvrhfuihiivgeptd enucfrrghrrghmpehmrghilhhfrhhomhepphhhihhlihhpsehphhhilhhiphhmtghgrhgr thhhrdgtohhm X-ME-Proxy: Feedback-ID: i2b1146f3:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Thu, 9 Nov 2023 11:27:20 -0500 (EST) From: Philip McGrath To: 67019@debbugs.gnu.org Subject: [PATCH 09/16] gnu: Add ocaml-flow-parser. Date: Thu, 9 Nov 2023 11:26:31 -0500 Message-ID: <842136e70d3ef468a005ae7f26101523f74d9593.1699540553.git.philip@philipmcgrath.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: References: MIME-Version: 1.0 X-Debbugs-Cc: Philip McGrath , Julien Lepiller , pukkamustard Content-Transfer-Encoding: 8bit X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 67019 Cc: Philip McGrath X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) * gnu/packages/web.scm (ocaml-flow-parser): New variable. --- Note: `guix lint` reports that a v0.220.1 has been tagged, but this is the version that `guix import opam` finds, and I could not readily figure out how to get this building with v0.220.1. gnu/packages/web.scm | 95 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 95 insertions(+) diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index 8e22997957..82923786f2 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -95,6 +95,7 @@ (define-module (gnu packages web) #:use-module (guix build-system cargo) #:use-module (guix build-system cmake) #:use-module (guix build-system copy) + #:use-module (guix build-system dune) #:use-module (guix build-system glib-or-gtk) #:use-module (guix build-system gnu) #:use-module (guix build-system go) @@ -172,6 +173,7 @@ (define-module (gnu packages web) #:use-module (gnu packages node) #:use-module (gnu packages node-xyz) #:use-module (gnu packages nss) + #:use-module (gnu packages ocaml) #:use-module (gnu packages openldap) #:use-module (gnu packages openstack) #:use-module (gnu packages package-management) @@ -1937,6 +1939,99 @@ (define-public esbuild and other data, for distribution on the web.") (license license:expat))) +(define-public ocaml-flow-parser + (package + (name "ocaml-flow-parser") + (version "0.159.0") + (outputs '("out" "js")) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/facebook/flow") + (commit (string-append "v" version)))) + (sha256 + (base32 "1i9svf641s24nj4w6y9vvglzg29h0lr4n9a6mvwrn9psy9x1lril")) + (file-name (git-file-name "flow" version)))) + (build-system dune-build-system) + (propagated-inputs (list ocaml-base + ocaml-core-kernel + ocaml-dtoa + ocaml-sedlex + ocaml-wtf8)) + (native-inputs (list js-of-ocaml + ocamlbuild + ocaml-findlib + ocaml-ounit2 + ocaml-ppx-deriving + ocaml-ppx-gen-rec + ocaml-visitors)) + (arguments + (list + #:tests? #f ; tests need lwt_ppx + #:package "flow_parser" + #:phases + #~(modify-phases %standard-phases + (add-before 'build 'chdir + (lambda args + (chdir "src/parser"))) + (add-before 'build 'patch-source + (lambda args + ;; Avoid errors with newer OCaml: + ;; "Error (warning 16 [unerasable-optional-argument]):" + ;; " this optional argument cannot be erased." + ;; "Error (warning 69 [unused-field]):" + ;; " mutable record field buf is never mutated." + ;; "Error (warning 70 [missing-mli]): Cannot find interface file." + (substitute* "_tags" + (("<\\*\\.ml\\*>: warn[(]-39[)]") + "<*.ml*>: warn(-16-39-70)")) + (substitute* "../../_tags" + (("<\\*\\*/\\*.ml\\*>: ") + "<**/*.ml*>: warn(-69), ")) + ;; Deprecation of Js.Unsafe.variable, Js.Error, Js.raise_js_error + (substitute* "flow_parser_js.ml" + (("Js\\.Unsafe\\.variable") + "Js.Unsafe.pure_js_expr")) + (substitute* "flow_parser_dot_js.ml" + (("Js\\.Error") + "Js_of_ocaml.Js_error.Exn") + (("Js\\.raise_js_error") + "Js_of_ocaml.Js_error.raise_")))) + (replace 'build + (lambda args + (invoke "make" + (string-append "CC=" #$(cc-for-target)) + "build-parser"))) + (add-after 'build 'build-js + (lambda args + (invoke "make" + (string-append "CC=" #$(cc-for-target)) + "js"))) + (replace 'check + (lambda* (#:key tests? #:allow-other-keys) + (when tests? + (invoke "make" + (string-append "CC=" #$(cc-for-target)) + "test-ocaml")))) + (replace 'install + (lambda args + (invoke "make" + (string-append "CC=" #$(cc-for-target)) + "ocamlfind-install"))) + (add-after 'install 'install-js + (lambda args + (install-file "flow_parser.js" + (string-append #$output:js + "/share/javascript/flow"))))))) + (properties `((upstream-name . "flow_parser"))) + (home-page "https://flow.org") + (synopsis "Parser for the Flow JavaScript type system") + (description "Flow is a gradual type system for JavaScript. This package +provides the Flow parser, which is an OCaml library that can also be compiled +to JavaScript.") + (license license:expat))) + (define-public tinyproxy (package (name "tinyproxy") -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Thu Nov 09 11:28:13 2023 Received: (at 67019) by debbugs.gnu.org; 9 Nov 2023 16:28:13 +0000 Received: from localhost ([127.0.0.1]:48528 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1r17t6-0004cx-S3 for submit@debbugs.gnu.org; Thu, 09 Nov 2023 11:28:13 -0500 Received: from wout5-smtp.messagingengine.com ([64.147.123.21]:39977) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1r17sx-0004aA-2u for 67019@debbugs.gnu.org; Thu, 09 Nov 2023 11:28:06 -0500 Received: from compute7.internal (compute7.nyi.internal [10.202.2.48]) by mailout.west.internal (Postfix) with ESMTP id 25BEF3200B59; Thu, 9 Nov 2023 11:27:18 -0500 (EST) Received: from mailfrontend1 ([10.202.2.162]) by compute7.internal (MEProxy); Thu, 09 Nov 2023 11:27:18 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= philipmcgrath.com; h=cc:cc:content-transfer-encoding :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=1699547237; x=1699633637; bh=TyXto21Pr0 l88vZ+0tPI9VWoQSPznZA9OTS3c3MA20s=; b=GPhcegaXREXvtXIzrUMwgKc1Rk AzCt4MdPHtcZ9f6jxwdTSAM97Gd/Qx3fSMP975Q4WkJGmScM0ptPIlXpOLvXqUsU 71huHXFJ3H1O4SjgrijObE+uyRJYbdz5XOA8Y4ydya26/B8t525xMm8XavJqkmTD ahdQGRY3thugdIAQZ4Uo8rnDL78NrK36/r8WR8cReVyEsqcmWji+IaUVwAUIcGzl 566vVzd/ycwhkwsMdAcuSvs2LUN1zViBpcoIoQpwunjbIa54cQSI3ZcfatoxppNV ogvp6Yk4AAzibovfKprzRuCA6rEBW9kfJgeLuyhhII1ZNofU5lcFV06HGr+Q== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:cc:content-transfer-encoding :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=1699547237; x= 1699633637; bh=TyXto21Pr0l88vZ+0tPI9VWoQSPznZA9OTS3c3MA20s=; b=W PdPXDBGZrrGrQs3ADytXNYcfffQoGIgALc7DkHM4OhoNXKzZwzZliFr+4WTmaITZ Oxz89CdxXA/xK8xNUCZCSvs/hZyIAfOyrobtJrUys6yrnHO5uB5vKX1AsZ4eBA6m NsKS8+ChSvsTwJuQGNbRDBkkeS+Y2AiP61h1wILjk1WXfNHeq9jBwFoBgLNKjL3y w5cm7XFPWiB6mzbcf9D9pnDiZP7f7AQdidIC4Zl/uo7Ri0PI7wO/wKDp7sl4+k2O hK+gPuUd/MI66UN+s+MmVZY7ApIj3N7u3RrpEfO/hr32nzXyF2ODM3pEixzujC3L K6CDSeDKH01XynYZAGfiA== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvkedruddvuddgkeejucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucenucfjughrpefhvfevufffkffojghfggfgsedtke ertdertddtnecuhfhrohhmpefrhhhilhhiphcuofgtifhrrghthhcuoehphhhilhhiphes phhhihhlihhpmhgtghhrrghthhdrtghomheqnecuggftrfgrthhtvghrnhepudehvdefje etfffffeektdehtdetudfhtdfhuddtueeukefhveehhfehvdfhheffnecuffhomhgrihhn pehgihhthhhusgdrtghomhenucevlhhushhtvghrufhiiigvpedtnecurfgrrhgrmhepmh grihhlfhhrohhmpehphhhilhhiphesphhhihhlihhpmhgtghhrrghthhdrtghomh X-ME-Proxy: Feedback-ID: i2b1146f3:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Thu, 9 Nov 2023 11:27:17 -0500 (EST) From: Philip McGrath To: 67019@debbugs.gnu.org Subject: [PATCH 07/16] gnu: Add ocaml-dtoa. Date: Thu, 9 Nov 2023 11:26:29 -0500 Message-ID: X-Mailer: git-send-email 2.41.0 In-Reply-To: References: MIME-Version: 1.0 X-Debbugs-Cc: Philip McGrath , Julien Lepiller , pukkamustard Content-Transfer-Encoding: 8bit X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 67019 Cc: Philip McGrath X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) * gnu/packages/ocaml.scm (ocaml-dtoa): New variable. --- gnu/packages/ocaml.scm | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index b12c12fad5..36f349df73 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -2513,6 +2513,30 @@ (define-public ocaml4.07-fmt "0gkkkj4x678vxdda4xaw2dd44qjacavsvn5nx8gydfwah6pjbkxk")))) (properties '())))) +(define-public ocaml-dtoa + (package + (name "ocaml-dtoa") + (version "0.3.3") + (source (origin + (method url-fetch) + (uri + (string-append "https://github.com/flow/ocaml-dtoa/releases/" + "download/v" version "/dtoa-" version ".tbz")) + (sha256 + (base32 + "0gpfr6iyiihmkpas542916cnhfdbrigvzwrix8jrxcljks661x6q")))) + (build-system dune-build-system) + (native-inputs (list ocaml-ounit2)) + (home-page "https://github.com/flow/ocaml-dtoa") + (synopsis + "Efficent float to string conversion for OCaml") + (description + "This package provides functions that convert OCaml floats into strings +quickly, accurately, and (almost always) optimally using the Grisu3 algorithm. +The implementation was adapted from a C++ library originally developed as part +of the V8 JavaScript engine.") + (license license:expat))) + (define-public ocaml-astring (package (name "ocaml-astring") -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Thu Nov 09 11:28:18 2023 Received: (at 67019) by debbugs.gnu.org; 9 Nov 2023 16:28:18 +0000 Received: from localhost ([127.0.0.1]:48539 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1r17tB-0004dT-F7 for submit@debbugs.gnu.org; Thu, 09 Nov 2023 11:28:18 -0500 Received: from wout5-smtp.messagingengine.com ([64.147.123.21]:44445) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1r17t6-0004c9-9U for 67019@debbugs.gnu.org; Thu, 09 Nov 2023 11:28:13 -0500 Received: from compute1.internal (compute1.nyi.internal [10.202.2.41]) by mailout.west.internal (Postfix) with ESMTP id 4A4E93200ADA; Thu, 9 Nov 2023 11:27:27 -0500 (EST) Received: from mailfrontend1 ([10.202.2.162]) by compute1.internal (MEProxy); Thu, 09 Nov 2023 11:27:27 -0500 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=1699547246; x=1699633646; bh=Ki Wcea6wn/K24MSCD0fOryDe70WTqDSaNudxaoHqdSk=; b=1YhWrAvTScTSBjcRNR 0x2YFsQdWgdwZ70irDVOyJn1YaU1fZcUoRBWlqzBZO3AT9Q0HKWaz9k2jlywDzFC fXJOL8Efg63Lj/TIVAt574ykRI1KGHFyg3dQrCW9jjw3LN/gAkdU3B+vsgYiDqBC SD5RkdaUN/n2TOhU0ltInCvNPapJXJ+m4KGhHHaR70EGOZSD9Tt+rSnZ89TQn8+D iP1EID9PSXRKtbW9Ky+cokgdwUFQ/MeTa0ZhqKDznA1p4zK+Lgt9fTG07jjx9CS4 WsgyExGGUCppA0u0kzZhAGUrwHPgfzAGyNMb2kfTt6yi0o+zeWP6picILidtxZDa 1xRw== 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= 1699547246; x=1699633646; bh=KiWcea6wn/K24MSCD0fOryDe70WTqDSaNud xaoHqdSk=; b=b+JJWsm/BD01FrKqcOua6+R88IJg/Y+zYcoPxy4qrJSdOFgVHdN Zaqhq1mHVxGZfHemddvwpWkxvYNQ0RjFK9rhYeCbUCtsCA6ZwBfyIMGzOlWIC7n/ N8IZ4hVsBWtc2+tsS8YTVLi9diB2KiItZXl0kIzhCyDyYjXTngJ+O+rAIXHoYaEz fkirkRCmWbXxHPrOeCyC/KSLSug1l0xbM0jl+uDLh7lvNuBUz0PXSLkplHb2EusZ 8OgOprnSZ51ZZmTPASiNx42tDGCm+2QS61C5Nec6xTKXRl2naV2wgc/PSfYI1vVZ U3XyjHMuhpln4h0p/tDpSW2lMAAQGOCa8mQ== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvkedruddvuddgkeejucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucgfrhhlucfvnfffucdlfeehmdenucfjughrpefhvf evufffkffojghfgggtgfesthekredtredtjeenucfhrhhomheprfhhihhlihhpucfotgfi rhgrthhhuceophhhihhlihhpsehphhhilhhiphhmtghgrhgrthhhrdgtohhmqeenucggtf frrghtthgvrhhnpeeggfeugfeftddvjefhtedtuedvudehheegvedvkefgleevffeftdfh hfekteegffenucffohhmrghinhepghhithhhuhgsrdgtohhmnecuvehluhhsthgvrhfuih iivgeptdenucfrrghrrghmpehmrghilhhfrhhomhepphhhihhlihhpsehphhhilhhiphhm tghgrhgrthhhrdgtohhm X-ME-Proxy: Feedback-ID: i2b1146f3:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Thu, 9 Nov 2023 11:27:26 -0500 (EST) From: Philip McGrath To: 67019@debbugs.gnu.org Subject: [PATCH 13/16] gnu: js-commander: Install as a node module. Date: Thu, 9 Nov 2023 11:26:35 -0500 Message-ID: X-Mailer: git-send-email 2.41.0 In-Reply-To: References: MIME-Version: 1.0 X-Debbugs-Cc: Philip McGrath , Julien Lepiller , pukkamustard Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 67019 Cc: Philip McGrath X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) Previously, NPM would not find 'commander' when resolving dependencies. In case anyone is using it, keep building the bundled version at 'share/javascript/commander/index.min.js', too. * gnu/packages/javascript.scm (js-commander)[build-system]: Use 'node-build-system'. [arguments]: Delete unpackaged 'devDependencies'. Build bundle for compatibility. --- gnu/packages/javascript.scm | 52 ++++++++++++++++++++++++++----------- 1 file changed, 37 insertions(+), 15 deletions(-) diff --git a/gnu/packages/javascript.scm b/gnu/packages/javascript.scm index c62b23a4c4..97cb3b6270 100644 --- a/gnu/packages/javascript.scm +++ b/gnu/packages/javascript.scm @@ -7,6 +7,7 @@ ;;; Copyright © 2021 Pierre Neidhardt ;;; Copyright © 2021 Maxim Cournoyer ;;; Copyright © 2022 Frank Pursel +;;; Copyright © 2023 Philip McGrath ;;; ;;; This file is part of GNU Guix. ;;; @@ -42,6 +43,7 @@ (define-module (gnu packages javascript) #:use-module (guix build-system cmake) #:use-module (guix build-system gnu) #:use-module (guix build-system minify) + #:use-module (guix build-system node) #:use-module (guix build-system trivial) #:use-module (guix utils)) @@ -384,22 +386,42 @@ (define-public js-commander (sha256 (base32 "1xwh85kbxj76ni41r2h0apl8mjbfcnmxzzp3vlspq30w8kwfckni")))) - (build-system trivial-build-system) + (build-system node-build-system) (arguments - `(#:modules ((guix build utils)) - #:builder - (begin - (use-modules (guix build utils)) - (chdir (assoc-ref %build-inputs "source")) - (let ((esbuild (search-input-file %build-inputs "/bin/esbuild")) - (target (string-append %output "/share/javascript/commander"))) - (invoke esbuild - "--bundle" - "--minify" - "--tsconfig=tsconfig.json" - "--platform=node" - (string-append "--outfile=" target "/index.min.js") - "index.js"))))) + (list + #:tests? #f ; many more dependencies + #:phases + #~(modify-phases %standard-phases + (add-after 'patch-dependencies 'delete-dependencies + (lambda args + (delete-dependencies `(;; devDependencies + "@types/jest" + "@types/node" + "@typescript-eslint/eslint-plugin" + "@typescript-eslint/parser" + "eslint" + "eslint-config-standard" + "eslint-config-standard-with-typescript" + "eslint-plugin-import" + "eslint-plugin-jest" + "eslint-plugin-n" + "eslint-plugin-promise" + "jest" + "ts-jest" + "tsd" + "typescript")))) + (add-after 'install 'install-compat + (lambda args + ;; This is what this package built before adopting + ;; node-build-system. Does anything use it? + (invoke "esbuild" + "--bundle" + "--minify" + "--platform=node" + (string-append "--outfile=" + #$output + "/share/javascript/commander/index.min.js") + "index.js")))))) (native-inputs (list esbuild)) (home-page "https://github.com/tj/commander.js") -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Thu Nov 09 11:28:19 2023 Received: (at 67019) by debbugs.gnu.org; 9 Nov 2023 16:28:20 +0000 Received: from localhost ([127.0.0.1]:48541 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1r17tD-0004dh-3N for submit@debbugs.gnu.org; Thu, 09 Nov 2023 11:28:19 -0500 Received: from wout5-smtp.messagingengine.com ([64.147.123.21]:49609) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1r17t7-0004cO-Tr for 67019@debbugs.gnu.org; Thu, 09 Nov 2023 11:28:14 -0500 Received: from compute5.internal (compute5.nyi.internal [10.202.2.45]) by mailout.west.internal (Postfix) with ESMTP id E912F3200A47; Thu, 9 Nov 2023 11:27:28 -0500 (EST) Received: from mailfrontend1 ([10.202.2.162]) by compute5.internal (MEProxy); Thu, 09 Nov 2023 11:27:29 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= philipmcgrath.com; h=cc:cc:content-transfer-encoding :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=1699547248; x=1699633648; bh=TvLYFhRUmx QVgc7MzzlUM6Eaqi7+ZzgSDbtYajl7ego=; b=cQaswcaTZsE4rFue6tCH4jf3b0 CIFI4P8YGAElPAXG6sr7obIypvvPuHeREGr2BZoX7XhG/DTd4AsWoQzHMRgiUuLj SsKDFL19G8Bws9euX++o7IuHomm8uBEqYDCh1Uc3BJNSihSyJY5c5KPnYL5fTfCF YXi0LdXn18R3XMUWO101BYLsArcfjLNieX/fuWyNiiL4XSLfmyPmAAbPJd3Tum78 TzkxluD5aURidCpiDfU36+SU8OGB4k45hfcglXkWCldo3wMIACCokjbai3bSGDPq Gz8/edlRln6wIHmJHR8Sspt9a06Kk6FzLPZehagxk/5+jqFRAOt4jCfz4Y7w== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:cc:content-transfer-encoding :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=1699547248; x= 1699633648; bh=TvLYFhRUmxQVgc7MzzlUM6Eaqi7+ZzgSDbtYajl7ego=; b=g HsUxIWa5JQ+afFUfu/dRpWp6r9GEGUL8zquqHB2xQdrEUMKQFYYEO5CitmU3Gslp /OO8feKxO3OcPWYCM0qSnUUU+aS8taeZRNbJoYeyTPI6cKe/SXhmOCSEV5mvnlub n5S6KP8eiT5jS715rqcDgXM8S9wxe50YT+bUWkRqqiZ9+AftxjUNbcH8hmlIo5eY pw/pyqGn1Nd4quT4zUOZxPOFWGHi+cDuwyKZ79Moxy+CTyowj/TrOL5eJDb64+9N 5C29ikH1SPHhITRwm0GU6sfyywOUcKWZbCPy7ihYi9wkJZXGbipbWfb4ky6kqlM5 lnveHeqOb/RSmYnDiMZMw== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvkedruddvuddgkeejucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucgoufhushhpvggtthffohhmrghinhculdegledmne cujfgurhephffvvefufffkofgjfhgggfestdekredtredttdenucfhrhhomheprfhhihhl ihhpucfotgfirhgrthhhuceophhhihhlihhpsehphhhilhhiphhmtghgrhgrthhhrdgtoh hmqeenucggtffrrghtthgvrhhnpeegveeugffggfdtfeeufeevgfeliefgieeufedukeef heeukefhgedvgfejheeugfenucffohhmrghinhepshhouhhrtggvfhhorhhgvgdrnhgvth dpghhithhhuhgsrdgtohhmpdhlihhlhihpohhnugdrohhrghenucevlhhushhtvghrufhi iigvpedtnecurfgrrhgrmhepmhgrihhlfhhrohhmpehphhhilhhiphesphhhihhlihhpmh gtghhrrghthhdrtghomh X-ME-Proxy: Feedback-ID: i2b1146f3:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Thu, 9 Nov 2023 11:27:27 -0500 (EST) From: Philip McGrath To: 67019@debbugs.gnu.org Subject: [PATCH 14/16] gnu: Add mftrace. Date: Thu, 9 Nov 2023 11:26:36 -0500 Message-ID: <19765a75ed634d3c1749e9a81c25a31be27a8c75.1699540553.git.philip@philipmcgrath.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: References: MIME-Version: 1.0 X-Debbugs-Cc: Philip McGrath , Julien Lepiller , pukkamustard Content-Transfer-Encoding: 8bit X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 67019 Cc: Philip McGrath X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) * gnu/packages/fontutils.scm (mftrace): New variable. --- gnu/packages/fontutils.scm | 45 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 45 insertions(+) diff --git a/gnu/packages/fontutils.scm b/gnu/packages/fontutils.scm index 5bfdea1b27..6bab6ab7df 100644 --- a/gnu/packages/fontutils.scm +++ b/gnu/packages/fontutils.scm @@ -1182,6 +1182,51 @@ (define-public ttf2pt1 (home-page "https://ttf2pt1.sourceforge.net/") (license license:bsd-3))) +(define-public mftrace + (let ((commit "3b4bc2e5b8a4ae6f9c776593961b38389e62a484") + ;; see https://github.com/hanwen/mftrace/pull/12 + (revision "0")) + (package + (name "mftrace") + (version (git-version "1.2.20" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/hanwen/mftrace") + (commit commit))) + (sha256 + (base32 "01cg6z1z69za07wrvx1y5dnfagx4di2a9qnx25f97l6843x03s36")) + (file-name (git-file-name name version)))) + (build-system gnu-build-system) + (native-inputs (list autoconf + ;; for tests: + (texlive-updmap.cfg + (list texlive-cm)))) + (propagated-inputs (list potrace lcdf-typetools)) + (arguments + (list + ;; setting CC is needed for implicit rule + #:make-flags #~(list (string-append "CC=" #$(cc-for-target))) + #:test-target "test" + #:phases + #~(modify-phases %standard-phases + (replace 'bootstrap + (lambda args + (invoke "autoconf")))))) + (home-page "https://lilypond.org/mftrace/") + (synopsis "Scalable PostScript fonts for MetaFont") + (description "This package provides @command{mftrace}, a small Python +program that lets you trace a TeX bitmap font into a PFA or PFB font (a +PostScript Type 1 Scalable Font) or a @acronym{TTF,TrueType Font}. + +Scalable fonts offer many advantages over bitmaps, as they allow documents to +render correctly at many printer resolutions. Moreover, Ghostscript can +generate much better PDFs if given scalable PostScript fonts. + +Versions of this program prior to 1.0.5 were called @command{pktrace}.") + (license license:gpl2+)))) + (define-public woff2 (package (name "woff2") -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Thu Nov 09 11:28:20 2023 Received: (at 67019) by debbugs.gnu.org; 9 Nov 2023 16:28:20 +0000 Received: from localhost ([127.0.0.1]:48543 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1r17tD-0004dj-Rv for submit@debbugs.gnu.org; Thu, 09 Nov 2023 11:28:20 -0500 Received: from wout5-smtp.messagingengine.com ([64.147.123.21]:59971) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1r17t9-0004cT-9q for 67019@debbugs.gnu.org; Thu, 09 Nov 2023 11:28:15 -0500 Received: from compute5.internal (compute5.nyi.internal [10.202.2.45]) by mailout.west.internal (Postfix) with ESMTP id 5A7D93200B56; Thu, 9 Nov 2023 11:27:30 -0500 (EST) Received: from mailfrontend1 ([10.202.2.162]) by compute5.internal (MEProxy); Thu, 09 Nov 2023 11:27:30 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= philipmcgrath.com; h=cc:cc:content-transfer-encoding :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=1699547249; x=1699633649; bh=hzOWIYY8DG eo2gwVnQmIMFa+q3DnC8RCm3VUsXPBkXI=; b=3dmeVbtLqOg4UeNFwbxuNszoiW sTHXQN1OqMeDWk/KzKpGXlpcnKjvqCXVmD8/kwaM1oXk5iwgD7LJq00pcKCTHkGO YKD5eF40p6+gd2ii94PyP2+r8kU/NALDxATYeLahGgirB//LM+LNYhFaVSYkSRER C01HM5sj+ArJriJqY6/U5DHzindjzd3o0Ow6iCdXX9KPOZI8tV7K3AcmQZsVkp0u DKciAnfHrtJsgPZgDMYfsxSuEZ2YcsIXGTIrkWCeD2vj32q0KN9HAQOaOpk7C2p0 Bj6LhAiXSxdjEpDo9os2HKfwokjLO3t1HTqUPJBsTydQPczsluyBtN09GZ0Q== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:cc:content-transfer-encoding :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=1699547249; x= 1699633649; bh=hzOWIYY8DGeo2gwVnQmIMFa+q3DnC8RCm3VUsXPBkXI=; b=F nfbhH2lhb8ZLs4O1ptyxN7pniDt494/aKS69cfUVQzRUDgp/izm5yffqOUREKC9Q +VGox/610M1IamtKZVjzdxFtEoNEeHTyH4f6AEIuaF7rrfBUJE/zdXuXK4U/xJD8 hSuhEym6NdIOVOwFyiPA2VRorH8xTOruTP8FQU2h7pNVhL6U3Ki8AYkP3J88Wne1 NddvgBBY3IJ4QoBXvOG9mfoepCnqQM8Vqs285BfF8iW2bSRgzCetelC04IxtV9Kw FJogFesQTE4+XlDZhkLPlzxE3VJu1vdPM7LGREZWLcAESyPD1SdCdD7RuZ6Js3L6 Yl0692qmgxqes9BzET0YQ== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvkedruddvuddgkeejucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucenucfjughrpefhvfevufffkffojghfggfgsedtke ertdertddtnecuhfhrohhmpefrhhhilhhiphcuofgtifhrrghthhcuoehphhhilhhiphes phhhihhlihhpmhgtghhrrghthhdrtghomheqnecuggftrfgrthhtvghrnhepjeeuvedule duteelfeevhfehtdeikeelheegheejgeetkeefhedukeevhedvgefgnecuffhomhgrihhn pehgihhthhhusgdrtghomhdpkhgrthgvgidrohhrghenucevlhhushhtvghrufhiiigvpe dtnecurfgrrhgrmhepmhgrihhlfhhrohhmpehphhhilhhiphesphhhihhlihhpmhgtghhr rghthhdrtghomh X-ME-Proxy: Feedback-ID: i2b1146f3:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Thu, 9 Nov 2023 11:27:29 -0500 (EST) From: Philip McGrath To: 67019@debbugs.gnu.org Subject: [PATCH 15/16] gnu: Add font-katex. Date: Thu, 9 Nov 2023 11:26:37 -0500 Message-ID: <2dde955ad085ec06cf5734171cefc26c36465c5a.1699540553.git.philip@philipmcgrath.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: References: MIME-Version: 1.0 X-Debbugs-Cc: Philip McGrath , Julien Lepiller , pukkamustard Content-Transfer-Encoding: 8bit X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 67019 Cc: Philip McGrath X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) * gnu/packages/javascript.scm (font-katex): New variable. --- gnu/packages/javascript.scm | 74 +++++++++++++++++++++++++++++++++++++ 1 file changed, 74 insertions(+) diff --git a/gnu/packages/javascript.scm b/gnu/packages/javascript.scm index 97cb3b6270..ee7a48154c 100644 --- a/gnu/packages/javascript.scm +++ b/gnu/packages/javascript.scm @@ -30,9 +30,15 @@ (define-module (gnu packages javascript) #:use-module (gnu packages base) #:use-module (gnu packages bash) #:use-module (gnu packages compression) + #:use-module (gnu packages fontutils) #:use-module (gnu packages java) #:use-module (gnu packages node) + #:use-module (gnu packages perl) + #:use-module (gnu packages python) + #:use-module (gnu packages python-compression) + #:use-module (gnu packages python-xyz) #:use-module (gnu packages readline) + #:use-module (gnu packages tex) #:use-module (gnu packages uglifyjs) #:use-module (gnu packages web) #:use-module (guix gexp) @@ -41,6 +47,7 @@ (define-module (gnu packages javascript) #:use-module (guix git-download) #:use-module (guix build-system ant) #:use-module (guix build-system cmake) + #:use-module (guix build-system copy) #:use-module (guix build-system gnu) #:use-module (guix build-system minify) #:use-module (guix build-system node) @@ -372,6 +379,73 @@ (define-public js-mathjax-for-r-mathjaxr (base32 "1q063l6477z285j6h5wvccp6iswvlp0jmb96sgk32sh0lf7nhknh"))))))))) +(define-public font-katex + (package + (name "font-katex") + (version "0.16.4") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/KaTeX/KaTeX") + (commit (string-append "v" version)))) + (sha256 + (base32 + "0z6y2188lhfv0gk0hp4rm37g6fs99qb3ab2q3n9g76ga9dwxhw3s")) + (snippet + ;; unbundle generated files + #~(begin + (use-modules (guix build utils)) + (delete-file "src/fontMetricsData.js") + (delete-file-recursively "fonts"))) + (file-name (git-file-name "katex" version)))) + (build-system copy-build-system) + (native-inputs (list (texlive-updmap.cfg + (list texlive-amsfonts + texlive-cm + texlive-fonts-rsfs)) + fontforge + mftrace + ttfautohint + perl + perl-json + python + python-fonttools + python-brotli + python-zopfli + which)) + (arguments + (list + #:install-plan + #~`(("fonts/" "share/fonts/truetype/katex/") + ("src/fontMetricsData.js" "share/katex/")) + #:imported-modules + `((guix build union) + ,@%copy-build-system-modules) + #:modules + '((guix build copy-build-system) + (guix build union) + (guix build utils)) + #:phases + #~(modify-phases %standard-phases + (add-before 'install 'build + (lambda args + (invoke "make" "-C" "src/fonts" "all") + (union-build "fonts" + '("src/fonts/ttf" + "src/fonts/woff" + "src/fonts/woff2") + #:symlink copy-file))) + (add-after 'build 'build-metrics + (lambda args + (with-directory-excursion "dockers/fonts" + ;; script assumes it is run from this directory + (invoke "./buildMetrics.sh"))))))) + (home-page "https://katex.org") + (synopsis "Fonts for KaTeX") + (description "This package contains the fonts required for KaTeX.") + (license license:expat))) + (define-public js-commander (package (name "js-commander") -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Thu Nov 09 11:28:21 2023 Received: (at 67019) by debbugs.gnu.org; 9 Nov 2023 16:28:21 +0000 Received: from localhost ([127.0.0.1]:48545 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1r17tE-0004dr-Db for submit@debbugs.gnu.org; Thu, 09 Nov 2023 11:28:21 -0500 Received: from wout5-smtp.messagingengine.com ([64.147.123.21]:58689) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1r17tB-0004cl-0I for 67019@debbugs.gnu.org; Thu, 09 Nov 2023 11:28:18 -0500 Received: from compute6.internal (compute6.nyi.internal [10.202.2.47]) by mailout.west.internal (Postfix) with ESMTP id 104B63200B59; Thu, 9 Nov 2023 11:27:31 -0500 (EST) Received: from mailfrontend1 ([10.202.2.162]) by compute6.internal (MEProxy); Thu, 09 Nov 2023 11:27:32 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= philipmcgrath.com; h=cc:cc:content-transfer-encoding :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=1699547251; x=1699633651; bh=cVOIUCojWI MibNt/4/ps5FcqYscpDwqoSyikZmtVKZU=; b=yylvLOPubwO1Tom6Oyoc3dDY8d qZiDIdL+yJfVtcNJR7Hvh8qPgqrP0PbpUp0foXrAD/DSJ8zyLP2yNi5iJBAM683i 8NXafUajOx4cOOhRsVvNgO23kXeSx4+b2BHo+41oe9rMDf7txetwKb4h7q3sachM u1C9RvQ5K5WXhFaxELCqyPjMk5xxluVN+xkbV7/q1uadkyYHX4cR54sJnAzae+B1 KGIXYcZCpQI2rwSIa0bBQkXLccJPRCYAT2EgP5tTeyPbIaEXAYPgLeoiEcWsq7KJ 34GaOGWqpRmNJrSZA6hqvSwIPgmBhwRFIFwaPUBDjo/fiD6OJYTRfMsvgGQw== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:cc:content-transfer-encoding :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=1699547251; x= 1699633651; bh=cVOIUCojWIMibNt/4/ps5FcqYscpDwqoSyikZmtVKZU=; b=h fzIQz14Yr4wstXQsosICVXa7tKf3kIiixcAw2VGK/FxLDMUNrABBCU5i7KykOkM4 Ct+iqhg5/PMukjrsziHlLfjrLoCnq8S7Vlz3Zq6Ui0ZyqrxfN24XOuKpr9PbNNNy fOaC18nJoMtAHNRFRcNrl7/eQNnEiW0SRVIPrZEh/Ez8TzobW8nmbWWYGN+KfVM8 6ZkFQP0Dd0El52rj6i24hPPUYlh/QGEbmHubWOG7v9emPejduTHPrBwT5XiNZiSX dJf8vXvH1ntdno/Kgwa+Wmr6LoTvPeRzMWGHZZhH5A6oGzOJOhi1E8dKxCugqwNy bqQeJmYHKMxGHy3DrqUPA== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvkedruddvuddgkeejucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucenucfjughrpefhvfevufffkffojghfggfgsedtke ertdertddtnecuhfhrohhmpefrhhhilhhiphcuofgtifhrrghthhcuoehphhhilhhiphes phhhihhlihhpmhgtghhrrghthhdrtghomheqnecuggftrfgrthhtvghrnhepleevkeffue dvgfeihefhgeefjeevueekudfhteffueffieekudehvdeivefgudejnecuffhomhgrihhn pehkrghtvgigrdhorhhgnecuvehluhhsthgvrhfuihiivgeptdenucfrrghrrghmpehmrg hilhhfrhhomhepphhhihhlihhpsehphhhilhhiphhmtghgrhgrthhhrdgtohhm X-ME-Proxy: Feedback-ID: i2b1146f3:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Thu, 9 Nov 2023 11:27:30 -0500 (EST) From: Philip McGrath To: 67019@debbugs.gnu.org Subject: [PATCH 16/16] gnu: Add katex. Date: Thu, 9 Nov 2023 11:26:38 -0500 Message-ID: X-Mailer: git-send-email 2.41.0 In-Reply-To: References: MIME-Version: 1.0 X-Debbugs-Cc: Philip McGrath , Julien Lepiller , pukkamustard Content-Transfer-Encoding: 8bit X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 67019 Cc: Philip McGrath X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) * gnu/packages/javascript.scm (katex): New variable. --- gnu/packages/javascript.scm | 255 +++++++++++++++++++++++++++++++++++- 1 file changed, 253 insertions(+), 2 deletions(-) diff --git a/gnu/packages/javascript.scm b/gnu/packages/javascript.scm index ee7a48154c..76a51c22ac 100644 --- a/gnu/packages/javascript.scm +++ b/gnu/packages/javascript.scm @@ -32,6 +32,7 @@ (define-module (gnu packages javascript) #:use-module (gnu packages compression) #:use-module (gnu packages fontutils) #:use-module (gnu packages java) + #:use-module (gnu packages man) #:use-module (gnu packages node) #:use-module (gnu packages perl) #:use-module (gnu packages python) @@ -382,7 +383,7 @@ (define-public js-mathjax-for-r-mathjaxr (define-public font-katex (package (name "font-katex") - (version "0.16.4") + (version "0.16.9") (source (origin (method git-fetch) @@ -391,7 +392,7 @@ (define-public font-katex (commit (string-append "v" version)))) (sha256 (base32 - "0z6y2188lhfv0gk0hp4rm37g6fs99qb3ab2q3n9g76ga9dwxhw3s")) + "1aq8n9s4r15m1fdi4h58qxal4brkafm4xsw6rpz40wqi9454kkgn")) (snippet ;; unbundle generated files #~(begin @@ -446,6 +447,256 @@ (define-public font-katex (description "This package contains the fonts required for KaTeX.") (license license:expat))) +(define-public katex + (package + (inherit font-katex) + (name "katex") + (outputs '("out" "dist")) + (build-system node-build-system) + (native-inputs + (list esbuild + flow-remove-types + help2man + lessc)) + (inputs + (list font-katex + js-commander)) + (arguments + (list + #:tests? #f ; many more dependencies + #:modules + `((guix build node-build-system) + (ice-9 match) + (srfi srfi-1) + (srfi srfi-26) + (guix build utils)) + #:phases + #~(modify-phases %standard-phases + (add-before 'patch-dependencies 'move-sources + (lambda* (#:key inputs #:allow-other-keys) + ;; Our node-build-system doesn't properly respect the "files" + ;; entry in "package.json" to determine which files to install. + ;; This case is particularly egregious because the source + ;; repository also contains the source for the whole katex.org + ;; website. For now, manually do what "files" ought to do. + (mkdir "../guix-source") + (copy-recursively "src" "../guix-source/src") + (copy-recursively "contrib" "../guix-source/contrib") + (for-each (cut install-file <> "../guix-source") + '("README.md" + "LICENSE" + "package.json" + "katex.js" + "cli.js")) + (install-file + (search-input-file inputs "share/katex/fontMetricsData.js") + "../guix-source/src") + (chdir "../guix-source"))) + (add-after 'move-sources 'patch-package-json + (lambda args + (with-atomic-json-file-replacement "package.json" + (match-lambda + (('@ . alist) + (cons '@ + (filter-map + (match-lambda + (((or "devDependencies" "scripts") . _) + #f) + ;; ESBuild can't generate Universal Module Definitions, + ;; so keep our CJS separate from our browser builds: + (("files" . lst) + `("files" "guix-node-cjs/" ,@lst)) + (("main" . "dist/katex.js") + `("main" . "guix-node-cjs/katex.js")) + (("exports" '@ . alist) + `("exports" @ + ,@(map (match-lambda + (("./*" . "./*") + `("./*" . "./*")) + ((lhs '@ . alist) + `(,lhs @ + ,@(map (match-lambda + (("require" . ,str) + (cons + "require" + (string-append + "./guix-node-cjs/" + (substring str + (string-length + "./dist"))))) + (other + other)) + alist)))) + alist))) + (other + other)) + alist))))))) + (add-after 'patch-dependencies 'patch-sources + (lambda* (#:key inputs #:allow-other-keys) + (substitute* "src/SourceLocation.js" + ;; for some reason, the + prefix isn't handled + ;; by flow-remove-types + (("[+](lexer|start|end)" _ name) + name)) + (substitute* "src/fonts.less" + ;; what webpack would do + (("@font-folder: \"\\.\\./fonts\";" orig) + (string-append "@font-folder: \"fonts\"; // " orig))) + (define version + #$(package-version this-package)) + (substitute* "src/katex.less" + (("@version: \"\";" orig) + (string-append "@version: \"" version "\"; // " orig))) + (substitute* "katex.js" + (("version: __VERSION__," orig) + (string-append "version: \"" version "\", // " orig))))) + (add-after 'patch-sources 'erase-types + (lambda args + (invoke "flow-remove-types" + "--sourcemaps" + "--out-dir" "../erased/src/" + "src/") + (invoke "flow-remove-types" + "--sourcemaps" + "--out-dir" "../erased/" + "katex.js") + (invoke "flow-remove-types" + "--sourcemaps" + "--out-dir" "../erased/contrib/" + "contrib/"))) + (add-after 'erase-types 'build-js + (lambda args + (with-directory-excursion "../erased" + ;; ^ avoid "../erased" in generated code + (define (esbuild . args) + (apply invoke `("esbuild" + "--bundle" + "--log-limit=0" + "--platform=neutral" + ,@args))) + (esbuild "--outfile=../guix-source/dist/katex.mjs" + "--format=esm" + "katex.js") + ;; Workaround for different handling of ES6 default export + ;; when generating CJS: + (esbuild "--outfile=katex-cjs.js" + "--format=cjs" + "katex.js") + (with-output-to-file "katex-wrapper.js" + (lambda () + (display + "module.exports = require('./katex-cjs.js').default;\n"))) + (esbuild "--outfile=../guix-source/guix-node-cjs/katex.js" + "--format=cjs" + "katex-wrapper.js") + (esbuild "--outfile=../guix-source/dist/katex.js" + "--format=iife" + "--global-name=katex" + "katex-wrapper.js") + (esbuild "--outfile=../guix-source/dist/katex.min.js" + "--minify" + "--format=iife" + "--global-name=katex" + "katex-wrapper.js") + ;; Build extensions: + (for-each + (match-lambda + ((name export) + ;; The copy-tex extension doesn't actually import katex, + ;; but it's harmless to handle it the same way. + (with-directory-excursion (string-append "contrib/" name) + (esbuild (string-append "--outfile=../../../guix-source" + "/guix-node-cjs/contrib/" + name ".js") + "--format=cjs" + "--external:katex" + (string-append name ".js")) + (substitute* (string-append name ".js") + (("import katex from \"katex\";") + "import katex from \"../katex.mjs\";")) + (esbuild (string-append "--outfile=" name ".mjs") + "--format=esm" + "--external:../katex.mjs" + (string-append name ".js")) + (install-file (string-append name ".mjs") + "../../../guix-source/dist/contrib") + (substitute* (string-append name ".js") + (("import katex") + "// import katex")) + (for-each + (lambda (minify?) + (apply + esbuild + `(,(string-append "--outfile=../../.." + "/guix-source/dist/contrib/" + name + (if minify? ".min" "") + ".js") + "--format=iife" + ,@(if minify? + '("--minify") + '()) + ,@(if export + `("--global-name=guixTmp" + ,(string-append "--banner:js=const " + export + " = (() => {") + "--footer:js=return guixTmp.default;\n})();") + '()) + ,(string-append name ".js")))) + '(#t #f))))) + '(("auto-render" "renderMathInElement") + ("copy-tex" #f) + ("mathtex-script-type" #f) + ("mhchem" #f) + ("render-a11y-string" "renderA11yString")))))) + (add-after 'build-js 'build-css + (lambda args + (invoke "lessc" "src/katex.less" "dist/katex.css"))) + (add-after 'install 'generate-man-page + (lambda args + (invoke "help2man" + "-N" + "-n" "render TeX math to HTML and MathML" + "--output=katex.1" + (string-append #$output "/bin/katex")) + (install-file "katex.1" + (string-append #$output "/share/man/man1")))) + (add-after 'generate-man-page 'install-dist + (lambda* (#:key inputs #:allow-other-keys) + ;; The CSS, fonts, etc. needed for KaTeX, plus the optional + ;; bundled version of the JavaScript for dynamic use in the + ;; browser, are in the 'dist' directory of the Node module. + ;; Putting them in a separate output lets them be used without + ;; retaining a reference to Node and the cli utility. + ;; In Debian, 'dist' is a symlink to /usr/share/javascript/katex: + ;; do likewise to help tools that may need to find it. + (define up-dist-dir + (string-append #$output:dist "/share/javascript")) + (define dist-dir + (string-append up-dist-dir "/katex")) + (mkdir-p up-dist-dir) + (with-directory-excursion + (string-append #$output "/lib/node_modules/katex") + (rename-file "dist" dist-dir) + (symlink dist-dir "dist")) + (with-directory-excursion dist-dir + ;; Link the fonts to where the CSS expects them: + (symlink (search-input-directory inputs + "share/fonts/truetype/katex") + "fonts") + ;; We can't actually minify the CSS, but fake it for anything + ;; that may expect it. With Brotli compression, the difference + ;; is only about 300 bytes anyway. + (symlink "katex.css" "katex.min.css"))))))) + (synopsis "Fast math typesetting for the web") + (description "KaTeX renders TeX math notation to HTML and/or MathML. The +rendered output does not depend on JavaScript, so rendering can be done +entirely ahead-of-time using the @command{katex} command-line tool. When +desired, KaTeX can also be used as a JavaScript library in the browser to +render math dynamically, and it is designed to be fast, even on pages with +hundreds of mathematical expressions."))) + (define-public js-commander (package (name "js-commander") -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Fri Nov 10 19:57:00 2023 Received: (at 67019) by debbugs.gnu.org; 11 Nov 2023 00:57:00 +0000 Received: from localhost ([127.0.0.1]:51179 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1r1cJ1-0005ij-8E for submit@debbugs.gnu.org; Fri, 10 Nov 2023 19:57:00 -0500 Received: from mail-ej1-x642.google.com ([2a00:1450:4864:20::642]:43518) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1r1cIy-0005iT-Bi for 67019@debbugs.gnu.org; Fri, 10 Nov 2023 19:56:58 -0500 Received: by mail-ej1-x642.google.com with SMTP id a640c23a62f3a-9c3aec5f326so758230366b.1 for <67019@debbugs.gnu.org>; Fri, 10 Nov 2023 16:56:16 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1699664170; x=1700268970; darn=debbugs.gnu.org; h=mime-version:user-agent:content-transfer-encoding:references :in-reply-to:date:to:from:subject:message-id:from:to:cc:subject:date :message-id:reply-to; bh=4GZCRIOqP/l1RolBtwQ02zGrDL+Ex19ZDJWuAbwJQ/g=; b=MVsrWTOtsOyXH40nT85HNybjyVPoBZ1+OcMhVklBl7IoqaKrc7sBElDh7P/umd0wZX Gnn93uq8yqCjwInohSXsilG83X/t6ZJ6kKip7LNx8zAr9DlRS3bUEB4VOVII3W4RlRr2 p8RL2KimeOK911i5PGkj5vUgOP8BIVIGDtCb75NJz7BtvBaPT4t2wruhckjFRQf/YjtN CjKjtyUsNFqrjp3ziftk5rtsy2gc8I+6SShB7csRTlqOGX/AUm6qJcqzshekRXKYWt/A Gi3ybrnXopmPnMUMU6DZLsTRO/zw7h93/sDcD5WGg3Wt19TlbCHymo8RSDHb4j03Kl0H neMA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1699664170; x=1700268970; h=mime-version:user-agent:content-transfer-encoding:references :in-reply-to:date:to:from:subject:message-id:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=4GZCRIOqP/l1RolBtwQ02zGrDL+Ex19ZDJWuAbwJQ/g=; b=jO+kq6SevA78GAY0wNxSq8QDD8q+Oir8tLxIiYWyOr0X6RXaFXivsyMCCQt0ecfsz2 +sBenXVn/3wFlqzTgl4Q1MVH9YltY1B8h59Y+BFZk+xhoSHysJIMd8EN26jhuCimuNO9 gZHm3xivqu1NyiFldKQpke73gk/Xg0zZVN19RMp5IJzsVoXwuc83Kxh5/5d50PsF4Za3 SQlG1n5JxSGRGIlgDFt+Wwn9mPRmHh1bQTbB1VeLRiPHKMdHK70zNTnEq+74dSpCKnh2 mFKcKinzo9G+zckjeyvPdJWc6mYaWJX43UJQGnK6Vc68uUbi1q0f3f9JkLLDfaCYjj0n Y12Q== X-Gm-Message-State: AOJu0YzjQRH9vSddE382K62/c1SQz5Ua8kw5u3FVqdx1ujGLi7BLmIxb /xMzcdtEIxftbd63fpl6lZw= X-Google-Smtp-Source: AGHT+IGnJfOvqhJkzGsru0T9/NgJmu800lIU702+HHA6UWsAVZ16Qzhk3YNGr1l1rfGZ1XxafIk6LA== X-Received: by 2002:a17:906:d0da:b0:9b2:b808:6a1c with SMTP id bq26-20020a170906d0da00b009b2b8086a1cmr572510ejb.35.1699664170241; Fri, 10 Nov 2023 16:56:10 -0800 (PST) Received: from lumine.fritz.box (85-127-52-93.dsl.dynamic.surfer.at. [85.127.52.93]) by smtp.gmail.com with ESMTPSA id a10-20020a1709065f8a00b009887f4e0291sm277484eju.27.2023.11.10.16.56.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 10 Nov 2023 16:56:09 -0800 (PST) Message-ID: Subject: Re: [PATCH 03/16] gnu: Add lessc. From: Liliana Marie Prikler To: Philip McGrath , 67019@debbugs.gnu.org Date: Sat, 11 Nov 2023 01:56:06 +0100 In-Reply-To: References: Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: base64 User-Agent: Evolution 3.46.4 MIME-Version: 1.0 X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 67019 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) QW0gRG9ubmVyc3RhZywgZGVtIDA5LjExLjIwMjMgdW0gMTE6MjYgLTA1MDAgc2NocmllYiBQaGls aXAgTWNHcmF0aDoKPiAqIGdudS9wYWNrYWdlcy93ZWIuc2NtIChsZXNzYyk6IE5ldyB2YXJpYWJs ZS4KPiAtLS0KPiDCoGdudS9wYWNrYWdlcy93ZWIuc2NtIHwgMTg3Cj4gKysrKysrKysrKysrKysr KysrKysrKysrKysrKysrKysrKysrKysrKysrKwo+IMKgMSBmaWxlIGNoYW5nZWQsIDE4NyBpbnNl cnRpb25zKCspCj4gCj4gZGlmZiAtLWdpdCBhL2dudS9wYWNrYWdlcy93ZWIuc2NtIGIvZ251L3Bh Y2thZ2VzL3dlYi5zY20KPiBpbmRleCA2NmQwOTcwMGRiLi44ZTIyOTk3OTU3IDEwMDY0NAo+IC0t LSBhL2dudS9wYWNrYWdlcy93ZWIuc2NtCj4gKysrIGIvZ251L3BhY2thZ2VzL3dlYi5zY20KPiBA QCAtNjQsNiArNjQsNyBAQAo+IMKgOzs7IENvcHlyaWdodCDCqSAyMDIzIERhdmlkIFRob21wc29u IDxkdGhvbXBzb24yQHdvcmNlc3Rlci5lZHU+Cj4gwqA7OzsgQ29weXJpZ2h0IMKpIDIwMjMgQ2hy aXN0b3BoZXIgSG93YXJkCj4gPGNocmlzdG9waGVyQGxpYnJlaGFja2VyLmNvbT4KPiDCoDs7OyBD b3B5cmlnaHQgwqkgMjAyMyBGZWxpeCBMZWNobmVyIDxmZWxpeC5sZWNobmVyQGxlYXNlLXVwLmNv bT4KPiArOzs7IENvcHlyaWdodCDCqSAyMDIzIFBoaWxpcCBNY0dyYXRoIDxwaGlsaXBAcGhpbGlw bWNncmF0aC5jb20+Cj4gwqA7OzsKPiDCoDs7OyBUaGlzIGZpbGUgaXMgcGFydCBvZiBHTlUgR3Vp eC4KPiDCoDs7Owo+IEBAIC05OCw2ICs5OSw3IEBAIChkZWZpbmUtbW9kdWxlIChnbnUgcGFja2Fn ZXMgd2ViKQo+IMKgwqAgIzp1c2UtbW9kdWxlIChndWl4IGJ1aWxkLXN5c3RlbSBnbnUpCj4gwqDC oCAjOnVzZS1tb2R1bGUgKGd1aXggYnVpbGQtc3lzdGVtIGdvKQo+IMKgwqAgIzp1c2UtbW9kdWxl IChndWl4IGJ1aWxkLXN5c3RlbSBtZXNvbikKPiArwqAgIzp1c2UtbW9kdWxlIChndWl4IGJ1aWxk LXN5c3RlbSBub2RlKQo+IMKgwqAgIzp1c2UtbW9kdWxlIChndWl4IGJ1aWxkLXN5c3RlbSBwZXJs KQo+IMKgwqAgIzp1c2UtbW9kdWxlIChndWl4IGJ1aWxkLXN5c3RlbSBweXByb2plY3QpCj4gwqDC oCAjOnVzZS1tb2R1bGUgKGd1aXggYnVpbGQtc3lzdGVtIHB5dGhvbikKPiBAQCAtMTY4LDYgKzE3 MCw3IEBAIChkZWZpbmUtbW9kdWxlIChnbnUgcGFja2FnZXMgd2ViKQo+IMKgwqAgIzp1c2UtbW9k dWxlIChnbnUgcGFja2FnZXMgbmN1cnNlcykKPiDCoMKgICM6dXNlLW1vZHVsZSAoZ251IHBhY2th Z2VzIG5ldHdvcmtpbmcpCj4gwqDCoCAjOnVzZS1tb2R1bGUgKGdudSBwYWNrYWdlcyBub2RlKQo+ ICvCoCAjOnVzZS1tb2R1bGUgKGdudSBwYWNrYWdlcyBub2RlLXh5eikKPiDCoMKgICM6dXNlLW1v ZHVsZSAoZ251IHBhY2thZ2VzIG5zcykKPiDCoMKgICM6dXNlLW1vZHVsZSAoZ251IHBhY2thZ2Vz IG9wZW5sZGFwKQo+IMKgwqAgIzp1c2UtbW9kdWxlIChnbnUgcGFja2FnZXMgb3BlbnN0YWNrKQo+ IEBAIC0yMzQzLDYgKzIzNDYsMTkwIEBAIChkZWZpbmUtcHVibGljIHNhc3NjL2xpYnNhc3MtMy41 Cj4gwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKg wqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqAKPiAiMDgz MHBqY3ZoenhoNnlpeGo4Mng1azVyMXhuYWRqcXppMTZrcDUzMjEzaWNibHkwcjltYSIpKSkpKSkp Cj4gwqDCoMKgwqAgKHByb3BlcnRpZXMgJygoaGlkZGVuPyAuICN0KSkpKSkKPiDCoAo+ICsoZGVm aW5lLXB1YmxpYyBsZXNzYwo+ICvCoCAocGFja2FnZQo+ICvCoMKgwqAgKG5hbWUgImxlc3NjIikK PiArwqDCoMKgICh2ZXJzaW9uICI0LjIuMCIpCj4gK8KgwqDCoCAoc291cmNlCj4gK8KgwqDCoMKg IChvcmlnaW4gKG1ldGhvZCBnaXQtZmV0Y2gpCj4gK8KgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoCAo dXJpIChnaXQtcmVmZXJlbmNlCj4gK8KgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDC oCAodXJsICJodHRwczovL2dpdGh1Yi5jb20vbGVzcy9sZXNzLmpzIikKPiArwqDCoMKgwqDCoMKg wqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgIChjb21taXQgKHN0cmluZy1hcHBlbmQgInYiIHZlcnNp b24pKSkpCj4gK8KgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoCAoc2hhMjU2Cj4gK8KgwqDCoMKgwqDC oMKgwqDCoMKgwqDCoMKgIChiYXNlMzIKPiAiMWI2YW5sYWZrN2xuYXl4eTN2aHNpNDc0amNkYWgy ZmZhdzJxeWFjNXMyaWJ4YjF3bXI1NCIpKQo+ICvCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqAgKHNu aXBwZXQKPiArwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqAgI34oYmVnaW4KPiArwqDCoMKgwqDC oMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoCAodXNlLW1vZHVsZXMgKGd1aXggYnVpbGQgdXRpbHMp KQo+ICvCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgIChkZWxldGUtZmlsZS1yZWN1 cnNpdmVseSAicGFja2FnZXMvbGVzcy9kaXN0IikpKQo+ICvCoMKgwqDCoMKgwqDCoMKgwqDCoMKg wqAgKGZpbGUtbmFtZSAoZ2l0LWZpbGUtbmFtZSBuYW1lIHZlcnNpb24pKSkpCj4gK8KgwqDCoCAo YnVpbGQtc3lzdGVtIG5vZGUtYnVpbGQtc3lzdGVtKQo+ICvCoMKgwqAgKG5hdGl2ZS1pbnB1dHMg KGxpc3QgZXNidWlsZCkpCj4gK8KgwqDCoCAoaW5wdXRzIChsaXN0IG5vZGUtY29weS1hbnl0aGlu ZykpCj4gK8KgwqDCoCAoYXJndW1lbnRzCj4gK8KgwqDCoMKgIChsaXN0Cj4gK8KgwqDCoMKgwqAg Izp0ZXN0cz8gI2YgOyBtYW55IG1vcmUgZGVwZW5kZW5jaWVzCj4gK8KgwqDCoMKgwqAgIzptb2R1 bGVzCj4gK8KgwqDCoMKgwqAgYCgoZ3VpeCBidWlsZCBub2RlLWJ1aWxkLXN5c3RlbSkKPiArwqDC oMKgwqDCoMKgwqAgKGljZS05IG1hdGNoKQo+ICvCoMKgwqDCoMKgwqDCoCAoZ3VpeCBidWlsZCB1 dGlscykpCj4gK8KgwqDCoMKgwqAgIzpwaGFzZXMKPiArwqDCoMKgwqDCoCAjfihtb2RpZnktcGhh c2VzICVzdGFuZGFyZC1waGFzZXMKPiArwqDCoMKgwqDCoMKgwqDCoMKgIChhZGQtYWZ0ZXIgJ3Vu cGFjayAnY2hkaXIKPiArwqDCoMKgwqDCoMKgwqDCoMKgwqDCoCAobGFtYmRhIGFyZ3MKPiArwqDC oMKgwqDCoMKgwqDCoMKgwqDCoMKgwqAgKGNoZGlyICJwYWNrYWdlcy9sZXNzIikpKQo+ICvCoMKg wqDCoMKgwqDCoMKgwqAgKGFkZC1hZnRlciAncGF0Y2gtZGVwZW5kZW5jaWVzICdkZWxldGUtZGVw ZW5kZW5jaWVzCj4gK8KgwqDCoMKgwqDCoMKgwqDCoMKgwqAgKGxhbWJkYSBhcmdzCj4gK8KgwqDC oMKgwqDCoMKgwqDCoMKgwqDCoMKgIChkZWxldGUtZGVwZW5kZW5jaWVzCj4gK8KgwqDCoMKgwqDC oMKgwqDCoMKgwqDCoMKgwqAgJyg7OyBkZXBlbmRlbmNpZXMKPiArwqDCoMKgwqDCoMKgwqDCoMKg wqDCoMKgwqDCoMKgwqAgInBhcnNlLW5vZGUtdmVyc2lvbiIgOyBwYXRjaGVkIG91dAo+ICvCoMKg wqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoCAidHNsaWIiIDsgcHJvYmFibHkgbm90IG5lZWRl ZCB3LyBlc2J1aWxkCj4gK8KgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgIDs7IGRldkRl cGVuZGVuY2llcwo+ICvCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoCAiQGxlc3MvdGVz dC1kYXRhIgo+ICvCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoCAiQGxlc3MvdGVzdC1p bXBvcnQtbW9kdWxlIgo+ICvCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoCAiQHJvbGx1 cC9wbHVnaW4tY29tbW9uanMiCj4gK8KgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgICJA cm9sbHVwL3BsdWdpbi1qc29uIgo+ICvCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoCAi QHJvbGx1cC9wbHVnaW4tbm9kZS1yZXNvbHZlIgo+ICvCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDC oMKgwqDCoCAiQHR5cGVzY3JpcHQtZXNsaW50L2VzbGludC1wbHVnaW4iCj4gK8KgwqDCoMKgwqDC oMKgwqDCoMKgwqDCoMKgwqDCoMKgICJAdHlwZXNjcmlwdC1lc2xpbnQvcGFyc2VyIgo+ICvCoMKg wqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoCAiYmVubnkiCj4gK8KgwqDCoMKgwqDCoMKgwqDC oMKgwqDCoMKgwqDCoMKgICJib290c3RyYXAtbGVzcy1wb3J0Igo+ICvCoMKgwqDCoMKgwqDCoMKg wqDCoMKgwqDCoMKgwqDCoCAiY2hhaSIKPiArwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKg wqAgImNyb3NzLWVudiIKPiArwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqAgImRpZmYi Cj4gK8KgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgICJlc2xpbnQiCj4gK8KgwqDCoMKg wqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgICJmcy1leHRyYSIKPiArwqDCoMKgwqDCoMKgwqDCoMKg wqDCoMKgwqDCoMKgwqAgImdpdC1yZXYiCj4gK8KgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDC oMKgICJnbG9iYnkiCj4gK8KgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgICJncnVudCIK PiArwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqAgImdydW50LWNsaSIKPiArwqDCoMKg wqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqAgImdydW50LWNvbnRyaWItY2xlYW4iCj4gK8KgwqDC oMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgICJncnVudC1jb250cmliLWNvbm5lY3QiCj4gK8Kg wqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgICJncnVudC1lc2xpbnQiCj4gK8KgwqDCoMKg wqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgICJncnVudC1zYXVjZWxhYnMiCj4gK8KgwqDCoMKgwqDC oMKgwqDCoMKgwqDCoMKgwqDCoMKgICJncnVudC1zaGVsbCIKPiArwqDCoMKgwqDCoMKgwqDCoMKg wqDCoMKgwqDCoMKgwqAgImh0bWwtdGVtcGxhdGUtdGFnIgo+ICvCoMKgwqDCoMKgwqDCoMKgwqDC oMKgwqDCoMKgwqDCoCAiaml0LWdydW50Igo+ICvCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKg wqDCoCAibGVzcy1wbHVnaW4tYXV0b3ByZWZpeCIKPiArwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKg wqDCoMKgwqAgImxlc3MtcGx1Z2luLWNsZWFuLWNzcyIKPiArwqDCoMKgwqDCoMKgwqDCoMKgwqDC oMKgwqDCoMKgwqAgIm1pbmltaXN0Igo+ICvCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDC oCAibW9jaGEiCj4gK8KgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgICJtb2NoYS1oZWFk bGVzcy1jaHJvbWUiCj4gK8KgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgICJtb2NoYS10 ZWFtY2l0eS1yZXBvcnRlciIKPiArwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqAgIm5v Y2siCj4gK8KgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgICJucG0tcnVuLWFsbCIKPiAr wqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqAgInBlcmZvcm1hbmNlLW5vdyIKPiArwqDC oMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqAgInBoaW4iCj4gK8KgwqDCoMKgwqDCoMKgwqDC oMKgwqDCoMKgwqDCoMKgICJwcm9taXNlIgo+ICvCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKg wqDCoCAicmVhZC1nbG9iIgo+ICvCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoCAicmVz b2x2ZSIKPiArwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqAgInJvbGx1cCIKPiArwqDC oMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqAgInJvbGx1cC1wbHVnaW4tdGVyc2VyIgo+ICvC oMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoCAicm9sbHVwLXBsdWdpbi10eXBlc2NyaXB0 MiIKPiArwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqAgInNlbXZlciIKPiArwqDCoMKg wqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqAgInNoeCIKPiArwqDCoMKgwqDCoMKgwqDCoMKgwqDC oMKgwqDCoMKgwqAgInRpbWUtZ3J1bnQiCj4gK8KgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDC oMKgICJ0cy1ub2RlIgo+ICvCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoCAidHlwZXNj cmlwdCIKPiArwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqAgInVpa2l0Igo+ICvCoMKg wqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoCA7OyBvcHRpb25hbERlcGVuZGVuY2llcwo+ICvC oMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoCAiZXJybm8iCj4gK8KgwqDCoMKgwqDCoMKg wqDCoMKgwqDCoMKgwqDCoMKgICJncmFjZWZ1bC1mcyIKPiArwqDCoMKgwqDCoMKgwqDCoMKgwqDC oMKgwqDCoMKgwqAgImltYWdlLXNpemUiCj4gK8KgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDC oMKgICJtYWtlLWRpciIKPiArwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqAgIm1pbWUi Cj4gK8KgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgICJuZWVkbGUiCj4gK8KgwqDCoMKg wqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgICJzb3VyY2UtbWFwIikpKSkKPiArwqDCoMKgwqDCoMKg wqDCoMKgIChhZGQtYWZ0ZXIgJ2RlbGV0ZS1kZXBlbmRlbmNpZXMgJ2F2b2lkLXBhcnNlLW5vZGUt dmVyc2lvbgo+ICvCoMKgwqDCoMKgwqDCoMKgwqDCoMKgIChsYW1iZGEgYXJncwo+ICvCoMKgwqDC oMKgwqDCoMKgwqDCoMKgwqDCoCAoZGVmaW5lIHZlcnNpb24KPiArwqDCoMKgwqDCoMKgwqDCoMKg wqDCoMKgwqDCoMKgICMkKHBhY2thZ2UtdmVyc2lvbiB0aGlzLXBhY2thZ2UpKQo+ICvCoMKgwqDC oMKgwqDCoMKgwqDCoMKgwqDCoCAoc3Vic3RpdHV0ZSogInNyYy9sZXNzL2luZGV4LmpzIgo+ICvC oMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqAgKCgiaW1wb3J0IFt7XSB2ZXJzaW9uIFt9XSIg b3JpZykKPiArwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqAgKHN0cmluZy1hcHBlbmQg Ii8vICIgb3JpZykpCj4gK8KgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoCAoKCJpbXBvcnQg cGFyc2VWZXJzaW9uIGZyb20gJ3BhcnNlLW5vZGUtdmVyc2lvbic7Igo+IG9yaWcpCj4gK8KgwqDC oMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgIChzdHJpbmctYXBwZW5kICIvLyAiIG9yaWcpKQo+ ICvCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqAgKCgiY29uc3QgdiA9IHBhcnNlVmVyc2lv blsoXWB2XFwkW3tddmVyc2lvblt9XWBbKV07Igo+IG9yaWcpCj4gK8KgwqDCoMKgwqDCoMKgwqDC oMKgwqDCoMKgwqDCoMKgIChzdHJpbmctYXBwZW5kICIvLyAiIG9yaWcpKQo+ICvCoMKgwqDCoMKg wqDCoMKgwqDCoMKgwqDCoMKgwqAgKCgiKHZlcnNpb246ICkoXFxbdlxcLm1ham9yLCB2XFwubWlu b3IsCj4gdlxcLnBhdGNoXSwpIiBfIGxocyByaHMpCj4gK8KgwqDCoMKgwqDCoMKgwqDCoMKgwqDC oMKgwqDCoMKgIChzdHJpbmctYXBwZW5kCj4gK8KgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDC oMKgwqAgbGhzCj4gK8KgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqAgIlsiCj4gK8Kg wqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqAgKHN0cmluZy1qb2luCj4gK8KgwqDCoMKg wqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoCAobGlzdC1oZWFkIChzdHJpbmctc3BsaXQKPiAr wqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDC oMKgIHZlcnNpb24gKGNoYXItc2V0LWNvbXBsZW1lbnQgY2hhci0KPiBzZXQ6ZGlnaXQpKQo+ICvC oMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKg IDMpCj4gK8KgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoCAiLCAiKQo+ICvCoMKg wqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgICJdLCAvLyAiCj4gK8KgwqDCoMKgwqDCoMKg wqDCoMKgwqDCoMKgwqDCoMKgwqAgcmhzKSkpKSkKPiArwqDCoMKgwqDCoMKgwqDCoMKgIChhZGQt YWZ0ZXIgJ2F2b2lkLXBhcnNlLW5vZGUtdmVyc2lvbiAnZG8tbm90LXRhcmdldC1lczUKPiArwqDC oMKgwqDCoMKgwqDCoMKgwqDCoCAobGFtYmRhIGFyZ3MKPiArwqDCoMKgwqDCoMKgwqDCoMKgwqDC oMKgwqAgOzsgZXNidWlsZCBjYW4ndCBjb21waWxlIGFsbCBmZWF0dXJlcyB0byBFUzUKPiArwqDC oMKgwqDCoMKgwqDCoMKgwqDCoMKgwqAgKHdpdGgtYXRvbWljLWpzb24tZmlsZS1yZXBsYWNlbWVu dCAidHNjb25maWcuanNvbiIKPiArwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgIChtYXRj aC1sYW1iZGEKPiArwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoCAoKCdAIC4gYWxp c3QpCj4gK8KgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoCAoY29ucyAnQAo+ICvC oMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoCAobWFwIChtYXRjaC1sYW1iZGEK PiArwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoCAo KCJjb21waWxlck9wdGlvbnMiICdAIC4gYWxpc3QpCj4gK8KgwqDCoMKgwqDCoMKgwqDCoMKgwqDC oMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoCBgKCJzY3JpcHRzIiBAICxAKGZpbHRlciAo bWF0Y2gtbGFtYmRhCj4gK8KgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDC oMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKg wqDCoMKgwqAgKCgidGFyZ2V0Igo+ICJFUzUiKQo+ICvCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDC oMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKg wqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqAgI2YpCj4gK8KgwqDCoMKgwqDCoMKgwqDCoMKgwqDC oMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKg wqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqAgKF8KPiArwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKg wqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDC oMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgICN0KSkKPiArwqDCoMKgwqDCoMKgwqDCoMKgwqDC oMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKg wqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgIGFsaXN0KSkpCj4gK8KgwqDCoMKgwqDCoMKgwqDCoMKg wqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqAgKG90aGVyCj4gK8KgwqDCoMKgwqDCoMKg wqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoCBvdGhlcikpCj4gK8KgwqDC oMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoCBhbGlzdCkpKSkpKSkK PiArwqDCoMKgwqDCoMKgwqDCoMKgIChhZGQtYWZ0ZXIgJ2RvLW5vdC10YXJnZXQtZXM1ICdwYXRj aC1idWlsZC1zY3JpcHQKPiArwqDCoMKgwqDCoMKgwqDCoMKgwqDCoCAobGFtYmRhIGFyZ3MKPiAr wqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqAgKGRlZmluZSBuZXctYnVpbGQtc2NyaXB0Cj4gK8Kg wqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoCAoc3RyaW5nLWpvaW4KPiArwqDCoMKgwqDCoMKg wqDCoMKgwqDCoMKgwqDCoMKgwqAgYCgiZXNidWlsZCIKPiArwqDCoMKgwqDCoMKgwqDCoMKgwqDC oMKgwqDCoMKgwqDCoMKgICItLXBsYXRmb3JtPW5vZGUiCj4gK8KgwqDCoMKgwqDCoMKgwqDCoMKg wqDCoMKgwqDCoMKgwqDCoCAiLS1mb3JtYXQ9Y2pzIgo+ICvCoMKgwqDCoMKgwqDCoMKgwqDCoMKg wqDCoMKgwqDCoMKgwqAgIi0tb3V0ZGlyPWxpYiIKPiArwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKg wqDCoMKgwqDCoMKgICxAKGZpbmQtZmlsZXMgInNyYy9sZXNzIiAiXFwuanMkIikKPiArwqDCoMKg wqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgICxAKGZpbmQtZmlsZXMgInNyYy9sZXNzLW5v ZGUiICJcXC5qcyQiKSkpKQo+ICvCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoCAod2l0aC1hdG9t aWMtanNvbi1maWxlLXJlcGxhY2VtZW50ICJwYWNrYWdlLmpzb24iCj4gK8KgwqDCoMKgwqDCoMKg wqDCoMKgwqDCoMKgwqDCoCAobWF0Y2gtbGFtYmRhCj4gK8KgwqDCoMKgwqDCoMKgwqDCoMKgwqDC oMKgwqDCoMKgwqAgKCgnQCAuIGFsaXN0KQo+ICvCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKg wqDCoMKgwqAgKGNvbnMgJ0AKPiArwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKg wqAgKG1hcCAobWF0Y2gtbGFtYmRhCj4gK8KgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKg wqDCoMKgwqDCoMKgwqDCoMKgwqAgKCgic2NyaXB0cyIgQCAuIGFsaXN0KQo+ICvCoMKgwqDCoMKg wqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqAgYCgic2NyaXB0cyIg QCAsQChtYXAgKG1hdGNoLWxhbWJkYQo+ICvCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDC oMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKg wqDCoMKgwqDCoMKgICgoImJ1aWxkIiAuIF8pCj4gK8KgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKg wqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDC oMKgwqDCoMKgwqDCoMKgwqDCoCAoY29ucyAiYnVpbGQiCj4gK8KgwqDCoMKgwqDCoMKgwqDCoMKg wqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDC oMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoCBuZXctYnVpbGQtCj4gc2NyaXB0 KSkKPiArwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDC oMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoCAob3RoZXIK PiArwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKg wqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgIG90aGVyKSkK PiArwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKg wqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgIGFsaXN0KSkpCj4gK8Kg wqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqAgKG90aGVy Cj4gK8KgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDC oCBvdGhlcikpCj4gK8KgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKg wqDCoCBhbGlzdCkpKSkpKSkKQ2FuIHdlIHNvbWVob3cgc2F2ZSBhIGJpdCBvZiBob3Jpem9udGFs IHJlYWwtZXN0YXRlIGhlcmU/ICBTYW1lIGdvZXMKZm9yIDEgYW5kIDIuCj4gK8KgwqDCoMKgwqDC oMKgwqDCoCAoYWRkLWFmdGVyICdidWlsZCAnYnVpbGQtYnJvd3Nlcgo+ICvCoMKgwqDCoMKgwqDC oMKgwqDCoMKgIChsYW1iZGEgYXJncwo+ICvCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoCAoaW52 b2tlICJlc2J1aWxkIgo+ICvCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKg wqAgIi0tYnVuZGxlIgo+ICvCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKg wqAgIi0tcGxhdGZvcm09YnJvd3NlciIKPiArwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKg wqDCoMKgwqDCoMKgICItLWZvcm1hdD1janMiCj4gK8KgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKg wqDCoMKgwqDCoMKgwqDCoCAiLS1vdXRmaWxlPWRpc3QvbGVzcy5qcyIKPiArwqDCoMKgwqDCoMKg wqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgICJzcmMvbGVzcy1icm93c2VyL2Jvb3RzdHJh cC5qcyIpCj4gK8KgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgIChpbnZva2UgImVzYnVpbGQiCj4g K8KgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoCAiLS1idW5kbGUiCj4g K8KgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoCAiLS1taW5pZnkiCj4g K8KgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoCAiLS1zb3VyY2VtYXAi Cj4gK8KgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoCAiLS1wbGF0Zm9y bT1icm93c2VyIgo+ICvCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqAg Ii0tZm9ybWF0PWNqcyIKPiArwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDC oMKgICItLW91dGZpbGU9ZGlzdC9sZXNzLm1pbi5qcyIKPiArwqDCoMKgwqDCoMKgwqDCoMKgwqDC oMKgwqDCoMKgwqDCoMKgwqDCoMKgICJzcmMvbGVzcy1icm93c2VyL2Jvb3RzdHJhcC5qcyIpKSkp KSkKPiArwqDCoMKgIChob21lLXBhZ2UgImh0dHBzOi8vbGVzc2Nzcy5vcmciKQo+ICvCoMKgwqAg KHN5bm9wc2lzICJDb21waWxlciBmb3IgQGFjcm9ueW17TGVzc30gQGFjcm9ueW17Q1NTfSBsYW5n dWFnZQo+IGV4dGVuc2lvbiIpCj4gK8KgwqDCoCA7OyBYWFg6IEBhYmJye30gc2VlbXMgYmV0dGVy IGZvciBMZXNzICh3aGljaCBpcyBhbHdheXMKPiBjYXBpdGFsaXplZCB0aGF0Cj4gK8KgwqDCoCA7 OyB3YXkpLCBidXQgaXQgaXMgcmVqZWN0ZWQgYXMgaW52YWxpZCBUZXhpbmZvIG1hcmt1cCBoZXJl Lgo+ICvCoMKgwqAgKGRlc2NyaXB0aW9uICJAYWNyb255bXtMZXNzLCBMZWFuZXIgU3R5bGUgU2hl ZXRzfSBpcyBhCj4gK2JhY2t3YXJkcy1jb21wYXRpYmxlIGxhbmd1YWdlIGV4dGVuc2lvbiBmb3Ig QGFjcm9ueW17Q1NTfS7CoCBUaGlzCj4gcGFja2FnZQo+ICtwcm92aWRlcyBAY29tbWFuZHtsZXNz Y30sIHdoaWNoIGNvbXBpbGVzIExlc3MgZmlsZXMgdG8gcGxhaW4KPiBAYWNyb255bXtDU1N9LiIp Cj4gK8KgwqDCoCAobGljZW5zZSBsaWNlbnNlOmFzbDIuMCkpKQo+ICsKSU1ITyBpdCBkb2Vzbid0 IG1ha2Ugc2Vuc2UgdG8gdHlwZSBAYWNyb255bSB3aXRob3V0IHRoZSBleHBhbnNpb24uCgpDaGVl cnMK From debbugs-submit-bounces@debbugs.gnu.org Wed Nov 15 14:35:45 2023 Received: (at 67019) by debbugs.gnu.org; 15 Nov 2023 19:35:45 +0000 Received: from localhost ([127.0.0.1]:53849 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1r3Lfs-0001Nf-Le for submit@debbugs.gnu.org; Wed, 15 Nov 2023 14:35:45 -0500 Received: from wout3-smtp.messagingengine.com ([64.147.123.19]:35285) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1r3Lfn-0001NM-6d for 67019@debbugs.gnu.org; Wed, 15 Nov 2023 14:35:43 -0500 Received: from compute5.internal (compute5.nyi.internal [10.202.2.45]) by mailout.west.internal (Postfix) with ESMTP id 077A732009EF; Wed, 15 Nov 2023 14:35:33 -0500 (EST) Received: from mailfrontend1 ([10.202.2.162]) by compute5.internal (MEProxy); Wed, 15 Nov 2023 14:35:34 -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=1700076933; x=1700163333; bh=dbroNaqHaz hFhXuUM5nqPPwfmdmZF56xRN4/3h3kdec=; b=u8HloW6g+RsIi4NlWEe/hNLnbJ mfmD4HAoz5xvJRXN0rbOU9BPlFyYoGZw4Po7mZqFYDMjB8StrJtS22rUqm9iFc9t 8HgzPfGhBVvXB8I/afY1LHxcqdk1AK1T93ziPtpRgMa/+rv9EZFK8tV5yv8KX1Im h74qzUiHFMxXyrmPzqIoehrbBpt0Fe8hlLneZ9MOhznjvJau/L3ZVXGArJfGJBkp uISvsrILgchV6dN+mv6OAEbSJkdk7YI4SMxQkv5p7+hCkjz/oRUOyb1eyCbnDh3Q 8BYp0KU8sYZfWa1lCF9gtxuZWXj4z+5F9NifY6gA28RfjkN+pKRhKc3SAy6w== 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=1700076933; x= 1700163333; bh=dbroNaqHazhFhXuUM5nqPPwfmdmZF56xRN4/3h3kdec=; b=D fg0MscSXqqJCLqJrWDM0vCQfKxLZ0KsssUHC1AE71Ep4NHZOGftbdw+ilDxy4JBj R6mujU1dWtlQADyTOk2GE3fJ0QdoqIDEZW4n5UrVnaQr601Y4CI0bWW8F0k7sP9+ KuKwKIeTZtGTEi6/JfOaNqdpa/c8n6xjTqH0zFKYaJ7Arbtk+LF/IfPfo5T/JAoO JXpSp8nxJ5XX72dyVAC8ZaucISnxRdM8HrS6pS3LtzcbgFOnEhgjQq6g3tLOudJ1 ZcCuXj/TlAToPsIUwXmxxStx49ni8v3kSincGsyGmfYwuJn1KdYfAsAQtFxbPKsj sPVC1lPhxb8ThOH4VcK8w== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvkedrudefiedguddvudcutefuodetggdotefrod ftvfcurfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfgh necuuegrihhlohhuthemuceftddtnecusecvtfgvtghiphhivghnthhsucdlqddutddtmd enucfjughrpefkffggfgfuvfhfhfgjtgfgsehtkeertddtvdejnecuhfhrohhmpefrhhhi lhhiphcuofgtifhrrghthhcuoehphhhilhhiphesphhhihhlihhpmhgtghhrrghthhdrtg homheqnecuggftrfgrthhtvghrnhepvdeikeffgfdtieeitdejjeejffevgffhtddvvdel ledujefhvedutdetudfgjeefnecuvehluhhsthgvrhfuihiivgeptdenucfrrghrrghmpe hmrghilhhfrhhomhepphhhihhlihhpsehphhhilhhiphhmtghgrhgrthhhrdgtohhm X-ME-Proxy: Feedback-ID: i2b1146f3:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Wed, 15 Nov 2023 14:35:32 -0500 (EST) Message-ID: Date: Wed, 15 Nov 2023 14:35:31 -0500 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [PATCH 03/16] gnu: Add lessc. To: Liliana Marie Prikler , 67019@debbugs.gnu.org References: Content-Language: en-US From: Philip McGrath Autocrypt: addr=philip@philipmcgrath.com; keydata= xsFNBFxfDXMBEAC50KOX7FVfbH5kzv1IWAu58hz77HfgH46izt8+3X51/AzD0QsrVnzz3fS0 37e5wnB4hpT/a6iGPbaah02nOhrCWjllWQrnp7rb0q9w8rnA41W5Aeajsob3/mPlSTkgX77/ nfXHFSaIPi+6DseAQO6EMbQrA/Ue4Yal/LWaAcpmGeAXUQabvH1I7LY5f6RI/pMii5cVmqm/ ea/oVroVeT4lBLh/1jEKv+tCVn1h9ks5L5AcbumaenEjgtJZ22/WUNowLD21uug7WCHlVdf+ 3PKSg/Hd7jotxYrfbhIEH2494KnenslxX4psavsH/AAWWTouvdiY5Q2d7eDH6P6ggWa1fXgs LlxFgtTTOmNTKViBKYk/g6gE2DpTaNG2pPqblxVlgy751O9y5UTBET0zj75BY55dKzoKg541 hBwKuwhNj0fA3xKesYzs2VdrzredEHegPeucQfTBSQ0G8lNdofElyv1e92rJtkAJXpodwNJf gmfJpdP33PPd1a7WQwWbo96JAkTkYnisEQyvJbQ8AvJw7V9xY79/pd2dXJkz88HZP486UiSK RmO9kItVSjCYz2Tqv75aZocpC661fv66GuLZfOCR1I0nbXNFxNs6K3/otJ3ignDFJCD4wk6j TlSODDeeXxDJtyBBrnYIzgb86KI3RJxoKrfbos0oavfWA2NGpwARAQABzSlQaGlsaXAgTWNH cmF0aCA8cGhpbGlwQHBoaWxpcG1jZ3JhdGguY29tPsLBlAQTAQgAPgIbAwULCQgHAgYVCgkI CwIEFgIDAQIeAQIXgBYhBPRlq6zWN66sFBVVz8oDY436Pxx6BQJkZmCHBQkJlXgUAAoJEMoD Y436Pxx6JvoQAKufvt1nAdezaIj+LccaKMOCNnVFxXBIDyaU9+Gmqh1ANQGLpdljfFmecpWm 1SA3sqDZapF2zg/hMHWbDGvdHJnPbtfnfS7ZZtOpdgRtMpE4zVeSi4t2NcIV0wQiPBXZhR0O Qp2PCMsExunJ0DV1pPMEt5r825haNPXZErSM3ectFgJwxjxEeOZ7khmrVrWZe0OddSsEEQsn 9jxpftLRgE/6N31wDuM/BDIrz+6AOc98zKFIoMmv8z9p1EEOvoFs7WunJklpWq6W4FggIPT0 UxlycFQBxzpVj2ga6MZVZ8Sp2fq0jgKn3uubYySyNi8SE6PfSre+QIG54OA+j9NSiVi36um7 Z4nqRC6JPoBe2VTwaZLskeO4grYHKFZHKVyOk3jcvDY5R8uyh+hPPj5kvYS34YFESZf+5LTA HoYmaOY8YGEqH66p9ukYbXaAoH9lmQig0zVcyyE9o8OuKhkvksiJ+2pEYtWXOkVqvj18xlfQ mLfhlWYo/o42x975zACjrZQe5+ZdQS9sz7ietWrHbZ9+hl79iSfeVkNvMikdZ5CZ81YvF42z kpDr6vWc2ImxIpgCTRp5HAUtKVsUJE/+yJop+AeVMonzzGaFd5tG/aT5BOz3w6ua3WfXqA9b NpeO4ANi2IQrhhWNq26JWx3Yx/QgxrNm44skIzuEEyL3b6Q7zsFNBFxfDXMBEADq/Vlop4lx W9Bi7cYaxjnhNMbDxR3aVV3GMy7zkuV3fGjvTAuO7raDoqN91y2bvm+vkM54Mw+Fu3ThBHCc niYkdgyIlpLNfFhQOOBtlj1jNmCGTOp7JBJ8mjQucOGy3A0uUaqvkMncO2trsfEsRD25nTZV dji4cHePP86Uc/w98OBt5cPLyM5/WU+GTpPBATFc1u4DocMSqbCZcNLDr1O7P6Knl8vsCtRj r4X4xp3d3I+aZ1h5l/Hu20u+/7fg8PO/WDOCMwqN64xB2OHLv7bQm0piwVN+Gkyjhk9EJINO m05ieGxvsyAaQDMkgvm/Hp1G2LJEWkxaTalnBawaVYM4TgpE5hU9gda3Ld/pdT2lkNmVq47v d//NBYWa1/aJGqBP2XlW0JMywmDEVH2fFwVqMQ3ZzE+N4HnSR6Uslv4DpIeYLGevheHLqegO o5VySo/P+lGQDO0vSHbBZgRJ/ROwNvkJVEQ9pI34Edt2zCfUYqjUU+3tcd2xgR8/JP2dnjYp NDq4CK/8ywk+sl8WY8MQpKccJdWp0CVgp2y88YALn6x9wxsPGQ8Lk7sB4ADwwPX87pFdJqe2 2oKgG9HklBTSxvdr1fN+/n4AD5XPBhMpi9UZHdaVuWzVfXU6EKMHlsJfJ7sF1atKVPcQDIN/ SxwTlxmsHVCMxifikklhQwmD/wARAQABwsF8BBgBCAAmAhsMFiEE9GWrrNY3rqwUFVXPygNj jfo/HHoFAmNsLkkFCQmC/B0ACgkQygNjjfo/HHrGqxAAgdV2GRCEIJwbLtRTv4qpfANsfX/I S0KZBDbwtZuCDceQTfsS8lF5WGJOPxF7MDkVGRhBPYpVamO56V+Y/o6drX0JEeWqLwB3nc8b PFpFcGTFOxp6Q1Ps4n/L/+hhTsI4vO79jsf97s7GPhSLpnzakb2Enh25G/MoToj6qQvuuqFW lDX1hxBC9Jf6pnuX1XGUik9LZVpuqf9suVgNa4Wf6ZverzphPWObXifpjVREk7jJ0g2OBGZz CATDfgEfu4OtV2JEeSrPZeFoHPQzsFfO/n99ZxBWVLbiXJgNTnU/vwbPkMpPjED3WSwTesW+ SgXfZf4KHFigC3Z34uhXfxn4I1XEW7UGgbtsrFqJI+WVzP2mUeOzNoz980N1tfowzoNShfKD rcDhtpyZZcaA+0O1oVSKs3LUT4QNiYl/lcg4l0qnBvj+ilG3ViXikhKn4RMJUppbXCx09ZBK Pz1PAvig0mnpCWCjizdbtuFzkZsLmfYjIbxkXBLMmQdqMgqUnsUGvUh0u+v5zQlc3IQnpLBt vkQuitsVuqkCKSILz8p2DyA6PWRI988fGPakjvV13iGwAIfFPsNvOoWsVLz3GT6f9chF4fAY JuOem41lA82RZB9fPty0S8YVavucU7qzTfHRj6LwvrWzLk6wRA7ThPHWVAZsyH1iYO+nUOsU FFu7icw= In-Reply-To: Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 8bit X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 67019 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) Hi, Thanks for taking a look at this! 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? The long list of dependencies to delete does take a *lot* of vertical space, especially in this patch. The obvious alternative would be to put more than one dependency on the same line. I'm not opposed to that, but it would deviate from normal style and could make future diffs less clear. For horizontal space, I don't really like any of the alternatives I've thought of. The culprit in each case seems to be the three `match-lambda`s under `with-atomic-json-file-replacement`. (Specifically in do-not-target-es5, I guess the innermost one could be replaced with just `remove`, which might help a little.) In normal programming, I'd want to abstract the three patch-build-script phases into a helper function that would take the new-build-script string as an argument, but that's a bit awkward to do with build-side code in Guix. Putting it in guix/build/node-build-system.scm (like delete-dependencies) would trigger a lot of rebuilds that seem hard to justify. It could be done as a gexp-producing function, but node-is-what, node-copy-anything, and lessc aren't in the same file: I guess the arguments field is delayed, so maybe it wouldn't create a cyclic dependency issue, but that seemed to open a whole new can of worms. (Making e.g. `jsobject-update*` from guix/build/node-build-system.scm public would also help, but I have no desire to revisit that.) Obviously it would be possible, within each G-expression, to lift one of the `match-lambda`s (probably the innermost one) to a local definition, but IMO that would make the structure of the code less obviously correspond to the structure of the JSON being transformed. 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. >> +    (synopsis "Compiler for @acronym{Less} @acronym{CSS} language >> extension") >> +    ;; XXX: @abbr{} seems better for Less (which is always >> capitalized that >> +    ;; way), but it is rejected as invalid Texinfo markup here. >> +    (description "@acronym{Less, Leaner Style Sheets} is a >> +backwards-compatible language extension for @acronym{CSS}.  This >> package >> +provides @command{lessc}, which compiles Less files to plain >> @acronym{CSS}.") >> +    (license license:asl2.0))) >> + > IMHO it doesn't make sense to type @acronym without the expansion. > I don't have a strong opinion on this, and I only know the tiny amount of Texinfo I've picked up for Guix. I inferred from the fact that the one-argument version of @acronym{} exists that it should be used when applicable. I know that some typographical conventions handle capital letters and punctuation in acronyms specially, which would be one reason for @acronym{} to exist, but maybe that isn't relevant? Philip From debbugs-submit-bounces@debbugs.gnu.org Wed Nov 15 15:24:07 2023 Received: (at 67019) by debbugs.gnu.org; 15 Nov 2023 20:24:07 +0000 Received: from localhost ([127.0.0.1]:53906 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1r3MQh-00031O-0w for submit@debbugs.gnu.org; Wed, 15 Nov 2023 15:24:07 -0500 Received: from mail-lf1-x143.google.com ([2a00:1450:4864:20::143]:53433) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1r3MQe-00030u-PR for 67019@debbugs.gnu.org; Wed, 15 Nov 2023 15:24:05 -0500 Received: by mail-lf1-x143.google.com with SMTP id 2adb3069b0e04-5098e423ba2so46915e87.2 for <67019@debbugs.gnu.org>; Wed, 15 Nov 2023 12:24:05 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1700079839; x=1700684639; darn=debbugs.gnu.org; h=mime-version:user-agent:content-transfer-encoding:references :in-reply-to:date:to:from:subject:message-id:from:to:cc:subject:date :message-id:reply-to; bh=5V2vjP3V5PGPOK+1rS+dTzhgStEdwXjipm1qHB9GOdU=; b=NUs4qIfK5BqkR7cmlD51G0yPUoBF6hsMCL2xhj9im+Srn1R8BLRJVlsRU0+wT/Ig+d zsXkdBWrGpzBqKG9JM2vpmPdy5PX9KPt0KPxx1LQGHo8QAWkA8hGqMQS9rOuV0BCiFQR ROMj5zhl3yTUftdp4V5UzDpV10o+eCLi0ZljcCDMFIwsTNUJrfmzpjNMyucLoN+oYxjZ koibtFi9AcSk/fv9LVQQ+59jE83FNgPxFj251H7QZuB6gceQRAUI9hfbtfIATW90/V2D 0tQuSmyZr8nBV+MuOwqoLrL/OCSEGPSo7IOZypkIuXSjn3y1hSbDfoqMJ9sXHJ9C+RzM gB3w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1700079839; x=1700684639; h=mime-version:user-agent:content-transfer-encoding:references :in-reply-to:date:to:from:subject:message-id:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=5V2vjP3V5PGPOK+1rS+dTzhgStEdwXjipm1qHB9GOdU=; b=KvF2+X+dr9+UrlFJTEqEERB0zALArTCql5TS2mRzwa882kCHaTLrKlZqn+vVaDJrfS flB5K+8/wPpgeBASLgcm/c9Lu3KVMo90oRT2E2GhZP52L2Xv2Q1haEfzzWlLcH/IjHZU WyuzCcWXPSkXJZvr2feJifmomCc6NBuRr4NAN0nIYImZ5k4AY/5YvPIqNslZsZ660DuI ksNGSzQeCNWkroopo/NvccZbVz1fbmokjdiuc86D3WEcYzHKpxlQDtYW/U184Xfod9If y/Iwu6a7S8l1HgISUAGSElC/18wyH3l2ABXGFdU+BjMu+vm1Z02srzNdCAfCjHtZbAGk ESCw== X-Gm-Message-State: AOJu0YwWLAZ4WYv5qwACw0ctd1tkXwxmwu/l1An9Rnay1rRZCx2tRon0 ddanT0POJUVAkojwM+DV6L4= X-Google-Smtp-Source: AGHT+IFmEy6BM9Rzzq66RRIQ8K9KdHCQuSMHX5X3wfieYEvqjnsLyp6qr7KneoyUwPyfpmRlNtsDbQ== X-Received: by 2002:ac2:522f:0:b0:503:2d9d:8226 with SMTP id i15-20020ac2522f000000b005032d9d8226mr280614lfl.17.1700079838871; Wed, 15 Nov 2023 12:23:58 -0800 (PST) Received: from lumine.fritz.box (85-127-52-93.dsl.dynamic.surfer.at. [85.127.52.93]) by smtp.gmail.com with ESMTPSA id dt20-20020a170906b79400b009cb2fd85371sm7442842ejb.8.2023.11.15.12.23.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 15 Nov 2023 12:23:58 -0800 (PST) Message-ID: <522f4e2a30c81dc738096bac21f46be50ddd8563.camel@gmail.com> Subject: Re: [PATCH 03/16] gnu: Add lessc. From: Liliana Marie Prikler To: Philip McGrath , 67019@debbugs.gnu.org Date: Wed, 15 Nov 2023 21:23:57 +0100 In-Reply-To: References: Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: base64 User-Agent: Evolution 3.46.4 MIME-Version: 1.0 X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 67019 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) QW0gTWl0dHdvY2gsIGRlbSAxNS4xMS4yMDIzIHVtIDE0OjM1IC0wNTAwIHNjaHJpZWIgUGhpbGlw IE1jR3JhdGg6Cj4gSGksCj4gCj4gVGhhbmtzIGZvciB0YWtpbmcgYSBsb29rIGF0IHRoaXMhCj4g Cj4gT24gMTEvMTAvMjMgMTk6NTYsIExpbGlhbmEgTWFyaWUgUHJpa2xlciB3cm90ZToKPiA+IEFt IERvbm5lcnN0YWcsIGRlbSAwOS4xMS4yMDIzIHVtIDExOjI2IC0wNTAwIHNjaHJpZWIgUGhpbGlw Cj4gPiBNY0dyYXRoOgo+ID4gPiAqIGdudS9wYWNrYWdlcy93ZWIuc2NtIChsZXNzYyk6IE5ldyB2 YXJpYWJsZS4KPiA+ID4gCj4gPiA+IFsuLi5dCj4gwqA+Pgo+ID4gPiArwqDCoMKgwqDCoMKgwqDC oMKgIChhZGQtYWZ0ZXIgJ2F2b2lkLXBhcnNlLW5vZGUtdmVyc2lvbiAnZG8tbm90LXRhcmdldC0K PiA+ID4gZXM1Cj4gPiA+ICvCoMKgwqDCoMKgwqDCoMKgwqDCoMKgIChsYW1iZGEgYXJncwo+ID4g PiArwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqAgOzsgZXNidWlsZCBjYW4ndCBjb21waWxlIGFs bCBmZWF0dXJlcyB0byBFUzUKPiA+ID4gK8KgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgICh3aXRo LWF0b21pYy1qc29uLWZpbGUtcmVwbGFjZW1lbnQgInRzY29uZmlnLmpzb24iCj4gPiA+ICvCoMKg wqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqAgKG1hdGNoLWxhbWJkYQo+ID4gPiArwqDCoMKgwqDC oMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoCAoKCdAIC4gYWxpc3QpCj4gPiA+ICvCoMKgwqDCoMKg wqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqAgKGNvbnMgJ0AKPiA+ID4gK8KgwqDCoMKgwqDCoMKg wqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgIChtYXAgKG1hdGNoLWxhbWJkYQo+ID4gPiArwqDCoMKg wqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoCAoKCJjb21waWxl ck9wdGlvbnMiICdAIC4gYWxpc3QpCj4gPiA+ICvCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKg wqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqAgYCgic2NyaXB0cyIgQCAsQChmaWx0ZXIgKG1hdGNo LQo+ID4gPiBsYW1iZGEKPiA+ID4gK8KgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDC oMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKg wqDCoMKgwqDCoMKgwqAgKCgidGFyZ2V0Igo+ID4gPiAiRVM1IikKPiA+ID4gK8KgwqDCoMKgwqDC oMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKg wqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoCAjZikKPiA+ID4gK8KgwqDC oMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKg wqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqAgKF8KPiA+ID4gK8Kg wqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDC oMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoCAjdCkpCj4g PiA+ICvCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKg wqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqAgYWxpc3Qp KSkKPiA+ID4gK8KgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDC oMKgwqAgKG90aGVyCj4gPiA+ICvCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDC oMKgwqDCoMKgwqDCoMKgwqAgb3RoZXIpKQo+ID4gPiArwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKg wqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgIGFsaXN0KSkpKSkpKQo+ID4gPiArwqDCoMKgwqDCoMKg wqDCoMKgIChhZGQtYWZ0ZXIgJ2RvLW5vdC10YXJnZXQtZXM1ICdwYXRjaC1idWlsZC1zY3JpcHQK PiA+ID4gK8KgwqDCoMKgwqDCoMKgwqDCoMKgwqAgKGxhbWJkYSBhcmdzCj4gPiA+ICvCoMKgwqDC oMKgwqDCoMKgwqDCoMKgwqDCoCAoZGVmaW5lIG5ldy1idWlsZC1zY3JpcHQKPiA+ID4gK8KgwqDC oMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoCAoc3RyaW5nLWpvaW4KPiA+ID4gK8KgwqDCoMKgwqDC oMKgwqDCoMKgwqDCoMKgwqDCoMKgIGAoImVzYnVpbGQiCj4gPiA+ICvCoMKgwqDCoMKgwqDCoMKg wqDCoMKgwqDCoMKgwqDCoMKgwqAgIi0tcGxhdGZvcm09bm9kZSIKPiA+ID4gK8KgwqDCoMKgwqDC oMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoCAiLS1mb3JtYXQ9Y2pzIgo+ID4gPiArwqDCoMKgwqDC oMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgICItLW91dGRpcj1saWIiCj4gPiA+ICvCoMKgwqDC oMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqAgLEAoZmluZC1maWxlcyAic3JjL2xlc3MiICJc XC5qcyQiKQo+ID4gPiArwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgICxAKGZp bmQtZmlsZXMgInNyYy9sZXNzLW5vZGUiICJcXC5qcyQiKSkpKQo+ID4gPiArwqDCoMKgwqDCoMKg wqDCoMKgwqDCoMKgwqAgKHdpdGgtYXRvbWljLWpzb24tZmlsZS1yZXBsYWNlbWVudCAicGFja2Fn ZS5qc29uIgo+ID4gPiArwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgIChtYXRjaC1sYW1i ZGEKPiA+ID4gK8KgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqAgKCgnQCAuIGFsaXN0 KQo+ID4gPiArwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgIChjb25zICdACj4g PiA+ICvCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoCAobWFwIChtYXRjaC1s YW1iZGEKPiA+ID4gK8KgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKg wqDCoMKgwqAgKCgic2NyaXB0cyIgQCAuIGFsaXN0KQo+ID4gPiArwqDCoMKgwqDCoMKgwqDCoMKg wqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgIGAoInNjcmlwdHMiIEAgLEAobWFw IChtYXRjaC1sYW1iZGEKPiA+ID4gK8KgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDC oMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKg wqDCoMKgwqAgKCgiYnVpbGQiIC4KPiA+ID4gXykKPiA+ID4gK8KgwqDCoMKgwqDCoMKgwqDCoMKg wqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDC oMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoCAoY29ucwo+ID4gPiAiYnVpbGQiCj4gPiA+ICvCoMKg wqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDC oMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqAgbmV3 LQo+ID4gPiBidWlsZC0KPiA+ID4gc2NyaXB0KSkKPiA+ID4gK8KgwqDCoMKgwqDCoMKgwqDCoMKg wqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDC oMKgwqDCoMKgwqDCoMKgwqDCoMKgwqAgKG90aGVyCj4gPiA+ICvCoMKgwqDCoMKgwqDCoMKgwqDC oMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKg wqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqAgb3RoZXIpKQo+ID4gPiArwqDCoMKgwqDCoMKgwqDC oMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKg wqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgIGFsaXN0KSkpCj4gPiA+ICvCoMKgwqDCoMKgwqDCoMKg wqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgIChvdGhlcgo+ID4gPiArwqDCoMKg wqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgIG90aGVyKSkK PiA+ID4gK8KgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoCBh bGlzdCkpKSkpKSkKPiA+IENhbiB3ZSBzb21laG93IHNhdmUgYSBiaXQgb2YgaG9yaXpvbnRhbCBy ZWFsLWVzdGF0ZSBoZXJlP8KgIFNhbWUKPiA+IGdvZXMKPiA+IGZvciAxIGFuZCAyLgo+IAo+IFRv IGNsYXJpZnksIGRvIHlvdSBtZWFuIHZlcnRpY2FsIG9yIGhvcml6b250YWw/CkkgZG8gbWVhbiBo b3Jpem9udGFsLgoKPiBUaGUgbG9uZyBsaXN0IG9mIGRlcGVuZGVuY2llcyB0byBkZWxldGUgZG9l cyB0YWtlIGEgKmxvdCogb2YgdmVydGljYWwKPiBzcGFjZSwgZXNwZWNpYWxseSBpbiB0aGlzIHBh dGNoLiBUaGUgb2J2aW91cyBhbHRlcm5hdGl2ZSB3b3VsZCBiZSB0bwo+IHB1dCAgbW9yZSB0aGFu IG9uZSBkZXBlbmRlbmN5IG9uIHRoZSBzYW1lIGxpbmUuIEknbSBub3Qgb3Bwb3NlZCB0bwo+IHRo YXQsIGJ1dCBpdCB3b3VsZCBkZXZpYXRlIGZyb20gbm9ybWFsIHN0eWxlIGFuZCBjb3VsZCBtYWtl IGZ1dHVyZQo+IGRpZmZzIGxlc3MgY2xlYXIuClNwZWFraW5nIG9mIHdoaWNoLCBjYW4gd2UgaGFz IHJlZ2V4cHMgaGVyZT8KCj4gRm9yIGhvcml6b250YWwgc3BhY2UsIEkgZG9uJ3QgcmVhbGx5IGxp a2UgYW55IG9mIHRoZSBhbHRlcm5hdGl2ZXMKPiBJJ3ZlIHRob3VnaHQgb2YuIFRoZSBjdWxwcml0 IGluIGVhY2ggY2FzZSBzZWVtcyB0byBiZSB0aGUgdGhyZWUgCj4gYG1hdGNoLWxhbWJkYWBzIHVu ZGVyIGB3aXRoLWF0b21pYy1qc29uLWZpbGUtcmVwbGFjZW1lbnRgLgo+IChTcGVjaWZpY2FsbHkg aW4gZG8tbm90LXRhcmdldC1lczUsIEkgZ3Vlc3MgdGhlIGlubmVybW9zdCBvbmUgY291bGQKPiBi ZSByZXBsYWNlZCB3aXRoIGp1c3QgYHJlbW92ZWAsIHdoaWNoIG1pZ2h0IGhlbHAgYSBsaXR0bGUu KQo+IAo+IEluIG5vcm1hbCBwcm9ncmFtbWluZywgSSdkIHdhbnQgdG8gYWJzdHJhY3QgdGhlIHRo cmVlIHBhdGNoLWJ1aWxkLQo+IHNjcmlwdCBwaGFzZXMgaW50byBhIGhlbHBlciBmdW5jdGlvbiB0 aGF0IHdvdWxkIHRha2UgdGhlIG5ldy1idWlsZC0KPiBzY3JpcHQgc3RyaW5nIGFzIGFuIGFyZ3Vt ZW50LCBidXQgdGhhdCdzIGEgYml0IGF3a3dhcmQgdG8gZG8gd2l0aAo+IGJ1aWxkLXNpZGUgY29k ZSBpbiBHdWl4LiBQdXR0aW5nIGl0IGluIGd1aXgvYnVpbGQvbm9kZS1idWlsZC0KPiBzeXN0ZW0u c2NtIChsaWtlIAo+IGRlbGV0ZS1kZXBlbmRlbmNpZXMpIHdvdWxkIHRyaWdnZXIgYSBsb3Qgb2Yg cmVidWlsZHMgdGhhdCBzZWVtIGhhcmQKPiB0byBqdXN0aWZ5LiBJdCBjb3VsZCBiZSBkb25lIGFz IGEgZ2V4cC1wcm9kdWNpbmcgZnVuY3Rpb24sIGJ1dCAKPiBub2RlLWlzLXdoYXQsIG5vZGUtY29w eS1hbnl0aGluZywgYW5kIGxlc3NjIGFyZW4ndCBpbiB0aGUgc2FtZSBmaWxlOgo+IEkgZ3Vlc3Mg dGhlIGFyZ3VtZW50cyBmaWVsZCBpcyBkZWxheWVkLCBzbyBtYXliZSBpdCB3b3VsZG4ndCBjcmVh dGUgYQo+IGN5Y2xpYyBkZXBlbmRlbmN5IGlzc3VlLCBidXQgdGhhdCBzZWVtZWQgdG8gb3BlbiBh IHdob2xlIG5ldyBjYW4gb2YKPiB3b3Jtcy4KPiAKPiAoTWFraW5nIGUuZy4gYGpzb2JqZWN0LXVw ZGF0ZSpgIGZyb20gZ3VpeC9idWlsZC9ub2RlLWJ1aWxkLXN5c3RlbS5zY20KPiBwdWJsaWMgd291 bGQgYWxzbyBoZWxwLCBidXQgSSBoYXZlIG5vIGRlc2lyZSB0byByZXZpc2l0IHRoYXQuKQpJIHRo aW5rIHRoaXMgaXMgdmFsaWQgY3JpdGljaXNtIG9mIG91ciBub2RlLWJ1aWxkLXN5c3RlbSB0byBw ZXJoYXBzCnRha2UgdG8gYW5vdGhlciB0aHJlYWQuCgo+IE9idmlvdXNseSBpdCB3b3VsZCBiZSBw b3NzaWJsZSwgd2l0aGluIGVhY2ggRy1leHByZXNzaW9uLCB0byBsaWZ0IG9uZQo+IG9mIHRoZSBg bWF0Y2gtbGFtYmRhYHMgKHByb2JhYmx5IHRoZSBpbm5lcm1vc3Qgb25lKSB0byBhIGxvY2FsCj4g ZGVmaW5pdGlvbiwgYnV0IElNTyB0aGF0IHdvdWxkIG1ha2UgdGhlIHN0cnVjdHVyZSBvZiB0aGUg Y29kZSBsZXNzCj4gb2J2aW91c2x5IGNvcnJlc3BvbmQgdG8gdGhlIHN0cnVjdHVyZSBvZiB0aGUg SlNPTiBiZWluZyB0cmFuc2Zvcm1lZC4KPiAKPiBJIGNvdWxkIGFsc28gaW1hZ2luZSBicmVha2lu ZyB0aGVzZSBsaW5lczoKPiAKPiDCoD4+ICvCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDC oMKgwqDCoMKgwqDCoMKgwqDCoMKgICgoInNjcmlwdHMiIEAgLiBhbGlzdCkKPiDCoD4+ICvCoMKg wqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqAgYCgic2Ny aXB0cyIgQCAsQChtYXAgKG1hdGNoLWxhbWJkYQo+IAo+IGluc3RlYWQgYXM6Cj4gCj4gwqA+PiAr wqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoCAoKCJz Y3JpcHRzIgo+IMKgPj4gK8KgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDC oMKgwqDCoMKgwqDCoMKgIEAgLiBhbGlzdCkKPiDCoD4+ICvCoMKgwqDCoMKgwqDCoMKgwqDCoMKg wqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqAgYCgic2NyaXB0cyIKPiDCoD4+ICvCoMKg wqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgIEAg LEAobWFwIChtYXRjaC1sYW1iZGEKPiAKPiBidXQgdGhhdCBkb2Vzbid0IHNlZW0gbGlrZSBtdWNo IG9mIGFuIGltcHJvdmVtZW50IHRvIG1lLgpCdXQgd2hhdCBhYm91dCBicmVha2luZyBsaW5lcyBi ZWZvcmUgKG1hdGNoLWxhbWJkYT8gIFRoYXQgb3VnaHQgdG8gYXQKbGVhc3QgZ2l2ZSB1cyBlbm91 Z2ggdG8gZ2V0IChfICNmKSBvbnRvIGEgc2luZ2xlIGxpbmUsIG5vPwoKPiA+ID4gK8KgwqDCoCAo c3lub3BzaXMgIkNvbXBpbGVyIGZvciBAYWNyb255bXtMZXNzfSBAYWNyb255bXtDU1N9Cj4gPiA+ IGxhbmd1YWdlCj4gPiA+IGV4dGVuc2lvbiIpCj4gPiA+ICvCoMKgwqAgOzsgWFhYOiBAYWJicnt9 IHNlZW1zIGJldHRlciBmb3IgTGVzcyAod2hpY2ggaXMgYWx3YXlzCj4gPiA+IGNhcGl0YWxpemVk IHRoYXQKPiA+ID4gK8KgwqDCoCA7OyB3YXkpLCBidXQgaXQgaXMgcmVqZWN0ZWQgYXMgaW52YWxp ZCBUZXhpbmZvIG1hcmt1cCBoZXJlLgo+ID4gPiArwqDCoMKgIChkZXNjcmlwdGlvbiAiQGFjcm9u eW17TGVzcywgTGVhbmVyIFN0eWxlIFNoZWV0c30gaXMgYQo+ID4gPiArYmFja3dhcmRzLWNvbXBh dGlibGUgbGFuZ3VhZ2UgZXh0ZW5zaW9uIGZvciBAYWNyb255bXtDU1N9LsKgIFRoaXMKPiA+ID4g cGFja2FnZQo+ID4gPiArcHJvdmlkZXMgQGNvbW1hbmR7bGVzc2N9LCB3aGljaCBjb21waWxlcyBM ZXNzIGZpbGVzIHRvIHBsYWluCj4gPiA+IEBhY3Jvbnlte0NTU30uIikKPiA+ID4gK8KgwqDCoCAo bGljZW5zZSBsaWNlbnNlOmFzbDIuMCkpKQo+ID4gPiArCj4gPiBJTUhPIGl0IGRvZXNuJ3QgbWFr ZSBzZW5zZSB0byB0eXBlIEBhY3JvbnltIHdpdGhvdXQgdGhlIGV4cGFuc2lvbi4KPiA+IAo+IAo+ IEkgZG9uJ3QgaGF2ZSBhIHN0cm9uZyBvcGluaW9uIG9uIHRoaXMsIGFuZCBJIG9ubHkga25vdyB0 aGUgdGlueQo+IGFtb3VudCBvZiBUZXhpbmZvIEkndmUgcGlja2VkIHVwIGZvciBHdWl4LiBJIGlu ZmVycmVkIGZyb20gdGhlIGZhY3QKPiB0aGF0IHRoZSBvbmUtYXJndW1lbnQgdmVyc2lvbiBvZiBA YWNyb255bXt9IGV4aXN0cyB0aGF0IGl0IHNob3VsZCBiZQo+IHVzZWQgd2hlbiBhcHBsaWNhYmxl LiBJIGtub3cgdGhhdCBzb21lIHR5cG9ncmFwaGljYWwgY29udmVudGlvbnMKPiBoYW5kbGUgY2Fw aXRhbCBsZXR0ZXJzIGFuZCBwdW5jdHVhdGlvbiBpbiBhY3JvbnltcyBzcGVjaWFsbHksIHdoaWNo Cj4gd291bGQgYmUgb25lIHJlYXNvbiBmb3IgQGFjcm9ueW17fSB0byBleGlzdCwgYnV0IG1heWJl IHRoYXQgaXNuJ3QKPiByZWxldmFudD8KWWVhaCwgQ0FQUyBhcmVuJ3QgcmVsZXZhbnQgaGVyZS4g IFRoZSBAYWNyb255bSBpcyB0eXBpY2FsbHkgZm9yIGdpdmluZwptZWFuaW5nIHRvIGFuIGFjcm9u eW0sIGJ1dCBpZiBzYWlkIG1lYW5pbmcgaGFzIGFscmVhZHkgYmVlbiBnaXZlbiBvbmNlLApyZXBl YXRpbmcgaXQgd291bGQgbm90IG1ha2Ugc2Vuc2UuCgpTb21lIHF1b3RlcyBmcm9tIHRoZSBtYW51 YWw6Cgo+ICAgIC0gSW4gVGV4aW5mbywgYW4gYWNyb255bSAoYnV0IG5vdCBhbiBhYmJyZXZpYXRp b24pIHNob3VsZCBjb25zaXN0Cj4gICAgICBvbmx5IG9mIGNhcGl0YWwgbGV0dGVycyBhbmQgcGVy aW9kcywgbm8gbG93ZXJjYXNlLgo+ICAgIFsuLi5dCj4gICAgLSBJdCB1c3VhbGx5IHR1cm5zIG91 dCB0byBiZSBxdWl0ZSBkaWZmaWN1bHQgYW5kL29yIHRpbWUtY29uc3VtaW5nCj4gdG8gY29uc2lz dGVudGx5IHVzZSAnQGFjcm9ueW0nIGZvciBhbGwgc2VxdWVuY2VzIG9mIHVwcGVyY2FzZQo+ICAg ICAgbGV0dGVycy4gIEZ1cnRoZXJtb3JlLCBpdCBsb29rcyBzdHJhbmdlIGZvciBzb21lIGFjcm9u eW1zIHRvIGJlCj4gICAgICBpbiB0aGUgbm9ybWFsIGZvbnQgc2l6ZSBhbmQgb3RoZXJzIHRvIGJl IHNtYWxsZXIuICBUaHVzLCBhCj4gICAgICBzaW1wbGVyIGFwcHJvYWNoIHlvdSBtYXkgd2lzaCB0 byBjb25zaWRlciBpcyB0byBhdm9pZCAnQGFjcm9ueW0nCj4gICAgICBhbmQganVzdCB0eXBlc2V0 IGV2ZXJ5dGhpbmcgYXMgbm9ybWFsIHRleHQgaW4gYWxsIGNhcGl0YWxzOgo+ICAgICAgJ0dOVScs IHByb2R1Y2luZyB0aGUgb3V0cHV0ICdHTlUnLgo+IAo+ICAgIC0gSW4gZ2VuZXJhbCwgaXQncyBu b3QgZXNzZW50aWFsIHRvIHVzZSBlaXRoZXIgb2YgdGhlc2UgY29tbWFuZHMKPiAgICAgIGZvciBh bGwgYWJicmV2aWF0aW9uczsgdXNlIHlvdXIganVkZ21lbnQuICBUZXh0IGlzIHBlcmZlY3RseQo+ ICAgICAgcmVhZGFibGUgd2l0aG91dCB0aGVtLgoKQ2hlZXJzCg== From debbugs-submit-bounces@debbugs.gnu.org Wed Nov 15 19:03:39 2023 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 Subject: Re: [PATCH 03/16] gnu: Add lessc. Content-Language: en-US To: Liliana Marie Prikler , 67019@debbugs.gnu.org References: <522f4e2a30c81dc738096bac21f46be50ddd8563.camel@gmail.com> From: Philip McGrath Autocrypt: addr=philip@philipmcgrath.com; keydata= xsFNBFxfDXMBEAC50KOX7FVfbH5kzv1IWAu58hz77HfgH46izt8+3X51/AzD0QsrVnzz3fS0 37e5wnB4hpT/a6iGPbaah02nOhrCWjllWQrnp7rb0q9w8rnA41W5Aeajsob3/mPlSTkgX77/ nfXHFSaIPi+6DseAQO6EMbQrA/Ue4Yal/LWaAcpmGeAXUQabvH1I7LY5f6RI/pMii5cVmqm/ ea/oVroVeT4lBLh/1jEKv+tCVn1h9ks5L5AcbumaenEjgtJZ22/WUNowLD21uug7WCHlVdf+ 3PKSg/Hd7jotxYrfbhIEH2494KnenslxX4psavsH/AAWWTouvdiY5Q2d7eDH6P6ggWa1fXgs LlxFgtTTOmNTKViBKYk/g6gE2DpTaNG2pPqblxVlgy751O9y5UTBET0zj75BY55dKzoKg541 hBwKuwhNj0fA3xKesYzs2VdrzredEHegPeucQfTBSQ0G8lNdofElyv1e92rJtkAJXpodwNJf gmfJpdP33PPd1a7WQwWbo96JAkTkYnisEQyvJbQ8AvJw7V9xY79/pd2dXJkz88HZP486UiSK RmO9kItVSjCYz2Tqv75aZocpC661fv66GuLZfOCR1I0nbXNFxNs6K3/otJ3ignDFJCD4wk6j TlSODDeeXxDJtyBBrnYIzgb86KI3RJxoKrfbos0oavfWA2NGpwARAQABzSlQaGlsaXAgTWNH cmF0aCA8cGhpbGlwQHBoaWxpcG1jZ3JhdGguY29tPsLBlAQTAQgAPgIbAwULCQgHAgYVCgkI CwIEFgIDAQIeAQIXgBYhBPRlq6zWN66sFBVVz8oDY436Pxx6BQJkZmCHBQkJlXgUAAoJEMoD Y436Pxx6JvoQAKufvt1nAdezaIj+LccaKMOCNnVFxXBIDyaU9+Gmqh1ANQGLpdljfFmecpWm 1SA3sqDZapF2zg/hMHWbDGvdHJnPbtfnfS7ZZtOpdgRtMpE4zVeSi4t2NcIV0wQiPBXZhR0O Qp2PCMsExunJ0DV1pPMEt5r825haNPXZErSM3ectFgJwxjxEeOZ7khmrVrWZe0OddSsEEQsn 9jxpftLRgE/6N31wDuM/BDIrz+6AOc98zKFIoMmv8z9p1EEOvoFs7WunJklpWq6W4FggIPT0 UxlycFQBxzpVj2ga6MZVZ8Sp2fq0jgKn3uubYySyNi8SE6PfSre+QIG54OA+j9NSiVi36um7 Z4nqRC6JPoBe2VTwaZLskeO4grYHKFZHKVyOk3jcvDY5R8uyh+hPPj5kvYS34YFESZf+5LTA HoYmaOY8YGEqH66p9ukYbXaAoH9lmQig0zVcyyE9o8OuKhkvksiJ+2pEYtWXOkVqvj18xlfQ mLfhlWYo/o42x975zACjrZQe5+ZdQS9sz7ietWrHbZ9+hl79iSfeVkNvMikdZ5CZ81YvF42z kpDr6vWc2ImxIpgCTRp5HAUtKVsUJE/+yJop+AeVMonzzGaFd5tG/aT5BOz3w6ua3WfXqA9b NpeO4ANi2IQrhhWNq26JWx3Yx/QgxrNm44skIzuEEyL3b6Q7zsFNBFxfDXMBEADq/Vlop4lx W9Bi7cYaxjnhNMbDxR3aVV3GMy7zkuV3fGjvTAuO7raDoqN91y2bvm+vkM54Mw+Fu3ThBHCc niYkdgyIlpLNfFhQOOBtlj1jNmCGTOp7JBJ8mjQucOGy3A0uUaqvkMncO2trsfEsRD25nTZV dji4cHePP86Uc/w98OBt5cPLyM5/WU+GTpPBATFc1u4DocMSqbCZcNLDr1O7P6Knl8vsCtRj r4X4xp3d3I+aZ1h5l/Hu20u+/7fg8PO/WDOCMwqN64xB2OHLv7bQm0piwVN+Gkyjhk9EJINO m05ieGxvsyAaQDMkgvm/Hp1G2LJEWkxaTalnBawaVYM4TgpE5hU9gda3Ld/pdT2lkNmVq47v d//NBYWa1/aJGqBP2XlW0JMywmDEVH2fFwVqMQ3ZzE+N4HnSR6Uslv4DpIeYLGevheHLqegO o5VySo/P+lGQDO0vSHbBZgRJ/ROwNvkJVEQ9pI34Edt2zCfUYqjUU+3tcd2xgR8/JP2dnjYp NDq4CK/8ywk+sl8WY8MQpKccJdWp0CVgp2y88YALn6x9wxsPGQ8Lk7sB4ADwwPX87pFdJqe2 2oKgG9HklBTSxvdr1fN+/n4AD5XPBhMpi9UZHdaVuWzVfXU6EKMHlsJfJ7sF1atKVPcQDIN/ SxwTlxmsHVCMxifikklhQwmD/wARAQABwsF8BBgBCAAmAhsMFiEE9GWrrNY3rqwUFVXPygNj jfo/HHoFAmNsLkkFCQmC/B0ACgkQygNjjfo/HHrGqxAAgdV2GRCEIJwbLtRTv4qpfANsfX/I S0KZBDbwtZuCDceQTfsS8lF5WGJOPxF7MDkVGRhBPYpVamO56V+Y/o6drX0JEeWqLwB3nc8b PFpFcGTFOxp6Q1Ps4n/L/+hhTsI4vO79jsf97s7GPhSLpnzakb2Enh25G/MoToj6qQvuuqFW lDX1hxBC9Jf6pnuX1XGUik9LZVpuqf9suVgNa4Wf6ZverzphPWObXifpjVREk7jJ0g2OBGZz CATDfgEfu4OtV2JEeSrPZeFoHPQzsFfO/n99ZxBWVLbiXJgNTnU/vwbPkMpPjED3WSwTesW+ SgXfZf4KHFigC3Z34uhXfxn4I1XEW7UGgbtsrFqJI+WVzP2mUeOzNoz980N1tfowzoNShfKD rcDhtpyZZcaA+0O1oVSKs3LUT4QNiYl/lcg4l0qnBvj+ilG3ViXikhKn4RMJUppbXCx09ZBK Pz1PAvig0mnpCWCjizdbtuFzkZsLmfYjIbxkXBLMmQdqMgqUnsUGvUh0u+v5zQlc3IQnpLBt vkQuitsVuqkCKSILz8p2DyA6PWRI988fGPakjvV13iGwAIfFPsNvOoWsVLz3GT6f9chF4fAY JuOem41lA82RZB9fPty0S8YVavucU7qzTfHRj6LwvrWzLk6wRA7ThPHWVAZsyH1iYO+nUOsU FFu7icw= In-Reply-To: <522f4e2a30c81dc738096bac21f46be50ddd8563.camel@gmail.com> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 8bit X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 67019 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) 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 From debbugs-submit-bounces@debbugs.gnu.org Wed Nov 15 20:17:49 2023 Received: (at 67019) by debbugs.gnu.org; 16 Nov 2023 01:17:49 +0000 Received: from localhost ([127.0.0.1]:54222 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1r3R0v-0008MH-0l for submit@debbugs.gnu.org; Wed, 15 Nov 2023 20:17:49 -0500 Received: from mail-wm1-x344.google.com ([2a00:1450:4864:20::344]:50216) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1r3R0s-0008M1-6a for 67019@debbugs.gnu.org; Wed, 15 Nov 2023 20:17:47 -0500 Received: by mail-wm1-x344.google.com with SMTP id 5b1f17b1804b1-40790b0a224so1871575e9.0 for <67019@debbugs.gnu.org>; Wed, 15 Nov 2023 17:17:46 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1700097460; x=1700702260; darn=debbugs.gnu.org; h=mime-version:user-agent:content-transfer-encoding:references :in-reply-to:date:to:from:subject:message-id:from:to:cc:subject:date :message-id:reply-to; bh=fSOD4TJFAwn9rZGEJwBU4YCyvmDo1KfxfVPQZOGL29A=; b=jK6PFs/nCrURoqEgl7deb9nw3SX4u5gSYAhSv8DkW9CiP4zFfnREB5CDW84Fo6k7rc ktvYo1Wgmws98mTwRCzbp2pP4yi26N0zxk9fBRXER0iP6N74/vUpwYxAcaMflpuMtp9m 98kcKvzDdyo0qeSvjPAcrWoGx3niBZVFAxA2zW4S4Q609joiBmunPJVpWkPIUz9dqyo9 LeFsdJ/DDP7udszgeVy7V5yzzQat4SBOnZI8M6zSE0Hzi6qIa7b3XrbmWKfBz3h+cAi7 mSXkymQ9minWLlYEkJeVf4RBVF0pj0NPDCy/aZdHM7oGIlddoOFwkUl5j8IcTGKtGH5z Tn9g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1700097460; x=1700702260; h=mime-version:user-agent:content-transfer-encoding:references :in-reply-to:date:to:from:subject:message-id:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=fSOD4TJFAwn9rZGEJwBU4YCyvmDo1KfxfVPQZOGL29A=; b=rLKmeF3guBY5sU03Ao7SbVMwLoNE+On3ZIIGZdGu4KsaMpMXGZpXuQ5nQ9zZWq37y4 pkHGkq+14jmiljVmazukMwANOapg+IRo+VzM/YU5ObRwtwkL7wTv5bsHRuTQ+db3SxaG PAo1eT1S0uO2cPevwP2kG+B2Ab6wkxQsgJSw4LAaZstxxxdjFqxUXhMq8BuO7TeLyQ9+ 20vRNi+DNVOjFglnRno87I6IIbqFBFBZvO2zX7cWDMwTESNhbEOrok9X+K6M0QI7Ug37 q4N5/MVXrL4ZQ3Xok1NnjkFQkYNwc9RzAW70eFrpMKaTOX+6vbzZwcZjxKm6+HXt5nS7 NMdg== X-Gm-Message-State: AOJu0YxGXqzKCxt55f1txLKQImZcPQhr+3oD03fFZ75ifSxdhxjcAuyT AQUp3NI1Qx3HPvucjgUgvBI= X-Google-Smtp-Source: AGHT+IFr2IL9zecc0j6M5iLiF5eClcrgAh+yGLCnlhHQHbuDoAnHddNQVGn0cBsgEM45y+shSpq5ZA== X-Received: by 2002:a5d:548f:0:b0:32f:88e8:b8d1 with SMTP id h15-20020a5d548f000000b0032f88e8b8d1mr9324042wrv.13.1700097460453; Wed, 15 Nov 2023 17:17:40 -0800 (PST) Received: from lumine.fritz.box (85-127-52-93.dsl.dynamic.surfer.at. [85.127.52.93]) by smtp.gmail.com with ESMTPSA id c10-20020a5d63ca000000b0032da4f70756sm11939800wrw.5.2023.11.15.17.17.39 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 15 Nov 2023 17:17:39 -0800 (PST) Message-ID: <4d72986a039c897ba8a91c34fc1d9b7ef16d49dc.camel@gmail.com> Subject: Re: [PATCH 03/16] gnu: Add lessc. From: Liliana Marie Prikler To: Philip McGrath , 67019@debbugs.gnu.org Date: Thu, 16 Nov 2023 02:17:38 +0100 In-Reply-To: <13a1da53-4273-4ebf-aa58-4c23d1f5a641@philipmcgrath.com> References: <522f4e2a30c81dc738096bac21f46be50ddd8563.camel@gmail.com> <13a1da53-4273-4ebf-aa58-4c23d1f5a641@philipmcgrath.com> Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: base64 User-Agent: Evolution 3.46.4 MIME-Version: 1.0 X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 67019 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) SGksCgpBbSBNaXR0d29jaCwgZGVtIDE1LjExLjIwMjMgdW0gMTk6MDMgLTA1MDAgc2NocmllYiBQ aGlsaXAgTWNHcmF0aDoKPiBIaSwKPiAKPiBPbiAxMS8xNS8yMyAxNToyMywgTGlsaWFuYSBNYXJp ZSBQcmlrbGVyIHdyb3RlOgo+ID4gQW0gTWl0dHdvY2gsIGRlbSAxNS4xMS4yMDIzIHVtIDE0OjM1 IC0wNTAwIHNjaHJpZWIgUGhpbGlwIE1jR3JhdGg6Cj4gPiA+IFsuLi5dCj4gPiA+IAo+ID4gPiBU byBjbGFyaWZ5LCBkbyB5b3UgbWVhbiB2ZXJ0aWNhbCBvciBob3Jpem9udGFsPwo+ID4gSSBkbyBt ZWFuIGhvcml6b250YWwuCj4gPiAKPiA+IFsuLi5dCj4gwqA+Cj4gPiA+IAo+ID4gPiBJIGNvdWxk IGFsc28gaW1hZ2luZSBicmVha2luZyB0aGVzZSBsaW5lczoKPiA+ID4gCj4gPiA+IMKgwqA+PiAr wqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoCAoKCJz Y3JpcHRzIiBAIC4gYWxpc3QpCj4gPiA+IMKgwqA+PiArwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKg wqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgIGAoInNjcmlwdHMiIEAgLEAobWFwIChtYXRj aC0KPiA+ID4gbGFtYmRhCj4gPiA+IAo+ID4gPiBpbnN0ZWFkIGFzOgo+ID4gPiAKPiA+ID4gwqDC oD4+ICvCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKg ICgoInNjcmlwdHMiCj4gPiA+IMKgwqA+PiArwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKg wqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqAgQCAuIGFsaXN0KQo+ID4gPiDCoMKgPj4gK8KgwqDC oMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoCBgKCJzY3Jp cHRzIgo+ID4gPiDCoMKgPj4gK8KgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKg wqDCoMKgwqDCoMKgwqDCoMKgwqAgQCAsQChtYXAgKG1hdGNoLWxhbWJkYQo+ID4gPiAKPiA+ID4g YnV0IHRoYXQgZG9lc24ndCBzZWVtIGxpa2UgbXVjaCBvZiBhbiBpbXByb3ZlbWVudCB0byBtZS4K PiA+IEJ1dCB3aGF0IGFib3V0IGJyZWFraW5nIGxpbmVzIGJlZm9yZSAobWF0Y2gtbGFtYmRhP8Kg IFRoYXQgb3VnaHQgdG8KPiA+IGF0IGxlYXN0IGdpdmUgdXMgZW5vdWdoIHRvIGdldCAoXyAjZikg b250byBhIHNpbmdsZSBsaW5lLCBubz8KPiA+IAo+IAo+IE1heWJlIEknbSBjb25mdXNlZDogdGhl cmUgaXNuJ3QgKF8gI2YpIGFueXdoZXJlLgpUaGVyZSB3YXMgYSAoXyAjdCkgaW4gdGhlIGZpbHRl ciwgdGhvdWdoIDopCkluIGFueSBjYXNlLCBzdWNoIHRyaXZpYWwgbWF0Y2hlcyBzaG91bGQgZml0 IG9udG8gb25lIGxpbmUgaW1oby4KCj4gVGhlcmUgaXMgY3VycmVudGx5IGVub3VnaCBzcGFjZSB0 byBwdXQgKG90aGVyIG90aGVyKSBvbiBhIHNpbmdsZQo+IGxpbmUsIGJ1dCBJIHRob3VnaHQgaXQg d2FzIGJldHRlciBzdHlsZSB0byBwdXQgYSBuZXdsaW5lIGJldHdlZW4gdGhlCj4gbWF0Y2ggcGF0 dGVybiBhbmQgdGhlIGV4cHJlc3Npb24sIGVzcGVjaWFsbHkgd2hlbiB0aGUgcGF0dGVybiBpcyBu b3QKPiBfLgpJTUhPLCB0aGlzIG9ubHkgbWFrZXMgc2Vuc2UgZm9yIG5vbi10cml2aWFsIHJlcGxh Y2VtZW50cy4gIElmIHlvdSBrZWVwCnNvbWUgcGllY2Ugb2YgZGF0YSBhcy1pcywgeW91IG1vcmUg b2Z0ZW4gdGhhbiBub3QgZG9uJ3Qgd2FudCB0byBkcmF3CmF0dGVudGlvbiB0byB0aGlzIGltcGxl bWVudGF0aW9uIGRldGFpbCBieSBibG93aW5nIHVwIGl0cyBzaXplLgoKPiBCcmVha2luZyBiZWZv cmUgbWF0Y2gtbGFtYmRhIGdldHMgZW5vdWdoIHNwYWNlIHRvIHB1dCAoY29ucyAiYnVpbGQiIAo+ IG5ldy1idWlsZC1zY3JpcHQpIG9uIGEgc2luZ2xlIGxpbmUsIGJ1dCBJIGRvbid0IHRoaW5rIGl0 IGxvb2tzIGJldHRlcgo+IG92ZXJhbGw6Cj4gCj4gPiDCoMKgwqDCoMKgwqDCoMKgwqAgKGFkZC1h ZnRlciAnZG8tbm90LXRhcmdldC1lczUgJ3BhdGNoLWJ1aWxkLXNjcmlwdAo+ID4gwqDCoMKgwqDC oMKgwqDCoMKgwqDCoCAobGFtYmRhIGFyZ3MKPiA+IMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKg IChkZWZpbmUgbmV3LWJ1aWxkLXNjcmlwdAo+ID4gwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDC oMKgIChzdHJpbmctam9pbgo+ID4gwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqAgYCgi ZXNidWlsZCIKPiA+IMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoCAiLS1wbGF0 Zm9ybT1ub2RlIgo+ID4gwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgICItLWZv cm1hdD1janMiCj4gPiDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqAgIi0tb3V0 ZGlyPWxpYiIKPiA+IMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoCAsQChmaW5k LWZpbGVzICJzcmMvbGVzcyIgIlxcLmpzJCIpCj4gPiDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDC oMKgwqDCoMKgwqAgLEAoZmluZC1maWxlcyAic3JjL2xlc3Mtbm9kZSIgIlxcLmpzJCIpKSkpCj4g PiDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoCAod2l0aC1hdG9taWMtanNvbi1maWxlLXJlcGxh Y2VtZW50ICJwYWNrYWdlLmpzb24iCj4gPiDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqAg KG1hdGNoLWxhbWJkYQo+ID4gwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoCAoKCdA IC4gYWxpc3QpCj4gPiDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqAgKGNvbnMg J0AKPiA+IMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgIChtYXAKPiA+IMKg wqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqAgKG1hdGNoLWxhbWJkYQo+ID4g wqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqAgKCgic2NyaXB0cyIg QCAuIGFsaXN0KQo+ID4gwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKg wqDCoCBgKCJzY3JpcHRzIiBAICxAKG1hcAo+ID4gwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDC oMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqAgKG1h dGNoLWxhbWJkYQo+ID4gwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKg wqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgICgoImJ1aWxkIiAuIF8p Cj4gPiDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKg wqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoCAoY29ucyAiYnVpbGQiIG5ldy0KPiA+ IGJ1aWxkLXNjcmlwdCkpCj4gPiDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDC oMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqAgKG90aGVyCj4g PiDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDC oMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoCBvdGhlcikpCj4gPiDCoMKgwqDCoMKgwqDC oMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKg wqDCoMKgwqDCoCBhbGlzdCkpKQo+ID4gwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDC oMKgwqDCoMKgwqAgKG90aGVyCj4gPiDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKg wqDCoMKgwqDCoMKgIG90aGVyKSkKPiA+IMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKg wqDCoMKgwqAgYWxpc3QpKSkpKSkpCj4gCj4gVXNpbmcgZGVsZXRlIGluIGRvLW5vdC10YXJnZXQt ZXM1IGRvZXMgc2VlbSBsaWtlIGEgbWlub3IgaW1wcm92ZW1lbnQ6Cj4gCj4gPiDCoMKgwqDCoMKg wqDCoMKgwqAgKGFkZC1hZnRlciAnYXZvaWQtcGFyc2Utbm9kZS12ZXJzaW9uICdkby1ub3QtdGFy Z2V0LWVzNQo+ID4gwqDCoMKgwqDCoMKgwqDCoMKgwqDCoCAobGFtYmRhIGFyZ3MKPiA+IMKgwqDC oMKgwqDCoMKgwqDCoMKgwqDCoMKgIDs7IGVzYnVpbGQgY2FuJ3QgY29tcGlsZSBhbGwgZmVhdHVy ZXMgdG8gRVM1Cj4gPiDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoCAod2l0aC1hdG9taWMtanNv bi1maWxlLXJlcGxhY2VtZW50ICJ0c2NvbmZpZy5qc29uIgo+ID4gwqDCoMKgwqDCoMKgwqDCoMKg wqDCoMKgwqDCoMKgIChtYXRjaC1sYW1iZGEKPiA+IMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKg wqDCoMKgwqAgKCgnQCAuIGFsaXN0KQo+ID4gwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKg wqDCoMKgIChjb25zICdACj4gPiDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDC oCAobWFwIChtYXRjaC1sYW1iZGEKPiA+IMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKg wqDCoMKgwqDCoMKgwqDCoMKgwqAgKCgiY29tcGlsZXJPcHRpb25zIiAnQCAuIGFsaXN0KQo+ID4g wqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgIGAo InNjcmlwdHMiIEAgLEAoZGVsZXRlICcoInRhcmdldCIKPiA+ICJFUzUiKQo+ID4gwqDCoMKgwqDC oMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKg wqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgIGFsaXN0KSkpCj4gPiDCoMKgwqDC oMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgIChvdGhlcgo+ID4g wqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgIG90 aGVyKSkKPiA+IMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDC oCBhbGlzdCkpKSkpKSkKRnVuIGZhY3QsIHlvdSBjb3VsZCBpbmxpbmUgdGhpcyBkZWxldGUgaW50 byB0aGUgImNvbXBpbGVyT3B0aW9ucyIgbGluZQrigJMgb3Igc2V4cCBhdCBsZWFzdCwgYnkgdXNp bmcgKD0gKGN1dGUgZGVsZXRlICcoInRhcmdldCIgIkVTNSIpIDw+KQpvcHRpb25zKS4gIFRoYXQg YmVpbmcgc2FpZCwgaXQncyBub3QgbmVjZXNzYXJ5IHRvIGRvIHNvOyB0aGUgZGVsZXRlIHlvdQpj dXJyZW50bHkgaGF2ZSB3b3JrcyBmaW5lLgoKQW55aG93LCBzaW5jZSB0aGlzIGlzbid0IGEgY2xl YW4gYWxpc3QsIEknZCB1c2UgYSBkaWZmZXJlbnQgdmFyaWFibGUKbmFtZSwgcGVyaGFwcyAib3B0 aW9ucyI/CgpDaGVlcnMK From debbugs-submit-bounces@debbugs.gnu.org Wed Nov 15 20:52:04 2023 Received: (at 67019) by debbugs.gnu.org; 16 Nov 2023 01:52:04 +0000 Received: from localhost ([127.0.0.1]:54245 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1r3RY4-0000wn-31 for submit@debbugs.gnu.org; Wed, 15 Nov 2023 20:52:04 -0500 Received: from wout5-smtp.messagingengine.com ([64.147.123.21]:42367) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1r3RXy-0000wF-1x for 67019@debbugs.gnu.org; Wed, 15 Nov 2023 20:52:02 -0500 Received: from compute7.internal (compute7.nyi.internal [10.202.2.48]) by mailout.west.internal (Postfix) with ESMTP id 64F96320098B; Wed, 15 Nov 2023 20:51:52 -0500 (EST) Received: from mailfrontend1 ([10.202.2.162]) by compute7.internal (MEProxy); Wed, 15 Nov 2023 20:51:52 -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=1700099511; x=1700185911; bh=8DyiNTeUn5 M2pxv3P7AVGCI9jYcvtX48uIlOBeNF+X0=; b=VEcGcuMkZN7me8S3OmBgo6frR1 E5CJ+nsJ68ECMvmQedxJdSobPC8qy7k9cHKCDriNi+v2l7G8rGeKpcVgCfo3+egu iOETvuiUcLrQQkoRvVlAVvRNW2bsCg44msOFfQsOL9K5wUkTrfgl3nlK4dtLXVKg 4eVmCKESTV3xdA0WrUC2APIoV4VjqSlVdBN8eLKn4u39GLXjcJ5OYMFzN5U4NKHG FQnTZucaxK47ZvRHGPLIuXrlO9MknMqZIy4H2jVFyVWsevIolwyJk7nu3p8XJeMX s01NBMjqwAp13asUMDhwv/XMDlUDS+anM9k8Amiu4ifyGc4T0i7AAusMotIQ== 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=1700099511; x= 1700185911; bh=8DyiNTeUn5M2pxv3P7AVGCI9jYcvtX48uIlOBeNF+X0=; b=v yQM8+NS+FQv2TxC5kXq8On3G73KejXUrrbFzoAWN66CK4uzYYg52Q/BU4tNhXArH gdRDix3/Q/B9h5em13R3TLAvERQWZWJwMneKrcKAgxDyjyTxyyqCWd7Md4fowfq1 SeXU/5YFiZ1EGohQbqrvHEpyaIgN4TDMke3BTegqRYEmAxbxg36EZsjhx4vwZxKv qXOdt6akLfO3WYHbmpretbhFPTUBIgtn9QqU67dW5sbr0VzlKjIIxQxrQl9ZIZQl v01E0dNuVEwNja5wR6kV+evaul/SAyKz4UQzHt02bdhOsyI9eK6g0LNdIs/FMcQB QFA+ErroX58RFwgGaug6A== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvkedrudefjedgfeekucetufdoteggodetrfdotf 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 20:51:51 -0500 (EST) Message-ID: Date: Wed, 15 Nov 2023 20:51:49 -0500 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [PATCH 03/16] gnu: Add lessc. Content-Language: en-US To: Liliana Marie Prikler , 67019@debbugs.gnu.org References: <522f4e2a30c81dc738096bac21f46be50ddd8563.camel@gmail.com> <13a1da53-4273-4ebf-aa58-4c23d1f5a641@philipmcgrath.com> <4d72986a039c897ba8a91c34fc1d9b7ef16d49dc.camel@gmail.com> From: Philip McGrath Autocrypt: addr=philip@philipmcgrath.com; keydata= xsFNBFxfDXMBEAC50KOX7FVfbH5kzv1IWAu58hz77HfgH46izt8+3X51/AzD0QsrVnzz3fS0 37e5wnB4hpT/a6iGPbaah02nOhrCWjllWQrnp7rb0q9w8rnA41W5Aeajsob3/mPlSTkgX77/ nfXHFSaIPi+6DseAQO6EMbQrA/Ue4Yal/LWaAcpmGeAXUQabvH1I7LY5f6RI/pMii5cVmqm/ ea/oVroVeT4lBLh/1jEKv+tCVn1h9ks5L5AcbumaenEjgtJZ22/WUNowLD21uug7WCHlVdf+ 3PKSg/Hd7jotxYrfbhIEH2494KnenslxX4psavsH/AAWWTouvdiY5Q2d7eDH6P6ggWa1fXgs LlxFgtTTOmNTKViBKYk/g6gE2DpTaNG2pPqblxVlgy751O9y5UTBET0zj75BY55dKzoKg541 hBwKuwhNj0fA3xKesYzs2VdrzredEHegPeucQfTBSQ0G8lNdofElyv1e92rJtkAJXpodwNJf gmfJpdP33PPd1a7WQwWbo96JAkTkYnisEQyvJbQ8AvJw7V9xY79/pd2dXJkz88HZP486UiSK RmO9kItVSjCYz2Tqv75aZocpC661fv66GuLZfOCR1I0nbXNFxNs6K3/otJ3ignDFJCD4wk6j TlSODDeeXxDJtyBBrnYIzgb86KI3RJxoKrfbos0oavfWA2NGpwARAQABzSlQaGlsaXAgTWNH cmF0aCA8cGhpbGlwQHBoaWxpcG1jZ3JhdGguY29tPsLBlAQTAQgAPgIbAwULCQgHAgYVCgkI CwIEFgIDAQIeAQIXgBYhBPRlq6zWN66sFBVVz8oDY436Pxx6BQJkZmCHBQkJlXgUAAoJEMoD Y436Pxx6JvoQAKufvt1nAdezaIj+LccaKMOCNnVFxXBIDyaU9+Gmqh1ANQGLpdljfFmecpWm 1SA3sqDZapF2zg/hMHWbDGvdHJnPbtfnfS7ZZtOpdgRtMpE4zVeSi4t2NcIV0wQiPBXZhR0O Qp2PCMsExunJ0DV1pPMEt5r825haNPXZErSM3ectFgJwxjxEeOZ7khmrVrWZe0OddSsEEQsn 9jxpftLRgE/6N31wDuM/BDIrz+6AOc98zKFIoMmv8z9p1EEOvoFs7WunJklpWq6W4FggIPT0 UxlycFQBxzpVj2ga6MZVZ8Sp2fq0jgKn3uubYySyNi8SE6PfSre+QIG54OA+j9NSiVi36um7 Z4nqRC6JPoBe2VTwaZLskeO4grYHKFZHKVyOk3jcvDY5R8uyh+hPPj5kvYS34YFESZf+5LTA HoYmaOY8YGEqH66p9ukYbXaAoH9lmQig0zVcyyE9o8OuKhkvksiJ+2pEYtWXOkVqvj18xlfQ mLfhlWYo/o42x975zACjrZQe5+ZdQS9sz7ietWrHbZ9+hl79iSfeVkNvMikdZ5CZ81YvF42z kpDr6vWc2ImxIpgCTRp5HAUtKVsUJE/+yJop+AeVMonzzGaFd5tG/aT5BOz3w6ua3WfXqA9b NpeO4ANi2IQrhhWNq26JWx3Yx/QgxrNm44skIzuEEyL3b6Q7zsFNBFxfDXMBEADq/Vlop4lx W9Bi7cYaxjnhNMbDxR3aVV3GMy7zkuV3fGjvTAuO7raDoqN91y2bvm+vkM54Mw+Fu3ThBHCc niYkdgyIlpLNfFhQOOBtlj1jNmCGTOp7JBJ8mjQucOGy3A0uUaqvkMncO2trsfEsRD25nTZV dji4cHePP86Uc/w98OBt5cPLyM5/WU+GTpPBATFc1u4DocMSqbCZcNLDr1O7P6Knl8vsCtRj r4X4xp3d3I+aZ1h5l/Hu20u+/7fg8PO/WDOCMwqN64xB2OHLv7bQm0piwVN+Gkyjhk9EJINO m05ieGxvsyAaQDMkgvm/Hp1G2LJEWkxaTalnBawaVYM4TgpE5hU9gda3Ld/pdT2lkNmVq47v d//NBYWa1/aJGqBP2XlW0JMywmDEVH2fFwVqMQ3ZzE+N4HnSR6Uslv4DpIeYLGevheHLqegO o5VySo/P+lGQDO0vSHbBZgRJ/ROwNvkJVEQ9pI34Edt2zCfUYqjUU+3tcd2xgR8/JP2dnjYp NDq4CK/8ywk+sl8WY8MQpKccJdWp0CVgp2y88YALn6x9wxsPGQ8Lk7sB4ADwwPX87pFdJqe2 2oKgG9HklBTSxvdr1fN+/n4AD5XPBhMpi9UZHdaVuWzVfXU6EKMHlsJfJ7sF1atKVPcQDIN/ SxwTlxmsHVCMxifikklhQwmD/wARAQABwsF8BBgBCAAmAhsMFiEE9GWrrNY3rqwUFVXPygNj jfo/HHoFAmNsLkkFCQmC/B0ACgkQygNjjfo/HHrGqxAAgdV2GRCEIJwbLtRTv4qpfANsfX/I S0KZBDbwtZuCDceQTfsS8lF5WGJOPxF7MDkVGRhBPYpVamO56V+Y/o6drX0JEeWqLwB3nc8b PFpFcGTFOxp6Q1Ps4n/L/+hhTsI4vO79jsf97s7GPhSLpnzakb2Enh25G/MoToj6qQvuuqFW lDX1hxBC9Jf6pnuX1XGUik9LZVpuqf9suVgNa4Wf6ZverzphPWObXifpjVREk7jJ0g2OBGZz CATDfgEfu4OtV2JEeSrPZeFoHPQzsFfO/n99ZxBWVLbiXJgNTnU/vwbPkMpPjED3WSwTesW+ SgXfZf4KHFigC3Z34uhXfxn4I1XEW7UGgbtsrFqJI+WVzP2mUeOzNoz980N1tfowzoNShfKD rcDhtpyZZcaA+0O1oVSKs3LUT4QNiYl/lcg4l0qnBvj+ilG3ViXikhKn4RMJUppbXCx09ZBK Pz1PAvig0mnpCWCjizdbtuFzkZsLmfYjIbxkXBLMmQdqMgqUnsUGvUh0u+v5zQlc3IQnpLBt vkQuitsVuqkCKSILz8p2DyA6PWRI988fGPakjvV13iGwAIfFPsNvOoWsVLz3GT6f9chF4fAY JuOem41lA82RZB9fPty0S8YVavucU7qzTfHRj6LwvrWzLk6wRA7ThPHWVAZsyH1iYO+nUOsU FFu7icw= In-Reply-To: <4d72986a039c897ba8a91c34fc1d9b7ef16d49dc.camel@gmail.com> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 8bit X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 67019 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) Hi, On 11/15/23 20:17, Liliana Marie Prikler wrote: > Hi, > > Am Mittwoch, dem 15.11.2023 um 19:03 -0500 schrieb Philip McGrath: >> Hi, >> >> On 11/15/23 15:23, Liliana Marie Prikler wrote: >>> Am Mittwoch, dem 15.11.2023 um 14:35 -0500 schrieb Philip McGrath: >>>> [...] >>>> >>>> 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 was a (_ #t) in the filter, though :) > In any case, such trivial matches should fit onto one line imho. > >> 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 >> _. > IMHO, this only makes sense for non-trivial replacements. If you keep > some piece of data as-is, you more often than not don't want to draw > attention to this implementation detail by blowing up its size. > I don't think the content of the right-hand side is relevant: in my view, the purpose of the newline is to make the shape of the clause clear, especially given that the left-hand side is not an expression. The fact that Guix's style forbids square brackets makes the newline even more necessary, IMO. In any case, what arrangement of whitespace in patch-build-script would unblock this patch series for you? >> >> 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))))))) > Fun fact, you could inline this delete into the "compilerOptions" line > – or sexp at least, by using (= (cute delete '("target" "ES5") <>) > options). That being said, it's not necessary to do so; the delete you > currently have works fine. > > Anyhow, since this isn't a clean alist, I'd use a different variable > name, perhaps "options"? > All of the variables named alist are, in fact, alists. I noticed, though, that this was inadvertently renaming "compilerOptions" to "scripts" and thus effectively patching out all the other options, too: things seemed to work regardless, but here's a correct version: > (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) > `("compilerOptions" @ ,@(delete '("target" . "ES5") > alist))) > (other > other)) > alist))))))) Philip From debbugs-submit-bounces@debbugs.gnu.org Thu Nov 16 02:18:41 2023 Received: (at 67019) by debbugs.gnu.org; 16 Nov 2023 07:18:41 +0000 Received: from localhost ([127.0.0.1]:54402 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1r3We8-0001Ih-Fv for submit@debbugs.gnu.org; Thu, 16 Nov 2023 02:18:40 -0500 Received: from mail-wm1-x343.google.com ([2a00:1450:4864:20::343]:43167) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1r3We4-0001IQ-AB for 67019@debbugs.gnu.org; Thu, 16 Nov 2023 02:18:39 -0500 Received: by mail-wm1-x343.google.com with SMTP id 5b1f17b1804b1-4081ccf69dcso9713005e9.0 for <67019@debbugs.gnu.org>; Wed, 15 Nov 2023 23:18:36 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1700119110; x=1700723910; darn=debbugs.gnu.org; h=mime-version:user-agent:content-transfer-encoding:references :in-reply-to:date:to:from:subject:message-id:from:to:cc:subject:date :message-id:reply-to; bh=Hgodkk7gI/ltPoky3Rh1/GcDEyqLpOKRfqN0putZ9iI=; b=ikbMGhk3SixBaAT6jMRJZgDfDrasAk0PEUW9yjfhjkm6bRZfDGaIWDC2KVJV/yHWr4 sCi40gaHoDeBFOe+ciE8AyzM+/xwdHJYRc3yq+VpIQZaa1puSZtSCr88Tw1pzG2LO+OH nDHaShpP/f3jq82UXQhh+NwSoN+73PJFrX8PkiFKCFRN1Z86LSSB2tjxoL9rYoHm27A/ DOOT8qklSz5iN1/3cahqQCoEvfYTPk7lSAMHC9BVN2BxolC/v6gT3IWzdDDUNKABpROs dNuHd2qkjS9jmRfdjVN3hZdi0hOCm2fDJKpttjmaP/24yAjXBS6VfT/6wezYKFzayetl /wrQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1700119110; x=1700723910; h=mime-version:user-agent:content-transfer-encoding:references :in-reply-to:date:to:from:subject:message-id:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=Hgodkk7gI/ltPoky3Rh1/GcDEyqLpOKRfqN0putZ9iI=; b=Bak5Ncl4T2mfEOYY6ZkMa63EnbeI9iw5qmfVNzJMFs5zZKmlBfXxPktXtFZvJP3Pk7 jB7oqvv3Yoy7FlV8MrnHPWm8570V0F5Oi4BvsExjCIQZMk2384D0X6qZw4TdST3TYQ59 DgNjBD7OAGFY0vK/GBNNzSD0FZIqBfiUALvRQAKWHpjE5DUW42bp24AUab5Ucv011RDc dqCrpy16dx5a7+vN62uTcBceWqZFcUhAk8qV/vn8gopYclOun9eaxdoP1xCJOvK+4msm 3o/micne6/QEcpY9ZwTjdVvKIdm+rT9rP5twFKZS5/N/G11U2z6hYeyN+Z0AA4r1BDan 1Utg== X-Gm-Message-State: AOJu0Yy9qvQZN6j3RBndRw5p0zX7+kYCogOJZSVJrEO7AWpiJ9yBEu+O Z9sWhw+fyr73RxZrB71C6Yc= X-Google-Smtp-Source: AGHT+IHqapYoLOlY2zdVdSmljllJC730TV8XH7B+E/XZdq6UvJwdI8IX/NpQ3332R0dX4yj2K4dy0Q== X-Received: by 2002:a05:600c:4e90:b0:407:4701:f9e with SMTP id f16-20020a05600c4e9000b0040747010f9emr731751wmq.17.1700119109462; Wed, 15 Nov 2023 23:18:29 -0800 (PST) Received: from lumine.fritz.box (85-127-52-93.dsl.dynamic.surfer.at. [85.127.52.93]) by smtp.gmail.com with ESMTPSA id n20-20020a05600c4f9400b004060f0a0fd5sm2351646wmq.13.2023.11.15.23.18.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 15 Nov 2023 23:18:28 -0800 (PST) Message-ID: Subject: Re: [PATCH 03/16] gnu: Add lessc. From: Liliana Marie Prikler To: Philip McGrath , 67019@debbugs.gnu.org Date: Thu, 16 Nov 2023 08:18:27 +0100 In-Reply-To: References: <522f4e2a30c81dc738096bac21f46be50ddd8563.camel@gmail.com> <13a1da53-4273-4ebf-aa58-4c23d1f5a641@philipmcgrath.com> <4d72986a039c897ba8a91c34fc1d9b7ef16d49dc.camel@gmail.com> Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: base64 User-Agent: Evolution 3.46.4 MIME-Version: 1.0 X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 67019 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) SGksCgpBbSBNaXR0d29jaCwgZGVtIDE1LjExLjIwMjMgdW0gMjA6NTEgLTA1MDAgc2NocmllYiBQ aGlsaXAgTWNHcmF0aDoKPiBIaSwKPiAKPiBPbiAxMS8xNS8yMyAyMDoxNywgTGlsaWFuYSBNYXJp ZSBQcmlrbGVyIHdyb3RlOgo+ID4gSGksCj4gPiAKPiA+IEFtIE1pdHR3b2NoLCBkZW0gMTUuMTEu MjAyMyB1bSAxOTowMyAtMDUwMCBzY2hyaWViIFBoaWxpcCBNY0dyYXRoOgo+ID4gPiBIaSwKPiA+ ID4gCj4gPiA+IE9uIDExLzE1LzIzIDE1OjIzLCBMaWxpYW5hIE1hcmllIFByaWtsZXIgd3JvdGU6 Cj4gPiA+ID4gQW0gTWl0dHdvY2gsIGRlbSAxNS4xMS4yMDIzIHVtIDE0OjM1IC0wNTAwIHNjaHJp ZWIgUGhpbGlwCj4gPiA+ID4gTWNHcmF0aDoKPiA+ID4gPiA+IFsuLi5dCj4gPiA+ID4gPiAKPiA+ ID4gPiA+IFRvIGNsYXJpZnksIGRvIHlvdSBtZWFuIHZlcnRpY2FsIG9yIGhvcml6b250YWw/Cj4g PiA+ID4gSSBkbyBtZWFuIGhvcml6b250YWwuCj4gPiA+ID4gCj4gPiA+ID4gWy4uLl0KPiA+ID4g wqDCoD4KPiA+ID4gPiA+IAo+ID4gPiA+ID4gSSBjb3VsZCBhbHNvIGltYWdpbmUgYnJlYWtpbmcg dGhlc2UgbGluZXM6Cj4gPiA+ID4gPiAKPiA+ID4gPiA+IMKgwqDCoD4+ICvCoMKgwqDCoMKgwqDC oMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgICgoInNjcmlwdHMiIEAgLiBh bGlzdCkKPiA+ID4gPiA+IMKgwqDCoD4+ICvCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDC oMKgwqDCoMKgwqDCoMKgwqDCoMKgwqAgYCgic2NyaXB0cyIgQCAsQChtYXAKPiA+ID4gPiA+ICht YXRjaC0KPiA+ID4gPiA+IGxhbWJkYQo+ID4gPiA+ID4gCj4gPiA+ID4gPiBpbnN0ZWFkIGFzOgo+ ID4gPiA+ID4gCj4gPiA+ID4gPiDCoMKgwqA+PiArwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDC oMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoCAoKCJzY3JpcHRzIgo+ID4gPiA+ID4gwqDCoMKgPj4g K8KgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKg IEAgLiBhbGlzdCkKPiA+ID4gPiA+IMKgwqDCoD4+ICvCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDC oMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqAgYCgic2NyaXB0cyIKPiA+ID4gPiA+IMKgwqDC oD4+ICvCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKg wqDCoMKgIEAgLEAobWFwIChtYXRjaC1sYW1iZGEKPiA+ID4gPiA+IAo+ID4gPiA+ID4gYnV0IHRo YXQgZG9lc24ndCBzZWVtIGxpa2UgbXVjaCBvZiBhbiBpbXByb3ZlbWVudCB0byBtZS4KPiA+ID4g PiBCdXQgd2hhdCBhYm91dCBicmVha2luZyBsaW5lcyBiZWZvcmUgKG1hdGNoLWxhbWJkYT/CoCBU aGF0IG91Z2h0Cj4gPiA+ID4gdG8KPiA+ID4gPiBhdCBsZWFzdCBnaXZlIHVzIGVub3VnaCB0byBn ZXQgKF8gI2YpIG9udG8gYSBzaW5nbGUgbGluZSwgbm8/Cj4gPiA+ID4gCj4gPiA+IAo+ID4gPiBN YXliZSBJJ20gY29uZnVzZWQ6IHRoZXJlIGlzbid0IChfICNmKSBhbnl3aGVyZS4KPiA+IFRoZXJl IHdhcyBhIChfICN0KSBpbiB0aGUgZmlsdGVyLCB0aG91Z2ggOikKPiA+IEluIGFueSBjYXNlLCBz dWNoIHRyaXZpYWwgbWF0Y2hlcyBzaG91bGQgZml0IG9udG8gb25lIGxpbmUgaW1oby4KPiA+IAo+ ID4gPiBUaGVyZSBpcyBjdXJyZW50bHkgZW5vdWdoIHNwYWNlIHRvIHB1dCAob3RoZXIgb3RoZXIp IG9uIGEgc2luZ2xlCj4gPiA+IGxpbmUsIGJ1dCBJIHRob3VnaHQgaXQgd2FzIGJldHRlciBzdHls ZSB0byBwdXQgYSBuZXdsaW5lIGJldHdlZW4KPiA+ID4gdGhlCj4gPiA+IG1hdGNoIHBhdHRlcm4g YW5kIHRoZSBleHByZXNzaW9uLCBlc3BlY2lhbGx5IHdoZW4gdGhlIHBhdHRlcm4gaXMKPiA+ID4g bm90Cj4gPiA+IF8uCj4gPiBJTUhPLCB0aGlzIG9ubHkgbWFrZXMgc2Vuc2UgZm9yIG5vbi10cml2 aWFsIHJlcGxhY2VtZW50cy7CoCBJZiB5b3UKPiA+IGtlZXAKPiA+IHNvbWUgcGllY2Ugb2YgZGF0 YSBhcy1pcywgeW91IG1vcmUgb2Z0ZW4gdGhhbiBub3QgZG9uJ3Qgd2FudCB0bwo+ID4gZHJhdwo+ ID4gYXR0ZW50aW9uIHRvIHRoaXMgaW1wbGVtZW50YXRpb24gZGV0YWlsIGJ5IGJsb3dpbmcgdXAg aXRzIHNpemUuCj4gPiAKPiAKPiBJIGRvbid0IHRoaW5rIHRoZSBjb250ZW50IG9mIHRoZSByaWdo dC1oYW5kIHNpZGUgaXMgcmVsZXZhbnQ6IGluIG15IAo+IHZpZXcsIHRoZSBwdXJwb3NlIG9mIHRo ZSBuZXdsaW5lIGlzIHRvIG1ha2UgdGhlIHNoYXBlIG9mIHRoZSBjbGF1c2UgCj4gY2xlYXIsIGVz cGVjaWFsbHkgZ2l2ZW4gdGhhdCB0aGUgbGVmdC1oYW5kIHNpZGUgaXMgbm90IGFuIGV4cHJlc3Np b24uCj4gVGhlIGZhY3QgdGhhdCBHdWl4J3Mgc3R5bGUgZm9yYmlkcyBzcXVhcmUgYnJhY2tldHMg bWFrZXMgdGhlIG5ld2xpbmUgCj4gZXZlbiBtb3JlIG5lY2Vzc2FyeSwgSU1PLgo+IAo+IEluIGFu eSBjYXNlLCB3aGF0IGFycmFuZ2VtZW50IG9mIHdoaXRlc3BhY2UgaW4gcGF0Y2gtYnVpbGQtc2Ny aXB0Cj4gd291bGQgdW5ibG9jayB0aGlzIHBhdGNoIHNlcmllcyBmb3IgeW91PwpJZiBwdXNoIGNv bWVzIHRvIHNob3ZlLCBJIGNhbiByZWFycmFuZ2UgdGhlIHdoaXRlc3BhY2UgYXMgSSB3YW50LCBn aXZlbgpteSBjb21taXR0ZXIgcHJpdmlsZWdlczsgaXQncyBqdXN0IHRoYXQgeW91J3ZlIGNvbXBs YWluZWQgYWJvdXQgbWUKYWJ1c2luZyB0aGVtIGJlZm9yZSwgc28gSSBkb24ndCByZWFsbHkgd2Fu dCB0by4KCkFueWhvdywgc3R1ZmYgbGlrZSAoXyAjdCksIChfICNmKSwgKHggeCksIOKApiBzaG91 bGQgYWxsIGZpdCBvbnRvIGEKc2luZ2xlIGxpbmUuCgo+ID4gPiAKPiA+ID4gVXNpbmcgZGVsZXRl IGluIGRvLW5vdC10YXJnZXQtZXM1IGRvZXMgc2VlbSBsaWtlIGEgbWlub3IKPiA+ID4gaW1wcm92 ZW1lbnQ6Cj4gPiA+IAo+ID4gPiA+IMKgwqDCoMKgwqDCoMKgwqDCoMKgIChhZGQtYWZ0ZXIgJ2F2 b2lkLXBhcnNlLW5vZGUtdmVyc2lvbiAnZG8tbm90LXRhcmdldC0KPiA+ID4gPiBlczUKPiA+ID4g PiDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqAgKGxhbWJkYSBhcmdzCj4gPiA+ID4gwqDCoMKgwqDC oMKgwqDCoMKgwqDCoMKgwqDCoCA7OyBlc2J1aWxkIGNhbid0IGNvbXBpbGUgYWxsIGZlYXR1cmVz IHRvIEVTNQo+ID4gPiA+IMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqAgKHdpdGgtYXRvbWlj LWpzb24tZmlsZS1yZXBsYWNlbWVudAo+ID4gPiA+ICJ0c2NvbmZpZy5qc29uIgo+ID4gPiA+IMKg wqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgIChtYXRjaC1sYW1iZGEKPiA+ID4gPiDCoMKg wqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqAgKCgnQCAuIGFsaXN0KQo+ID4gPiA+IMKg wqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgIChjb25zICdACj4gPiA+ID4gwqDC oMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoCAobWFwIChtYXRjaC1sYW1iZGEK PiA+ID4gPiDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDC oMKgwqAgKCgiY29tcGlsZXJPcHRpb25zIiAnQCAuIGFsaXN0KQo+ID4gPiA+IMKgwqDCoMKgwqDC oMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgIGAoInNjcmlwdHMi IEAgLEAoZGVsZXRlICcoInRhcmdldCIKPiA+ID4gPiAiRVM1IikKPiA+ID4gPiDCoMKgwqDCoMKg wqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDC oMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoCBhbGlzdCkpKQo+ID4gPiA+IMKg wqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoCAob3Ro ZXIKPiA+ID4gPiDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKg wqDCoMKgwqDCoCBvdGhlcikpCj4gPiA+ID4gwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKg wqDCoMKgwqDCoMKgwqDCoMKgwqAgYWxpc3QpKSkpKSkpCj4gPiBGdW4gZmFjdCwgeW91IGNvdWxk IGlubGluZSB0aGlzIGRlbGV0ZSBpbnRvIHRoZSAiY29tcGlsZXJPcHRpb25zIgo+ID4gbGluZSAg b3Igc2V4cCBhdCBsZWFzdCwgYnkgdXNpbmcgKD0gKGN1dGUgZGVsZXRlICcoInRhcmdldCIgIkVT NSIpCj4gPiA8Pikgb3B0aW9ucykuwqAgVGhhdCBiZWluZyBzYWlkLCBpdCdzIG5vdCBuZWNlc3Nh cnkgdG8gZG8gc287IHRoZQo+ID4gZGVsZXRlIHlvdSBjdXJyZW50bHkgaGF2ZSB3b3JrcyBmaW5l Lgo+ID4gCj4gPiBBbnlob3csIHNpbmNlIHRoaXMgaXNuJ3QgYSBjbGVhbiBhbGlzdCwgSSdkIHVz ZSBhIGRpZmZlcmVudAo+ID4gdmFyaWFibGUgbmFtZSwgcGVyaGFwcyAib3B0aW9ucyI/Cj4gCj4g QWxsIG9mIHRoZSB2YXJpYWJsZXMgbmFtZWQgYWxpc3QgYXJlLCBpbiBmYWN0LCBhbGlzdHMuClRJ TC4KCj4gSSBub3RpY2VkLCB0aG91Z2gsIHRoYXQgdGhpcyB3YXMgaW5hZHZlcnRlbnRseSByZW5h bWluZyAKPiAiY29tcGlsZXJPcHRpb25zIiB0byAic2NyaXB0cyIgYW5kIHRodXMgZWZmZWN0aXZl bHkgcGF0Y2hpbmcgb3V0IGFsbAo+IHRoZSBvdGhlciBvcHRpb25zLCB0b286IHRoaW5ncyBzZWVt ZWQgdG8gd29yayByZWdhcmRsZXNzLCBidXQgaGVyZSdzCj4gYSBjb3JyZWN0IHZlcnNpb246Cj4g Cj4gPiDCoMKgwqDCoMKgwqDCoMKgwqAgKGFkZC1hZnRlciAnYXZvaWQtcGFyc2Utbm9kZS12ZXJz aW9uICdkby1ub3QtdGFyZ2V0LWVzNQo+ID4gwqDCoMKgwqDCoMKgwqDCoMKgwqDCoCAobGFtYmRh IGFyZ3MKPiA+IMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgIDs7IGVzYnVpbGQgY2FuJ3QgY29t cGlsZSBhbGwgZmVhdHVyZXMgdG8gRVM1Cj4gPiDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoCAo d2l0aC1hdG9taWMtanNvbi1maWxlLXJlcGxhY2VtZW50ICJ0c2NvbmZpZy5qc29uIgo+ID4gwqDC oMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgIChtYXRjaC1sYW1iZGEKPiA+IMKgwqDCoMKgwqDC oMKgwqDCoMKgwqDCoMKgwqDCoMKgwqAgKCgnQCAuIGFsaXN0KQo+ID4gwqDCoMKgwqDCoMKgwqDC oMKgwqDCoMKgwqDCoMKgwqDCoMKgIChjb25zICdACj4gPiDCoMKgwqDCoMKgwqDCoMKgwqDCoMKg wqDCoMKgwqDCoMKgwqDCoCAobWFwIChtYXRjaC1sYW1iZGEKPiA+IMKgwqDCoMKgwqDCoMKgwqDC oMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqAgKCgiY29tcGlsZXJPcHRpb25zIiAn QCAuIGFsaXN0KQo+ID4gwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKg wqDCoMKgwqDCoMKgIGAoImNvbXBpbGVyT3B0aW9ucyIgQCAsQChkZWxldGUKPiA+ICcoInRhcmdl dCIgLiAiRVM1IikKPiA+IMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDC oMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKg wqDCoMKgwqDCoMKgwqDCoMKgwqAKPiA+IGFsaXN0KSkpCj4gPiDCoMKgwqDCoMKgwqDCoMKgwqDC oMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgIChvdGhlcgo+ID4gwqDCoMKgwqDCoMKg wqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgIG90aGVyKSkKPiA+IMKg wqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoCBhbGlzdCkpKSkp KSkKTm93IHRoYXQgbG9va3MgbGlrZSBhIHByb3BlciBhbGlzdCB0byBtZSA6KQo= From debbugs-submit-bounces@debbugs.gnu.org Thu Nov 16 14:16:39 2023 Received: (at 67019) by debbugs.gnu.org; 16 Nov 2023 19:16:39 +0000 Received: from localhost ([127.0.0.1]:44518 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1r3hqw-0003iH-LF for submit@debbugs.gnu.org; Thu, 16 Nov 2023 14:16:39 -0500 Received: from out4-smtp.messagingengine.com ([66.111.4.28]:53725) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1r3hqs-0003hv-Lj for 67019@debbugs.gnu.org; Thu, 16 Nov 2023 14:16:38 -0500 Received: from compute4.internal (compute4.nyi.internal [10.202.2.44]) by mailout.nyi.internal (Postfix) with ESMTP id 52CB55C0176; Thu, 16 Nov 2023 14:16:28 -0500 (EST) Received: from mailfrontend1 ([10.202.2.162]) by compute4.internal (MEProxy); Thu, 16 Nov 2023 14:16:28 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= philipmcgrath.com; h=cc:cc:content-transfer-encoding :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=1700162188; x=1700248588; bh=Z2eBojWpSS Fzrjyj2lX37DdBALx3XVBnlDQkzYRiXbk=; b=frHWFalmkguMSG40OAW1URjhOD YewS+/IrR8v/6W0enDiRUZ1A6/1Dj+awx6iPnEurISpxpnv44aOw3I6eZneVZ1Yn 8XeQLkguosWBQ5DLiP2I79VymC01kGDrx45GbMU8D1a4gPxYfSZiq9sb5SLs4Xak lkmzjyOCy/0nEqjJzjEmh6hUwZGiL4/wr5meTfbY4tcsTEiyzdrad4z8f9GSFM05 KEN1PkE71t8qOGnf9T9T2AzLIZBZ2TpczE/mB4z2sj7vneGpxyJfOg3IBmTZ9sem Qo4WxUClahrMG4x/KTyB+q4wu+5mvx4agsBtE9EsdHRir4h2aRTmEbalimQg== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:cc:content-transfer-encoding :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=1700162188; x= 1700248588; bh=Z2eBojWpSSFzrjyj2lX37DdBALx3XVBnlDQkzYRiXbk=; b=c tM0UyDUesQYMZC9uWAqUeUkmkwAWaSwj7kAEfVhapG2Vpg/fZS++v2nvlMdj3zm2 Cbc7pHhCfu2eFLHb4iF0GbnP0TvSExegUiIWqnKvTsyOYJBgw1q/vW66hJMIdK+z jjCp0BKj8SZyXCV75E9QY32E2oUkz1Lh9sXRVKcUivIDF2oFkQGs61oIHYIFsCSY 9UATVwUiW6XNvKnMOyrSOie0hccLNeox7RRm/wpE3KSeESpqA5icW7efWBVGzb/w XtGd7sUGqGxmc5aZcoEMHE0ibjLN5ou0eT0RkqKuv3MeTcgUcxJq8U2VMdilFcTP xpFBU15HMSfalTqCEehlg== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvkedrudefkedguddvtdcutefuodetggdotefrod ftvfcurfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfgh necuuegrihhlohhuthemuceftddtnecusecvtfgvtghiphhivghnthhsucdlqddutddtmd enucfjughrpefhvfevufffkffojghfggfgsedtkeertdertddtnecuhfhrohhmpefrhhhi lhhiphcuofgtifhrrghthhcuoehphhhilhhiphesphhhihhlihhpmhgtghhrrghthhdrtg homheqnecuggftrfgrthhtvghrnhepkedttdfhieeuheelvdfhffefffeiteejheelgfei leekvddthedtvddvheektedunecuffhomhgrihhnpehgnhhurdhorhhgnecuvehluhhsth gvrhfuihiivgeptdenucfrrghrrghmpehmrghilhhfrhhomhepphhhihhlihhpsehphhhi lhhiphhmtghgrhgrthhhrdgtohhm X-ME-Proxy: Feedback-ID: i2b1146f3:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Thu, 16 Nov 2023 14:16:27 -0500 (EST) From: Philip McGrath To: 67019@debbugs.gnu.org Subject: [PATCH v2 00/16] gnu: Add KaTeX, lessc, and flow-remove-types. Date: Thu, 16 Nov 2023 14:15:38 -0500 Message-ID: X-Mailer: git-send-email 2.41.0 In-Reply-To: References: <522f4e2a30c81dc738096bac21f46be50ddd8563.camel@gmail.com> <13a1da53-4273-4ebf-aa58-4c23d1f5a641@philipmcgrath.com> <4d72986a039c897ba8a91c34fc1d9b7ef16d49dc.camel@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 67019 Cc: Philip McGrath , Liliana Marie Prikler X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) Hi, Here is a v2. Other than rebasing, the only change is in 03/16, in which I've fixed do-not-target-es5 as I explained in . I've not made other whitespace changes, as I still prefer this to the other options we've discussed, but, Liliana, feel free to adjust it to your liking if you feel this is otherwise ready to merge. Philip Philip McGrath (16): gnu: Add node-is-what. gnu: Add node-copy-anything. gnu: Add lessc. gnu: Add ocaml-wtf8. gnu: Add ocaml-visitors. gnu: Add ocaml-ppx-gen-rec. gnu: Add ocaml-dtoa. gnu: Add node-vlq. gnu: Add ocaml-flow-parser. gnu: Add node-flow-parser. gnu: Add flow-remove-types. gnu: js-commander: Update to 11.1.0. gnu: js-commander: Install as a node module. gnu: Add mftrace. gnu: Add font-katex. gnu: Add katex. gnu/packages/fontutils.scm | 45 +++++ gnu/packages/javascript.scm | 381 ++++++++++++++++++++++++++++++++++-- gnu/packages/node-xyz.scm | 220 +++++++++++++++++++++ gnu/packages/ocaml.scm | 99 ++++++++++ gnu/packages/web.scm | 381 ++++++++++++++++++++++++++++++++++++ 5 files changed, 1109 insertions(+), 17 deletions(-) base-commit: fc6bdaad57bf91609849623c5f485403c030cb49 -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Thu Nov 16 14:16:44 2023 Received: (at 67019) by debbugs.gnu.org; 16 Nov 2023 19:16:45 +0000 Received: from localhost ([127.0.0.1]:44532 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1r3hr2-0003io-46 for submit@debbugs.gnu.org; Thu, 16 Nov 2023 14:16:44 -0500 Received: from out4-smtp.messagingengine.com ([66.111.4.28]:46227) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1r3hqy-0003i3-Li for 67019@debbugs.gnu.org; Thu, 16 Nov 2023 14:16:41 -0500 Received: from compute7.internal (compute7.nyi.internal [10.202.2.48]) by mailout.nyi.internal (Postfix) with ESMTP id B932C5C016D; Thu, 16 Nov 2023 14:16:35 -0500 (EST) Received: from mailfrontend1 ([10.202.2.162]) by compute7.internal (MEProxy); Thu, 16 Nov 2023 14:16:35 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= philipmcgrath.com; h=cc:cc:content-transfer-encoding :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=1700162195; x=1700248595; bh=E5IupjeBbL q8FEGOhGUFOfGxUd7pyAq4UrFRk0wuaQY=; b=LyNtnpz2c665FHs8iav/RjvHth fVeoMFdCSONlxA5T71sAXQNRq23oiHjhzSnV2KXAevCrgS39PSlHVX7ufphZCqB4 8bygJ2eSqRvCynz1PKzE8oYuosyYywbW18d8kwFJMWavfGFzRufYyRwNxvk/mrCg kDsgGEE7MqjikGsc3y2zpMs4YDzbt4uccmx+WT77bC4XOde4vLWikLtaGkb7qt4P qTPJ6wPtVoHu6BeCDIX2QbuONPmcubFgPEZe8gvYNG2kM63J+EwvCGPB/UEFjeDG MGB/xOpy23y26ctXICUSM2qepqyHABWKv9gt/rf83ccS3iP0NEt07FUfpBVg== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:cc:content-transfer-encoding :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=1700162195; x= 1700248595; bh=E5IupjeBbLq8FEGOhGUFOfGxUd7pyAq4UrFRk0wuaQY=; b=p 7rkx66n+e5DkRGTYBPYzkNwBwAnG2w1RwQAryHWu46d6IhheucEgjxz/R55jlp3s RlFLTYSe1+6ar+gynUoWtuIEkFjtn3pSSuOLk1xRn8BsimzKRmcvqb2JyE/V+wAH pbx+XkSf/vJQBUHb1Mm0I1ZuBgdrbnK/R3aBoNwT9XEPJFW3EpJOeXKnaGBy0UIT Nk7KuY4xFHQe9IMkyxuezNGyizIVNH4PWyxv5FNt8p0g8dEbip5tZZ63+fBJsIT0 BPuWHGo9XnoVtsl1az5yjSwiRVVmhETr/MgSWgITWQerQia73yB+CVJGtgudAJfT djn5R+sfKT5gqEUCeU+Gw== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvkedrudefkedguddvtdcutefuodetggdotefrod ftvfcurfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfgh necuuegrihhlohhuthemuceftddtnecusecvtfgvtghiphhivghnthhsucdlqddutddtmd enucfjughrpefhvfevufffkffojghfggfgsedtkeertdertddtnecuhfhrohhmpefrhhhi lhhiphcuofgtifhrrghthhcuoehphhhilhhiphesphhhihhlihhpmhgtghhrrghthhdrtg homheqnecuggftrfgrthhtvghrnhepgfevgfeljeekgefhgeeigfdvhfeukefgvdduieeg tdetvdfhvdffjeeggfduffeknecuffhomhgrihhnpehgihhthhhusgdrtghomhdpnhhpmh hjshdrtghomhenucevlhhushhtvghrufhiiigvpedtnecurfgrrhgrmhepmhgrihhlfhhr ohhmpehphhhilhhiphesphhhihhlihhpmhgtghhrrghthhdrtghomh X-ME-Proxy: Feedback-ID: i2b1146f3:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Thu, 16 Nov 2023 14:16:35 -0500 (EST) From: Philip McGrath To: 67019@debbugs.gnu.org Subject: [PATCH v2 01/16] gnu: Add node-is-what. Date: Thu, 16 Nov 2023 14:15:39 -0500 Message-ID: <9daf928c3989a207159dd6f53b531be65e7bae64.1700161584.git.philip@philipmcgrath.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 67019 Cc: Philip McGrath , Liliana Marie Prikler X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) * gnu/packages/node-xyz.scm (node-is-what): New variable. --- gnu/packages/node-xyz.scm | 81 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 81 insertions(+) diff --git a/gnu/packages/node-xyz.scm b/gnu/packages/node-xyz.scm index 6c16417309..49760ded2b 100644 --- a/gnu/packages/node-xyz.scm +++ b/gnu/packages/node-xyz.scm @@ -1631,3 +1631,84 @@ (define-public node-yazl @item Prefer to open input files one at a time than all at once. @end enumerate") (license license:expat))) + +(define-public node-is-what + (package + (name "node-is-what") + (version "4.1.16") + (source + (origin (method git-fetch) + (uri (git-reference + (url "https://github.com/mesqueeb/is-what") + (commit (string-append "v" version)))) + (sha256 + (base32 "02h76klvjxgk0cl8a7sq4wbi7l4pvdimbams08l34k5carg03bdx")) + (snippet + #~(for-each delete-file + '("dist/cjs/index.cjs" + "dist/index.js"))) + (file-name (git-file-name name version)))) + (build-system node-build-system) + (native-inputs (list esbuild)) + (arguments + (list + #:tests? #f ; needs more dependencies + #:modules + `((guix build node-build-system) + (ice-9 match) + (guix build utils)) + #:phases + #~(modify-phases %standard-phases + (add-after 'patch-dependencies 'delete-dependencies + (lambda args + (delete-dependencies + '(;; devDependencies + "@typescript-eslint/eslint-plugin" + "@typescript-eslint/parser" + "del-cli" + "eslint" + "eslint-config-prettier" + "eslint-plugin-tree-shaking" + "np" + "prettier" + "prettier-plugin-jsdoc" + "rollup" + "rollup-plugin-dts" + "rollup-plugin-esbuild" + "rollup-plugin-typescript2" + "typedoc" + "typescript" + "vitest")))) + (add-after 'delete-dependencies 'patch-build-script + (lambda args + (define esbuild + "esbuild --bundle --platform=node") + (define new-build-script + (string-append + esbuild + " --format=cjs --outfile=dist/cjs/index.cjs src/index.ts" + " && " + esbuild + " --format=esm --outfile=dist/index.js src/index.ts")) + (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)))))))))) + (home-page "https://npmjs.com/is-what") + (synopsis "Type predicate functions for JavaScript") + (description "This package provides simple and small type predicate +functions for JavaScript, such as @code{isString}, @code{isDate}, and +@code{isPlainObject}.") + (license license:expat))) -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Thu Nov 16 14:16:45 2023 Received: (at 67019) by debbugs.gnu.org; 16 Nov 2023 19:16:46 +0000 Received: from localhost ([127.0.0.1]:44540 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1r3hr2-0003j3-So for submit@debbugs.gnu.org; Thu, 16 Nov 2023 14:16:45 -0500 Received: from out4-smtp.messagingengine.com ([66.111.4.28]:50323) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1r3hqz-0003i7-Hm for 67019@debbugs.gnu.org; Thu, 16 Nov 2023 14:16:41 -0500 Received: from compute5.internal (compute5.nyi.internal [10.202.2.45]) by mailout.nyi.internal (Postfix) with ESMTP id 998025C00A7; Thu, 16 Nov 2023 14:16:36 -0500 (EST) Received: from mailfrontend1 ([10.202.2.162]) by compute5.internal (MEProxy); Thu, 16 Nov 2023 14:16:36 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= philipmcgrath.com; h=cc:cc:content-transfer-encoding :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=1700162196; x=1700248596; bh=wTfCkR6nx9 494RMShtidiWRHC466SgApjQMOOyLBocE=; b=YHTINx5ikPTnZ77/DPYCDGESyz VqEh1vwf1HFeyHSs5/ShnqguT6NNzVhKozYRsX3C3jaNGEuJPV0HpuoHt6WguIUP faiQl1BKPuY3X9rKCMqCpSjrFnqIk3BSotocExI/1SFpTpbuiW7FMC+XMtUCCQ40 5k3MuNA3lq8sSbkQNGL1tYZrd6a/hc+xrUXef/iO+wdvk7rsFFNLfQWN3R6eCQmP //1GC/UloRuC5fjAzP3wi7ufP1KyRfM+2Xz4K7aXdOYYDhrfyT9CsV5IVzJxwqBL HWPPlSY+KVF576iiSmdNc4OJWG/NqpR66QZpXPDI9Ew9altk8M6xDDEeszKQ== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:cc:content-transfer-encoding :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=1700162196; x= 1700248596; bh=wTfCkR6nx9494RMShtidiWRHC466SgApjQMOOyLBocE=; b=v Tk6ODXQf8AHwGUrA/M/ubvcxaVXTraKezOFJPKlTcpvRjNGTw/M2Bgmt4U9fGB4b tE7vpqFMf6Y7xNbT55Dm9CGilBpmSX8yv2EfS085HVEzH0DWFAMvJoaQMstNGsIA 2/Qp6xxipfL/wJa7PXDd1KIEFLAphbYzX2Flw4oGjE4FcOfPQvUAxzoH0eB9+Ia2 KrCiDt6ijdzLKcaJDxmq4WYDjmVPRjeTgIBirMcTCJNbeHvZ5Bz6yV26KnzQ7RSp +6QDo82inkjOVcAUe42P1uRcd5XubHmBkDAHMOvSTv4u0AoqL5NGtCrcrpeW7c5J cMhhdaGOKLIxwFvzkGvTw== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvkedrudefkedguddvtdcutefuodetggdotefrod ftvfcurfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfgh necuuegrihhlohhuthemuceftddtnecusecvtfgvtghiphhivghnthhsucdlqddutddtmd enucfjughrpefhvfevufffkffojghfggfgsedtkeertdertddtnecuhfhrohhmpefrhhhi lhhiphcuofgtifhrrghthhcuoehphhhilhhiphesphhhihhlihhpmhgtghhrrghthhdrtg homheqnecuggftrfgrthhtvghrnhepgfevgfeljeekgefhgeeigfdvhfeukefgvdduieeg tdetvdfhvdffjeeggfduffeknecuffhomhgrihhnpehgihhthhhusgdrtghomhdpnhhpmh hjshdrtghomhenucevlhhushhtvghrufhiiigvpedtnecurfgrrhgrmhepmhgrihhlfhhr ohhmpehphhhilhhiphesphhhihhlihhpmhgtghhrrghthhdrtghomh X-ME-Proxy: Feedback-ID: i2b1146f3:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Thu, 16 Nov 2023 14:16:35 -0500 (EST) From: Philip McGrath To: 67019@debbugs.gnu.org Subject: [PATCH v2 02/16] gnu: Add node-copy-anything. Date: Thu, 16 Nov 2023 14:15:40 -0500 Message-ID: <5bfba55639dc6d855faf260358c25c37aa34b3de.1700161584.git.philip@philipmcgrath.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 67019 Cc: Philip McGrath , Liliana Marie Prikler X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) * gnu/packages/node-xyz.scm (node-copy-anything): New variable. --- gnu/packages/node-xyz.scm | 81 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 81 insertions(+) diff --git a/gnu/packages/node-xyz.scm b/gnu/packages/node-xyz.scm index 49760ded2b..ee96dee767 100644 --- a/gnu/packages/node-xyz.scm +++ b/gnu/packages/node-xyz.scm @@ -1712,3 +1712,84 @@ (define-public node-is-what functions for JavaScript, such as @code{isString}, @code{isDate}, and @code{isPlainObject}.") (license license:expat))) + +(define-public node-copy-anything + (package + (name "node-copy-anything") + (version "3.0.5") + (source + (origin (method git-fetch) + (uri (git-reference + (url "https://github.com/mesqueeb/copy-anything") + (commit (string-append "v" version)))) + (sha256 + (base32 "1lpjqanjl04k088banpns4yvp6hgf97snaj7gfbfancjpd3i8gk6")) + (snippet + #~(for-each delete-file + '("dist/cjs/index.cjs" + "dist/index.js"))) + (file-name (git-file-name name version)))) + (build-system node-build-system) + (native-inputs (list esbuild)) + (inputs (list node-is-what)) + (arguments + (list + #:tests? #f ; needs more dependencies + #:modules + `((guix build node-build-system) + (ice-9 match) + (guix build utils)) + #:phases + #~(modify-phases %standard-phases + (add-after 'patch-dependencies 'delete-dependencies + (lambda args + (delete-dependencies + '(;; devDependencies + "@typescript-eslint/eslint-plugin" + "@typescript-eslint/parser" + "del-cli" + "eslint" + "eslint-config-prettier" + "eslint-plugin-tree-shaking" + "np" + "prettier" + "rollup" + "rollup-plugin-dts" + "rollup-plugin-esbuild" + "rollup-plugin-typescript2" + "typescript" + "vitest")))) + (add-after 'delete-dependencies 'patch-build-script + (lambda args + (define esbuild + "esbuild --bundle --platform=node --external:is-what") + (define new-build-script + (string-append + esbuild + " --format=cjs --outfile=dist/cjs/index.cjs src/index.ts" + " && " + esbuild + " --format=esm --outfile=dist/index.js src/index.ts")) + (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)))))))))) + (home-page "https://npmjs.com/copy-anything") + (synopsis "JavaScript library for copying objects and arrays") + (description "This library provides deep copying for JavaScript objects +and arrays. Its design emphasizes speed, simplicity, and correctness in the +face of complications like special objects, symbols, and non-enumerable +properties.") + (license license:expat))) -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Thu Nov 16 14:16:47 2023 Received: (at 67019) by debbugs.gnu.org; 16 Nov 2023 19:16:47 +0000 Received: from localhost ([127.0.0.1]:44548 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1r3hr3-0003jN-RO for submit@debbugs.gnu.org; Thu, 16 Nov 2023 14:16:47 -0500 Received: from out4-smtp.messagingengine.com ([66.111.4.28]:49843) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1r3hr0-0003i9-D2 for 67019@debbugs.gnu.org; Thu, 16 Nov 2023 14:16:43 -0500 Received: from compute1.internal (compute1.nyi.internal [10.202.2.41]) by mailout.nyi.internal (Postfix) with ESMTP id 763D85C01DC; Thu, 16 Nov 2023 14:16:37 -0500 (EST) Received: from mailfrontend1 ([10.202.2.162]) by compute1.internal (MEProxy); Thu, 16 Nov 2023 14:16:37 -0500 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=fm1; t=1700162197; x=1700248597; bh=Xv OdDLqITROSIaJCOiKqKZz7yf9S3X44B15JWjrJT20=; b=JhYAaRDghhdFWTa6IV BcL+qt6Gyj2u0t4xZSLPMV0biVHSzXAD5CQeTyZ8OtwYiUdP5RVCZfyRu3mCe8zP kkt/2N/dKau9U5jYxRaKBz0yTFY2EiY+jFcez3da+7i1xcXrnW0UaF5GhW7tWcub zHSjEboVYpSBD2hKWvwRnfee2s8Pbbz7uz6nWeDpEAHcYE5dVpl7GVbI3B2OppVf ObE8yX0q7DccQNHN9fNxsECookk90K1QzuR71VxIzkTff9ZvseR353VplwTz4lGK 4d0r8jckdV2HEQgJD2JZSWkVVocVdXJG9JXSRVOt/MJV9BJfnxM8XEkTpOhi6TIc AGoQ== 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=fm1; t= 1700162197; x=1700248597; bh=XvOdDLqITROSIaJCOiKqKZz7yf9S3X44B15 JWjrJT20=; b=L1McXzZQiMmDvzfgNP1pfcwZZYSpo8eW4jKOPg2Ti5I2LytWzoN 8hCFtjm0BoDdae+dBDRZ38ErYAj3Unu46j7I0nFBjPWuIcMSnXMW1tHDqICdNLqx QqEZXOMvOi5L8xxj2IecalVs2DfLEjcLBM3b8daiLAEEFfABB6hMVzeS3Pd3Hojb X2Hy4L66ADepG4wL4YeL1Alkxrln7Tz+N2AutIwoUnnIiDvxMW/KeA7kPsVVU23f ezewgRPLgHd/dOP/mpET7ghCkIBNxxSZ1kGhJMHLNnucP2MNLovXEDu8/wLVax2k LnYs5K4mqQtYdSYP75ltguf8urqwW9R1mMg== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvkedrudefkedguddvtdcutefuodetggdotefrod ftvfcurfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfgh necuuegrihhlohhuthemuceftddtnecusecvtfgvtghiphhivghnthhsucdlqddutddtmd enucfjughrpefhvfevufffkffojghfgggtgfesthekredtredtjeenucfhrhhomheprfhh ihhlihhpucfotgfirhgrthhhuceophhhihhlihhpsehphhhilhhiphhmtghgrhgrthhhrd gtohhmqeenucggtffrrghtthgvrhhnpefhgfekhfdtgfeitdetuefhvedvteefvdevuddt kefgvdevhfekveejuefgfeekheenucffohhmrghinhepghhithhhuhgsrdgtohhmpdhlvg hsshgtshhsrdhorhhgnecuvehluhhsthgvrhfuihiivgeptdenucfrrghrrghmpehmrghi lhhfrhhomhepphhhihhlihhpsehphhhilhhiphhmtghgrhgrthhhrdgtohhm X-ME-Proxy: Feedback-ID: i2b1146f3:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Thu, 16 Nov 2023 14:16:36 -0500 (EST) From: Philip McGrath To: 67019@debbugs.gnu.org Subject: [PATCH v2 03/16] gnu: Add lessc. Date: Thu, 16 Nov 2023 14:15:41 -0500 Message-ID: <83a3e16cf7d86bb07f6cf728acf3872dcae604dc.1700161584.git.philip@philipmcgrath.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: References: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 67019 Cc: Philip McGrath , Liliana Marie Prikler X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) * gnu/packages/web.scm (lessc): New variable. --- gnu/packages/web.scm | 183 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 183 insertions(+) diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index 389f7d1375..9efc6ebc9d 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -65,6 +65,7 @@ ;;; Copyright © 2023 Christopher Howard ;;; Copyright © 2023 Felix Lechner ;;; Copyright © 2023 Evgeny Pisemsky +;;; Copyright © 2023 Philip McGrath ;;; ;;; This file is part of GNU Guix. ;;; @@ -99,6 +100,7 @@ (define-module (gnu packages web) #:use-module (guix build-system gnu) #:use-module (guix build-system go) #:use-module (guix build-system meson) + #:use-module (guix build-system node) #:use-module (guix build-system perl) #:use-module (guix build-system pyproject) #:use-module (guix build-system python) @@ -169,6 +171,7 @@ (define-module (gnu packages web) #:use-module (gnu packages ncurses) #:use-module (gnu packages networking) #:use-module (gnu packages node) + #:use-module (gnu packages node-xyz) #:use-module (gnu packages nss) #:use-module (gnu packages openldap) #:use-module (gnu packages openstack) @@ -2344,6 +2347,186 @@ (define-public sassc/libsass-3.5 "0830pjcvhzxh6yixj82x5k5r1xnadjqzi16kp53213icbly0r9ma"))))))) (properties '((hidden? . #t))))) +(define-public lessc + (package + (name "lessc") + (version "4.2.0") + (source + (origin (method git-fetch) + (uri (git-reference + (url "https://github.com/less/less.js") + (commit (string-append "v" version)))) + (sha256 + (base32 "1b6anlafk7lnayxy3vhsi474jcdah2ffaw2qyac5s2ibxb1wmr54")) + (snippet + #~(begin + (use-modules (guix build utils)) + (delete-file-recursively "packages/less/dist"))) + (file-name (git-file-name name version)))) + (build-system node-build-system) + (native-inputs (list esbuild)) + (inputs (list node-copy-anything)) + (arguments + (list + #:tests? #f ; many more dependencies + #:modules + `((guix build node-build-system) + (ice-9 match) + (guix build utils)) + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'chdir + (lambda args + (chdir "packages/less"))) + (add-after 'patch-dependencies 'delete-dependencies + (lambda args + (delete-dependencies + '(;; dependencies + "parse-node-version" ; patched out + "tslib" ; probably not needed w/ esbuild + ;; devDependencies + "@less/test-data" + "@less/test-import-module" + "@rollup/plugin-commonjs" + "@rollup/plugin-json" + "@rollup/plugin-node-resolve" + "@typescript-eslint/eslint-plugin" + "@typescript-eslint/parser" + "benny" + "bootstrap-less-port" + "chai" + "cross-env" + "diff" + "eslint" + "fs-extra" + "git-rev" + "globby" + "grunt" + "grunt-cli" + "grunt-contrib-clean" + "grunt-contrib-connect" + "grunt-eslint" + "grunt-saucelabs" + "grunt-shell" + "html-template-tag" + "jit-grunt" + "less-plugin-autoprefix" + "less-plugin-clean-css" + "minimist" + "mocha" + "mocha-headless-chrome" + "mocha-teamcity-reporter" + "nock" + "npm-run-all" + "performance-now" + "phin" + "promise" + "read-glob" + "resolve" + "rollup" + "rollup-plugin-terser" + "rollup-plugin-typescript2" + "semver" + "shx" + "time-grunt" + "ts-node" + "typescript" + "uikit" + ;; optionalDependencies + "errno" + "graceful-fs" + "image-size" + "make-dir" + "mime" + "needle" + "source-map")))) + (add-after 'delete-dependencies 'avoid-parse-node-version + (lambda args + (define version + #$(package-version this-package)) + (substitute* "src/less/index.js" + (("import [{] version [}]" orig) + (string-append "// " orig)) + (("import parseVersion from 'parse-node-version';" orig) + (string-append "// " orig)) + (("const v = parseVersion[(]`v\\$[{]version[}]`[)];" orig) + (string-append "// " orig)) + (("(version: )(\\[v\\.major, v\\.minor, v\\.patch],)" _ lhs rhs) + (string-append + lhs + "[" + (string-join + (list-head (string-split + version (char-set-complement char-set:digit)) + 3) + ", ") + "], // " + rhs))))) + (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) + `("compilerOptions" @ ,@(delete '("target" . "ES5") + 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))))))) + (add-after 'build 'build-browser + (lambda args + (invoke "esbuild" + "--bundle" + "--platform=browser" + "--format=cjs" + "--outfile=dist/less.js" + "src/less-browser/bootstrap.js") + (invoke "esbuild" + "--bundle" + "--minify" + "--sourcemap" + "--platform=browser" + "--format=cjs" + "--outfile=dist/less.min.js" + "src/less-browser/bootstrap.js")))))) + (home-page "https://lesscss.org") + (synopsis "Compiler for @acronym{Less} @acronym{CSS} language extension") + ;; XXX: @abbr{} seems better for Less (which is always capitalized that + ;; way), but it is rejected as invalid Texinfo markup here. + (description "@acronym{Less, Leaner Style Sheets} is a +backwards-compatible language extension for @acronym{CSS}. This package +provides @command{lessc}, which compiles Less files to plain @acronym{CSS}.") + (license license:asl2.0))) + (define-public perl-apache-logformat-compiler (package -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Thu Nov 16 14:16:48 2023 Received: (at 67019) by debbugs.gnu.org; 16 Nov 2023 19:16:48 +0000 Received: from localhost ([127.0.0.1]:44562 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1r3hr5-0003jk-7A for submit@debbugs.gnu.org; Thu, 16 Nov 2023 14:16:48 -0500 Received: from out4-smtp.messagingengine.com ([66.111.4.28]:60411) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1r3hr1-0003iG-BP for 67019@debbugs.gnu.org; Thu, 16 Nov 2023 14:16:44 -0500 Received: from compute5.internal (compute5.nyi.internal [10.202.2.45]) by mailout.nyi.internal (Postfix) with ESMTP id 4DCED5C0176; Thu, 16 Nov 2023 14:16:38 -0500 (EST) Received: from mailfrontend1 ([10.202.2.162]) by compute5.internal (MEProxy); Thu, 16 Nov 2023 14:16:38 -0500 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=fm1; t=1700162198; x=1700248598; bh=Q1 91TlGayI1CczNXYQ0pMNiFs4iKQfeHjS5vyhHe1G4=; b=INNclnv8qydo8SI4Bc ZALb3zxgUmC+Ilc9/ELq0Bs+0jxmpVEj2k4zo76PFu0hR6SN/BpdD6UC64Usfv8j alHuNAzope6nuIWxVGExrZY5GzeE2m1z+/WhAK9zAPiYbaTJyBxoB3dFTPylibPd Nq1dNwGOo+U2KMCMH/DIALRDGYm8900uZHHDnoCh4F8vjcM4tELAx0BhYdb8Jje9 3xJtIYZUx1M40+rJ5xEwL6RX7IuKds3nzptJGGZWtGRpfI5ObhpmZNSjuwNl5I/M LYRhchIahniU6UBTbzoagkq7SSHiAltHFmrm7Z7eGG3p1TDXxIWeLF7qIDrMXaeN /RyA== 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=fm1; t= 1700162198; x=1700248598; bh=Q191TlGayI1CczNXYQ0pMNiFs4iKQfeHjS5 vyhHe1G4=; b=tWs9fDPR7jAdHtOu8svq1FUT+vip3M2QTlaPnpxiRdY4RxxQJca Q0jCLdQrKnP2hwolmn7Up0xkbBXODDDrx//yqbiEyOkfsGiqePv38msaKS4N217N H69NRxwr0fZRn2sSbDkZlCWu4TggTlgiPHNj1Lu/1LBOAq4mdeDb1XRkb6cSWHv4 2bRQDIToF/7/yV7sXUcX8Wlmn6taLfUZWBoUaIGOk7yqTba4SP3xvvCx38QvuLso GERMvmUtRC3Podj3UsHjDpAmZNvicIz81sA0aE5LMITO+fK2x54meRKFtFwslsbW oMXjhgszN6R9AAwQsy5Ai6nfl6EbFCobDFg== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvkedrudefkedguddvtdcutefuodetggdotefrod ftvfcurfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfgh necuuegrihhlohhuthemuceftddtnecusecvtfgvtghiphhivghnthhsucdlqddutddtmd enucfjughrpefhvfevufffkffojghfgggtgfesthekredtredtjeenucfhrhhomheprfhh ihhlihhpucfotgfirhgrthhhuceophhhihhlihhpsehphhhilhhiphhmtghgrhgrthhhrd gtohhmqeenucggtffrrghtthgvrhhnpeeggfeugfeftddvjefhtedtuedvudehheegvedv kefgleevffeftdfhhfekteegffenucffohhmrghinhepghhithhhuhgsrdgtohhmnecuve hluhhsthgvrhfuihiivgeptdenucfrrghrrghmpehmrghilhhfrhhomhepphhhihhlihhp sehphhhilhhiphhmtghgrhgrthhhrdgtohhm X-ME-Proxy: Feedback-ID: i2b1146f3:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Thu, 16 Nov 2023 14:16:37 -0500 (EST) From: Philip McGrath To: 67019@debbugs.gnu.org Subject: [PATCH v2 04/16] gnu: Add ocaml-wtf8. Date: Thu, 16 Nov 2023 14:15:42 -0500 Message-ID: X-Mailer: git-send-email 2.41.0 In-Reply-To: References: MIME-Version: 1.0 X-Debbugs-Cc: Julien Lepiller , pukkamustard Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 67019 Cc: Philip McGrath , Liliana Marie Prikler X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) * gnu/packages/ocaml.scm (ocaml-wtf8): New variable. --- gnu/packages/ocaml.scm | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index 7993dbaa73..50b0d1ddb7 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -29,6 +29,7 @@ ;;; Copyright © 2022 Garek Dyszel ;;; Copyright © 2023 Csepp ;;; Copyright © 2023 Foundation Devices, Inc. +;;; Copyright © 2023 Philip McGrath ;;; ;;; This file is part of GNU Guix. ;;; @@ -3655,6 +3656,30 @@ (define-public ocaml-uutf string values and to directly encode characters in OCaml Buffer.t values.") (license license:isc))) +(define-public ocaml-wtf8 + (package + (name "ocaml-wtf8") + (version "1.0.2") + (source (origin + (method url-fetch) + (uri (string-append + "https://github.com/flow/ocaml-wtf8/releases/download/" + "v" version "/wtf8-v" version ".tbz")) + (sha256 + (base32 + "09ygcxxd5warkdzz17rgpidrd0pg14cy2svvnvy1hna080lzg7vp")))) + (build-system dune-build-system) + (home-page "https://github.com/flow/ocaml-wtf8") + (synopsis "OCaml encoder and decoder for @acronym{WTF-8}") + (description + "This library provides an OCaml encoder and decoder for @acronym{WTF-8, +Wobbly Transformation Format---8 bit}, a superset of UTF-8 that allows +unpaired surrogates while preserving the other well-formedness constraints of +UTF-8. This format is useful for interoperating with systems that use +potentially ill-formed UTF-16, notably including ECMAScript strings and +Windows filesystems.") + (license license:expat))) + (define-public ocaml-uunf (package (name "ocaml-uunf") -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Thu Nov 16 14:16:49 2023 Received: (at 67019) by debbugs.gnu.org; 16 Nov 2023 19:16:49 +0000 Received: from localhost ([127.0.0.1]:44570 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1r3hr6-0003k2-7Q for submit@debbugs.gnu.org; Thu, 16 Nov 2023 14:16:49 -0500 Received: from out4-smtp.messagingengine.com ([66.111.4.28]:52651) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1r3hr2-0003iM-3y for 67019@debbugs.gnu.org; Thu, 16 Nov 2023 14:16:44 -0500 Received: from compute3.internal (compute3.nyi.internal [10.202.2.43]) by mailout.nyi.internal (Postfix) with ESMTP id 30F175C01D3; Thu, 16 Nov 2023 14:16:39 -0500 (EST) Received: from mailfrontend1 ([10.202.2.162]) by compute3.internal (MEProxy); Thu, 16 Nov 2023 14:16:39 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= philipmcgrath.com; h=cc:cc:content-transfer-encoding :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=1700162199; x=1700248599; bh=QvgChRQ5Cl uj4mlf8xoUQBN/Lo8HstlmvjAE0E2Cjdo=; b=vo0GJpy8lizH1ZRGND5Ud5ADoS bCE4yWf/dRvCAzI1lB47rCkgQjxxhQjbx5cLt4AIUjLpnJ2IE8d0b/l/BLX8plTN Oh0N4VZW9tYsyb841mggmEcCv1EnalXiVrYN9KfYZzlKojjcSlN/GrBlOpsKqqiI HHfOHjqEpBEPIIjXhEq7KCBu2Z2cTbDu95EBjZzToaE/fa+YEEolPe+irLsCZ1ha k7BTLfgG90fh31bHEqYtUxjV+Z1i83luPrK0ujMqAs0MOPp9sJ8eI2UR1EK6iMLj wXK56vikb7qEmcjvYCjP5S9LbiRcpuA2XVdKSia5bO4M33mgNcKLD/BmYw0A== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:cc:content-transfer-encoding :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=1700162199; x= 1700248599; bh=QvgChRQ5Cluj4mlf8xoUQBN/Lo8HstlmvjAE0E2Cjdo=; b=Q iN2D2eNLVUcLb8e33td8UgP8d5VQxOuRo6VytDc8vsGGqT2vYL6ob80fc9XHEFsj 6eWT34bfrKIEAl3cf8b+xwxx8ntuK9tlgmgIbcswVkoZQ4W9fAK2VK8HTdgaNODA /Rf6YN/Lj/f5BgROj8mVI6bZvjv0ugIzNa7chXq/FANvmTTNQXfXWvQqsR/ExxDa 9rChynBp3sly0jSczECoiAVXmEI0ffLbk4ByqgIWeF4WqyrFvwDqMB+qZrPgavDt eP//90cMOQOcx5muALEOrso838Sv08jhSxYvufvxnaiI8TzpVZplD8klPR6UlC04 ZykIZedJEGuVD8MRRHKdw== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvkedrudefkedguddvtdcutefuodetggdotefrod ftvfcurfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfgh necuuegrihhlohhuthemuceftddtnecusecvtfgvtghiphhivghnthhsucdlqddutddtmd enucfjughrpefhvfevufffkffojghfggfgsedtkeertdertddtnecuhfhrohhmpefrhhhi lhhiphcuofgtifhrrghthhcuoehphhhilhhiphesphhhihhlihhpmhgtghhrrghthhdrtg homheqnecuggftrfgrthhtvghrnhepledtteevudeuueduheefheeuieehudekiefgtddt tdelfeevveehhfejudelkeegnecuffhomhgrihhnpehinhhrihgrrdhfrhenucevlhhush htvghrufhiiigvpedtnecurfgrrhgrmhepmhgrihhlfhhrohhmpehphhhilhhiphesphhh ihhlihhpmhgtghhrrghthhdrtghomh X-ME-Proxy: Feedback-ID: i2b1146f3:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Thu, 16 Nov 2023 14:16:38 -0500 (EST) From: Philip McGrath To: 67019@debbugs.gnu.org Subject: [PATCH v2 05/16] gnu: Add ocaml-visitors. Date: Thu, 16 Nov 2023 14:15:43 -0500 Message-ID: X-Mailer: git-send-email 2.41.0 In-Reply-To: References: MIME-Version: 1.0 X-Debbugs-Cc: Julien Lepiller , pukkamustard Content-Transfer-Encoding: 8bit X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 67019 Cc: Philip McGrath , Liliana Marie Prikler X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) * gnu/packages/ocaml.scm (ocaml-visitors): New variable. --- gnu/packages/ocaml.scm | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index 50b0d1ddb7..f9a3932d18 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -5232,6 +5232,28 @@ (define-public ocaml-graph (description "OCamlgraph is a generic graph library for OCaml.") (license license:lgpl2.1))) +(define-public ocaml-visitors + (package + (name "ocaml-visitors") + (version "20210608") + (source (origin + (method url-fetch) + (uri + (string-append "https://gitlab.inria.fr/fpottier/visitors/-/" + "archive/" version "/archive.tar.gz")) + (sha256 + (base32 + "1yx4bjw4yw3zi35yfp66x320xgb9f8jh7rqj1j7hrrvn0f60m2y2")))) + (build-system dune-build-system) + (propagated-inputs (list ocaml-ppxlib ocaml-ppx-deriving ocaml-result)) + (home-page "https://gitlab.inria.fr/fpottier/visitors") + (synopsis "OCaml syntax extension for generating visitor classes") + (description + "This package provides an OCaml syntax extension that automatically +generates object-oriented visitors for traversing and transforming data +structures.") + (license license:lgpl2.1))) + (define-public ocaml-piqi (package (name "ocaml-piqi") -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Thu Nov 16 14:16:52 2023 Received: (at 67019) by debbugs.gnu.org; 16 Nov 2023 19:16:52 +0000 Received: from localhost ([127.0.0.1]:44578 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1r3hr7-0003kG-2G for submit@debbugs.gnu.org; Thu, 16 Nov 2023 14:16:52 -0500 Received: from out4-smtp.messagingengine.com ([66.111.4.28]:60411) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1r3hr2-0003iG-DD for 67019@debbugs.gnu.org; Thu, 16 Nov 2023 14:16:45 -0500 Received: from compute2.internal (compute2.nyi.internal [10.202.2.46]) by mailout.nyi.internal (Postfix) with ESMTP id 7F6455C016D; Thu, 16 Nov 2023 14:16:44 -0500 (EST) Received: from mailfrontend1 ([10.202.2.162]) by compute2.internal (MEProxy); Thu, 16 Nov 2023 14:16:44 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= philipmcgrath.com; h=cc:cc:content-transfer-encoding :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=1700162204; x=1700248604; bh=uBxMIl98z1 QafFPnCZo1QGRCcJxaB99KsSJeQmDtnug=; b=ic6f5CHeJqHBv/ba1wOnG1bA3m /c9v1Cj4E6e6qFumlzAvd9Fqw1y3EEg/+W7kNzx3/Q6wTO1D9ValNoRxdtYzoBCb 35j99dDbhJ9U7+UVK1nT8chk4qkjDrn1S5yvjkHLzrU/AtckXYp+RFdzYKIsbEzw 2mh+3V3abl7fqjA/FzKqYKXHLRrOxTaksbyMyVl+DUpj30Og636EQmFzNOefbsse tv3yL18DtH/aiuxkoaTA65tQGfSw42Zd6WeMmDN3WH7OL5bLuxpIonBWrqgSfsMS pyTgrvjK6+u8Gk0Qu7oYl4yB5e8ABDYpmveG8XrK99OqjHfemPYtmaKsB5bQ== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:cc:content-transfer-encoding :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=1700162204; x= 1700248604; bh=uBxMIl98z1QafFPnCZo1QGRCcJxaB99KsSJeQmDtnug=; b=I 7XjIU/wIlifIwouSkOOH1kMOA4aZRwx+UFMVO/qQk1ebGirrndMjEFOyVmL9qAoq 45AaWfVWu9wqDctpAPUcmYN2DXztYCcdb1FZeDP1wSep/tJDGJ1e8x2+CSV2/27Y c+INtO5mtmmAKq5CT8buOYYDDzb5RBcCGAaIbhO03Epu2TCCfDVaXmkYoGYzoHRt nPLh99srVD0u579zpJnIpxxr2pVKDn37/uOhEBCFt33rNUfwXZhvl799dlCBkIve XNRIhP2Z9CyxYyHTdkwnRVgTwoHC9d5/f7+8SotU9CgrcKCq0hVFwH/65pz/CQWC CwaqHbf2frtsvlZgDjPYQ== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvkedrudefkedguddvtdcutefuodetggdotefrod ftvfcurfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfgh necuuegrihhlohhuthemuceftddtnecusecvtfgvtghiphhivghnthhsucdlqddutddtmd enucfjughrpefhvfevufffkffojghfggfgsedtkeertdertddtnecuhfhrohhmpefrhhhi lhhiphcuofgtifhrrghthhcuoehphhhilhhiphesphhhihhlihhpmhgtghhrrghthhdrtg homheqnecuggftrfgrthhtvghrnhepgffhgfffjeegudejvddvgedvheefveehvdffuedu udeivdfhgeeileehvdfhfeefnecuvehluhhsthgvrhfuihiivgeptdenucfrrghrrghmpe hmrghilhhfrhhomhepphhhihhlihhpsehphhhilhhiphhmtghgrhgrthhhrdgtohhm X-ME-Proxy: Feedback-ID: i2b1146f3:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Thu, 16 Nov 2023 14:16:43 -0500 (EST) From: Philip McGrath To: 67019@debbugs.gnu.org Subject: [PATCH v2 11/16] gnu: Add flow-remove-types. Date: Thu, 16 Nov 2023 14:15:49 -0500 Message-ID: <875d54cc655b21a748fbf0e981642475ddd94bde.1700161584.git.philip@philipmcgrath.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 67019 Cc: Philip McGrath , Liliana Marie Prikler X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) * gnu/packages/web.scm (flow-remove-types): New variable. --- gnu/packages/web.scm | 60 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 60 insertions(+) diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index b8646e9d0d..f5afb453f9 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -2076,6 +2076,66 @@ (define-public node-flow-parser provides the Flow parser in its compiled-to-JavaScript form for use with Node.js and NPM."))) +(define-public flow-remove-types + (package + (inherit node-flow-parser) + (name "flow-remove-types") + (inputs (list node-flow-parser node-vlq)) + (arguments + (list + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'delete-workspace-file + (lambda args + ;; this workspace file causes NPM to try to install dependencies + ;; of other packages developed in this source repository + (delete-file "package.json"))) + (add-after 'delete-workspace-file 'chdir + (lambda args + (chdir "packages/flow-remove-types"))) + (add-after 'patch-dependencies 'delete-dependencies + (lambda args + (delete-dependencies '("pirates")))) + (add-after 'delete-dependencies 'remove-unsupported-features + (lambda args + (delete-file "register.js") + (with-output-to-file "register.js" + (lambda () + (for-each + display + '("console.warn('flow-remove-types/register.js does not add" + " a require hook on Guix');\n" + "module.exports =" + " function setOptions(newOptions) {};\n")))) + (substitute* "flow-node" + (("var flowRemoveTypes") + (string-append + "process.stderr.write('flow-node: not yet supported" + " on Guix');\n" + "return process.exit(1);\n" + "var flowRemoveTypes"))) + (substitute* "test.sh" + (("echo \"Test: node require hook\"") + "echo \"SKIPPING Test: node require hook\"") + (("RES=\\$[(]node -e 'require[(]\"\\./register\"[)];") + "RES=42 # ") + (("echo \"Test: flow-node\"") + "echo \"SKIPPING Test: flow-node\"") + (("FLOW_NODE=") + "FLOW_NODE=42 # ") + (("echo \"Test: flow-node with options\"") + "echo \"SKIPPING Test: flow-node with options\"") + (("FLOW_NODE_OPTS=") + "FLOW_NODE_OPTS=4 # "))))))) + (synopsis "Utility to erase Flow type annotations from JavaScript") + (description "Flow is a gradual type system for JavaScript. This package +provides @command{flow-remove-types}, a command-line tool that erases Flow +type annotations, producing standard JavaScript files. The functionality is +also provided as a JavaScript library. + +Note that the Guix package does not yet support the @command{flow-node} +command or the Node.js require hook for interactive development."))) + (define-public tinyproxy (package (name "tinyproxy") -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Thu Nov 16 14:17:08 2023 Received: (at 67019) by debbugs.gnu.org; 16 Nov 2023 19:17:08 +0000 Received: from localhost ([127.0.0.1]:44585 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1r3hrP-0003m6-S2 for submit@debbugs.gnu.org; Thu, 16 Nov 2023 14:17:08 -0500 Received: from out4-smtp.messagingengine.com ([66.111.4.28]:38383) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1r3hr2-0003iQ-Tk for 67019@debbugs.gnu.org; Thu, 16 Nov 2023 14:16:45 -0500 Received: from compute1.internal (compute1.nyi.internal [10.202.2.41]) by mailout.nyi.internal (Postfix) with ESMTP id 00F7B5C00D1; Thu, 16 Nov 2023 14:16:40 -0500 (EST) Received: from mailfrontend1 ([10.202.2.162]) by compute1.internal (MEProxy); Thu, 16 Nov 2023 14:16:39 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= philipmcgrath.com; h=cc:cc:content-transfer-encoding :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=1700162199; x=1700248599; bh=uBPGilGjd9 Aw7cXVuG4eXD+LGRM9MnxL+qpQY+GT7EU=; b=Dwcu19gb0mQSzaFDyMCfy1smw0 AC9PHJuiK+TPpmLeadtu65V2Obd60dVyY3mfxcKSLmmZcHc8ZvBOIlfpik2EHIPA HngAYgztt34BFj0ju/dag772NG2mMprXDkM0WyaAvnF0mbh+TWKmgZPaFCCq8Dvc 4kpInicgacRoHsr9Re4FBBmzchf05OoKhHLWrtnwG0YiiHLyMujPgu9hLg6xeK2o oUj0a5Sr5UcnuMVKAKS25+K/6+8nugN+zOAQ22olLVLiJF9jpEuoPFP5lar011Ha YZ813kCzdh5GfEWXt+27uoEWvZRBfct7X4kJGEWcOqIHrCsVOWea6CDWKJEw== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:cc:content-transfer-encoding :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=1700162199; x= 1700248599; bh=uBPGilGjd9Aw7cXVuG4eXD+LGRM9MnxL+qpQY+GT7EU=; b=o w6vdEt8iazzHLTb66UbRI080Wn1xapcJNVeJGG57spZhmlyZe1LR7SB64wTgeVVf xyJlQ/W+pF6uskS2zayyaQulnPe0AwmG3/LtfwOfaU/3sfOStlpnMQw/7vQHVuhV qhs8InHtGKtKkqhQV7luJBepzetzqQRboQRJPUB3dIHcsCZ3q4ZHHiyDeO/LxTau VE471JfGyKeBSOs+kAV6woOqOc9+/NlkIn0w7WBBQ+Z4bUsQzriyfkzVNV8qSkGA AQscRp52IvF4MxX7iLr/zVRBYMPb8jQVzS7epsFVY80r5rLj8et/tLfiig5lGT6D vJ0QqyxQkjTLqszNqqnTg== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvkedrudefkedguddvtdcutefuodetggdotefrod ftvfcurfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfgh necuuegrihhlohhuthemuceftddtnecusecvtfgvtghiphhivghnthhsucdlqddutddtmd enucfjughrpefhvfevufffkffojghfggfgsedtkeertdertddtnecuhfhrohhmpefrhhhi lhhiphcuofgtifhrrghthhcuoehphhhilhhiphesphhhihhlihhpmhgtghhrrghthhdrtg homheqnecuggftrfgrthhtvghrnhepudehvdefjeetfffffeektdehtdetudfhtdfhuddt ueeukefhveehhfehvdfhheffnecuffhomhgrihhnpehgihhthhhusgdrtghomhenucevlh hushhtvghrufhiiigvpedtnecurfgrrhgrmhepmhgrihhlfhhrohhmpehphhhilhhiphes phhhihhlihhpmhgtghhrrghthhdrtghomh X-ME-Proxy: Feedback-ID: i2b1146f3:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Thu, 16 Nov 2023 14:16:39 -0500 (EST) From: Philip McGrath To: 67019@debbugs.gnu.org Subject: [PATCH v2 06/16] gnu: Add ocaml-ppx-gen-rec. Date: Thu, 16 Nov 2023 14:15:44 -0500 Message-ID: X-Mailer: git-send-email 2.41.0 In-Reply-To: References: MIME-Version: 1.0 X-Debbugs-Cc: Julien Lepiller , pukkamustard Content-Transfer-Encoding: 8bit X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 67019 Cc: Philip McGrath , Liliana Marie Prikler X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) * gnu/packages/ocaml.scm (ocaml-ppx-gen-rec): New variable. --- gnu/packages/ocaml.scm | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index f9a3932d18..b12c12fad5 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -6722,6 +6722,34 @@ (define-public ocaml-ppx-deriving on type definitions, and a set of useful plugins for common tasks.") (license license:expat))) +(define-public ocaml-ppx-gen-rec + (package + (name "ocaml-ppx-gen-rec") + (version "2.0.0") + (source (origin + (method url-fetch) + (uri + (string-append "https://github.com/flow/ocaml-ppx_gen_rec/" + "releases/download/v" + version + "/ppx_gen_rec-v" version ".tbz")) + (sha256 + (base32 + "0ncy7ps0w3cnb3nk6y1j4v4g60rs500qwv1daw3a9n7n8kjj6qzy")))) + (build-system dune-build-system) + (propagated-inputs (list ocaml-ppxlib)) + (native-inputs (list ocaml-ppx-deriving)) + (properties `((upstream-name . "ppx_gen_rec"))) + (home-page "https://github.com/flow/ocaml-ppx_gen_rec") + (synopsis "Ppx rewriter for recursive module expressions") + (description + "This package provides a ppx rewriter that transforms a recursive module +expression into a struct. In a recursive module expression, the struct can be +derived from the signature automatically by the compiler. This package does +the same thing, but doing it this way allows @code{ppx_deriving} to transform +the signature and the struct separately.") + (license license:expat))) + (define-public ocaml-ppx-derivers (package (name "ocaml-ppx-derivers") -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Thu Nov 16 14:17:09 2023 Received: (at 67019) by debbugs.gnu.org; 16 Nov 2023 19:17:09 +0000 Received: from localhost ([127.0.0.1]:44587 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1r3hrQ-0003m9-Me for submit@debbugs.gnu.org; Thu, 16 Nov 2023 14:17:09 -0500 Received: from out4-smtp.messagingengine.com ([66.111.4.28]:52651) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1r3hr3-0003iM-4Q for 67019@debbugs.gnu.org; Thu, 16 Nov 2023 14:16:45 -0500 Received: from compute7.internal (compute7.nyi.internal [10.202.2.48]) by mailout.nyi.internal (Postfix) with ESMTP id 3C1885C0176; Thu, 16 Nov 2023 14:16:45 -0500 (EST) Received: from mailfrontend1 ([10.202.2.162]) by compute7.internal (MEProxy); Thu, 16 Nov 2023 14:16:45 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= philipmcgrath.com; h=cc:cc:content-transfer-encoding :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=1700162205; x=1700248605; bh=WvZE3V0PDo TMe5ixoooqikSD6F6YmOVB9KyBxE7of/k=; b=ET9W+fgkmz3DtC5Ny9cv6L6cpe 1P/CGO7dAY46qwRBoAktz96ChiIEtYDZKbtElz40AWQRdpLZh5eA4EiGs260o1Ed hwE0LQPJDCI99JqGnTOlXVpz9eJkH7BshYFnZLMTmF4c7boklaa0ouVKCSgIVTQV BLHrIj6Pbcpop2SuuEAr0tjydyCwIvk0YWQzFcJiL2YVobDQAMPbBNUH8GcDmPNQ 8HIvxgVrggN6TAkNNT+4XwUXS/nQLfvv7pk/io65n9Z9uynN2y3kL/GZzonUQtxA ZSUBUbrbwuLYtzlKfhV/3ebFYE9jrYmg7xBkzHqpxSOJWERtvix1p13ubYTA== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:cc:content-transfer-encoding :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=1700162205; x= 1700248605; bh=WvZE3V0PDoTMe5ixoooqikSD6F6YmOVB9KyBxE7of/k=; b=C 6IRUw4rh5dwpBYX2nDLPlY6rxz6cBwERq8jVvbGs+qb2XQLW+NJSv4Jhti4DvQJd /piprNygPUJmllcZcvHDCekQNT8LjvIUKqeCAxUSOkAnhKifrCSvXoXvXZsTdOgt 4Nork4PG6Uii03qobjmdY8wUx5VrwwQmqEQKfa+4IKQsI0PotC6M7+h0qovxnfcm rBdtcXiDSF9fLuawaSnarxcH4xECYQwqrCcwg6ACU6K5+sfghq4yqdCNHOc7UCuZ Z9ULNw5Hw5hfR+OMCrYE9ShBWEXcdoREoExU0ED2i7vpJyYAoYiW8z5wKWBd6OOV 9+kVrtAylokX7bydYuJdQ== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvkedrudefkedguddvtdcutefuodetggdotefrod ftvfcurfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfgh necuuegrihhlohhuthemuceftddtnecusecvtfgvtghiphhivghnthhsucdlqddutddtmd enucfjughrpefhvfevufffkffojghfggfgsedtkeertdertddtnecuhfhrohhmpefrhhhi lhhiphcuofgtifhrrghthhcuoehphhhilhhiphesphhhihhlihhpmhgtghhrrghthhdrtg homheqnecuggftrfgrthhtvghrnhepgffhgfffjeegudejvddvgedvheefveehvdffuedu udeivdfhgeeileehvdfhfeefnecuvehluhhsthgvrhfuihiivgeptdenucfrrghrrghmpe hmrghilhhfrhhomhepphhhihhlihhpsehphhhilhhiphhmtghgrhgrthhhrdgtohhm X-ME-Proxy: Feedback-ID: i2b1146f3:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Thu, 16 Nov 2023 14:16:44 -0500 (EST) From: Philip McGrath To: 67019@debbugs.gnu.org Subject: [PATCH v2 12/16] gnu: js-commander: Update to 11.1.0. Date: Thu, 16 Nov 2023 14:15:50 -0500 Message-ID: X-Mailer: git-send-email 2.41.0 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 67019 Cc: Philip McGrath , Liliana Marie Prikler X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) * gnu/packages/javascript.scm (js-commander): Update to 11.1.0. --- gnu/packages/javascript.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/javascript.scm b/gnu/packages/javascript.scm index e70aa7d7e1..c62b23a4c4 100644 --- a/gnu/packages/javascript.scm +++ b/gnu/packages/javascript.scm @@ -373,7 +373,7 @@ (define-public js-mathjax-for-r-mathjaxr (define-public js-commander (package (name "js-commander") - (version "6.2.1") + (version "11.1.0") (source (origin (method git-fetch) @@ -383,7 +383,7 @@ (define-public js-commander (file-name (git-file-name name version)) (sha256 (base32 - "126m25s6mxpxmdj4aw5awz06b47r8r798lcf1c5bnmmh39cik5i1")))) + "1xwh85kbxj76ni41r2h0apl8mjbfcnmxzzp3vlspq30w8kwfckni")))) (build-system trivial-build-system) (arguments `(#:modules ((guix build utils)) -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Thu Nov 16 14:17:09 2023 Received: (at 67019) by debbugs.gnu.org; 16 Nov 2023 19:17:09 +0000 Received: from localhost ([127.0.0.1]:44592 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1r3hrR-0003mJ-2f for submit@debbugs.gnu.org; Thu, 16 Nov 2023 14:17:09 -0500 Received: from out4-smtp.messagingengine.com ([66.111.4.28]:48699) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1r3hr4-0003iU-5s for 67019@debbugs.gnu.org; Thu, 16 Nov 2023 14:16:46 -0500 Received: from compute1.internal (compute1.nyi.internal [10.202.2.41]) by mailout.nyi.internal (Postfix) with ESMTP id D99095C0211; Thu, 16 Nov 2023 14:16:40 -0500 (EST) Received: from mailfrontend1 ([10.202.2.162]) by compute1.internal (MEProxy); Thu, 16 Nov 2023 14:16:40 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= philipmcgrath.com; h=cc:cc:content-transfer-encoding :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=1700162200; x=1700248600; bh=TyXto21Pr0 l88vZ+0tPI9VWoQSPznZA9OTS3c3MA20s=; b=wNIUjXpoB0Z6Lq/jSANh6b6fVV bWXx+udw3m9d7JY6H78TMhftlq6+o5xzBaG725mzs8a/RjgIxg2BGgcFmo6ogYUs EqrRZBKJnEZ07hkYQUTuNHnqmDgM2xLoP6+VP2GxF1a0hY0UglblQU/mvpM/lbdV QkmosJCD8aoVpmCiNWv4iQYRA+LZiCV6OFLCUofnWtO4NBJgwNMwhxzMyG0w1sb4 F0Jrqbq29jz2C6KPMfJuveRIlNnhEY7wGgjE19Ntv/8ZcLrMQgv81imsNs/79lEz +YSIWrcz+SEekEPnL7PGDpCn17V14crI94iC6PkwbRqgzrF5FWLI+6VVVjnA== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:cc:content-transfer-encoding :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=1700162200; x= 1700248600; bh=TyXto21Pr0l88vZ+0tPI9VWoQSPznZA9OTS3c3MA20s=; b=K RodDmIiW14ew2wmrl41wNla4fY9SGJ08eUQEXA0AU78BhQMmvDB0W0vBLwO1eKuO 2guTiKnJcz05nL07hSHHYcjYf48iYQ9kO4r3SCOmZrFZaysndy6cUj0mfWF4NRSM 8iI0rWKN2sS0ylZAINci3SQS5U9iIhpi5N00/DgM7d55anWnIxrTD0g8I0BA+HJp TTV5npGHZjqJ9Na2ZmEc28NjxYbQNQ3b2QbDh3ZvEyleqZZQ4ztIEdnugYIkh5HF cFtgZGGJXXq3Xi2CxcrpoGaiqFokeiEhXAj8pXvcTfw2tBp95B+nllAoBHihzdk4 Fy1ZSfWyooX/oQY+9mwig== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvkedrudefkedguddvtdcutefuodetggdotefrod ftvfcurfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfgh necuuegrihhlohhuthemuceftddtnecusecvtfgvtghiphhivghnthhsucdlqddutddtmd enucfjughrpefhvfevufffkffojghfggfgsedtkeertdertddtnecuhfhrohhmpefrhhhi lhhiphcuofgtifhrrghthhcuoehphhhilhhiphesphhhihhlihhpmhgtghhrrghthhdrtg homheqnecuggftrfgrthhtvghrnhepudehvdefjeetfffffeektdehtdetudfhtdfhuddt ueeukefhveehhfehvdfhheffnecuffhomhgrihhnpehgihhthhhusgdrtghomhenucevlh hushhtvghrufhiiigvpedtnecurfgrrhgrmhepmhgrihhlfhhrohhmpehphhhilhhiphes phhhihhlihhpmhgtghhrrghthhdrtghomh X-ME-Proxy: Feedback-ID: i2b1146f3:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Thu, 16 Nov 2023 14:16:40 -0500 (EST) From: Philip McGrath To: 67019@debbugs.gnu.org Subject: [PATCH v2 07/16] gnu: Add ocaml-dtoa. Date: Thu, 16 Nov 2023 14:15:45 -0500 Message-ID: <4ccdb4652b68ad0cb1ed898b8ab5ecfc34125cb7.1700161584.git.philip@philipmcgrath.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: References: MIME-Version: 1.0 X-Debbugs-Cc: Julien Lepiller , pukkamustard Content-Transfer-Encoding: 8bit X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 67019 Cc: Philip McGrath , Liliana Marie Prikler X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) * gnu/packages/ocaml.scm (ocaml-dtoa): New variable. --- gnu/packages/ocaml.scm | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index b12c12fad5..36f349df73 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -2513,6 +2513,30 @@ (define-public ocaml4.07-fmt "0gkkkj4x678vxdda4xaw2dd44qjacavsvn5nx8gydfwah6pjbkxk")))) (properties '())))) +(define-public ocaml-dtoa + (package + (name "ocaml-dtoa") + (version "0.3.3") + (source (origin + (method url-fetch) + (uri + (string-append "https://github.com/flow/ocaml-dtoa/releases/" + "download/v" version "/dtoa-" version ".tbz")) + (sha256 + (base32 + "0gpfr6iyiihmkpas542916cnhfdbrigvzwrix8jrxcljks661x6q")))) + (build-system dune-build-system) + (native-inputs (list ocaml-ounit2)) + (home-page "https://github.com/flow/ocaml-dtoa") + (synopsis + "Efficent float to string conversion for OCaml") + (description + "This package provides functions that convert OCaml floats into strings +quickly, accurately, and (almost always) optimally using the Grisu3 algorithm. +The implementation was adapted from a C++ library originally developed as part +of the V8 JavaScript engine.") + (license license:expat))) + (define-public ocaml-astring (package (name "ocaml-astring") -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Thu Nov 16 14:17:09 2023 Received: (at 67019) by debbugs.gnu.org; 16 Nov 2023 19:17:10 +0000 Received: from localhost ([127.0.0.1]:44597 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1r3hrR-0003mT-DM for submit@debbugs.gnu.org; Thu, 16 Nov 2023 14:17:09 -0500 Received: from out4-smtp.messagingengine.com ([66.111.4.28]:60411) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1r3hr3-0003iG-VQ for 67019@debbugs.gnu.org; Thu, 16 Nov 2023 14:16:46 -0500 Received: from compute3.internal (compute3.nyi.internal [10.202.2.43]) by mailout.nyi.internal (Postfix) with ESMTP id 14CB35C00D1; Thu, 16 Nov 2023 14:16:46 -0500 (EST) Received: from mailfrontend1 ([10.202.2.162]) by compute3.internal (MEProxy); Thu, 16 Nov 2023 14:16:46 -0500 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=fm1; t=1700162206; x=1700248606; bh=Ki Wcea6wn/K24MSCD0fOryDe70WTqDSaNudxaoHqdSk=; b=ZvjohQt5pWNhV/O+Am V+oR0BB6mUGyZF1owTlpwHaQrDqDnqIs+toIErD/QdjtELn8qdLMcsE4jkFr9s1C 9saGhxc+D0cYieQ15LkiJceVwggvdoKGHh3QXg63vyzPOsoNh+uMouwoofvNvd9B hEzOyrRY77HqUivZHlVYO1Zad4Kf3MhW1ciBhrqlNEDl9fG500A32QPdysJTq/Bj 3xLBKoariwoeRMm4a4dUe+4ewovjMBz0rW1aNuWVFkA3jzgcMHUYRLu4SUYk18gv stQkzRfsGlWrbM2WE6xw5ZbdJpMooFY/GNpZeo/r8Y6u2rTsPm2Nv327fQ8pxrGU 2VQQ== 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=fm1; t= 1700162206; x=1700248606; bh=KiWcea6wn/K24MSCD0fOryDe70WTqDSaNud xaoHqdSk=; b=ahR49F/Jq2WrUmfNXACtNb+WjVlV1LsuDdbsCbUUcXe7i1eb6Xi G6pb9o/JH6UHp8vaq6ySzX4IPzlESgQnMUn341Uq6rHxXa1wBDknh846bHFmOpMh OuKYdRcjf8RkeNzUMGXxB0YhibutE/X5nm54/EfHUGg5gFXNOLY/dhkDq7V/QdBg oL9gjuqrMZpPC+50D2+gjLDNWp2NQsIjAB4EAYctaeM1bbsGrq9cx13bSnc/wRo2 CfveGS5TPiagjmUvQVPmuVKHjNj+4NKpvsaLz4NUcpA7x4LLnPgvKw4djhMo9uoO sD4FUS9Z8d+upryjBwCn3JuFkLzL3Vc1bgg== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvkedrudefkedguddvtdcutefuodetggdotefrod ftvfcurfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfgh necuuegrihhlohhuthemuceftddtnecusecvtfgvtghiphhivghnthhsucdlqddutddtmd enfghrlhcuvffnffculdefhedmnecujfgurhephffvvefufffkofgjfhggtgfgsehtkeer tdertdejnecuhfhrohhmpefrhhhilhhiphcuofgtifhrrghthhcuoehphhhilhhiphesph hhihhlihhpmhgtghhrrghthhdrtghomheqnecuggftrfgrthhtvghrnhepgefguefgfedt vdejhfettdeuvdduheehgeevvdekgfelvefffedthffhkeetgeffnecuffhomhgrihhnpe hgihhthhhusgdrtghomhenucevlhhushhtvghrufhiiigvpedtnecurfgrrhgrmhepmhgr ihhlfhhrohhmpehphhhilhhiphesphhhihhlihhpmhgtghhrrghthhdrtghomh X-ME-Proxy: Feedback-ID: i2b1146f3:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Thu, 16 Nov 2023 14:16:45 -0500 (EST) From: Philip McGrath To: 67019@debbugs.gnu.org Subject: [PATCH v2 13/16] gnu: js-commander: Install as a node module. Date: Thu, 16 Nov 2023 14:15:51 -0500 Message-ID: <2dbd50a275174556a071bc7047823c80fa20ee67.1700161584.git.philip@philipmcgrath.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: References: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 67019 Cc: Philip McGrath , Liliana Marie Prikler X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) Previously, NPM would not find 'commander' when resolving dependencies. In case anyone is using it, keep building the bundled version at 'share/javascript/commander/index.min.js', too. * gnu/packages/javascript.scm (js-commander)[build-system]: Use 'node-build-system'. [arguments]: Delete unpackaged 'devDependencies'. Build bundle for compatibility. --- gnu/packages/javascript.scm | 52 ++++++++++++++++++++++++++----------- 1 file changed, 37 insertions(+), 15 deletions(-) diff --git a/gnu/packages/javascript.scm b/gnu/packages/javascript.scm index c62b23a4c4..97cb3b6270 100644 --- a/gnu/packages/javascript.scm +++ b/gnu/packages/javascript.scm @@ -7,6 +7,7 @@ ;;; Copyright © 2021 Pierre Neidhardt ;;; Copyright © 2021 Maxim Cournoyer ;;; Copyright © 2022 Frank Pursel +;;; Copyright © 2023 Philip McGrath ;;; ;;; This file is part of GNU Guix. ;;; @@ -42,6 +43,7 @@ (define-module (gnu packages javascript) #:use-module (guix build-system cmake) #:use-module (guix build-system gnu) #:use-module (guix build-system minify) + #:use-module (guix build-system node) #:use-module (guix build-system trivial) #:use-module (guix utils)) @@ -384,22 +386,42 @@ (define-public js-commander (sha256 (base32 "1xwh85kbxj76ni41r2h0apl8mjbfcnmxzzp3vlspq30w8kwfckni")))) - (build-system trivial-build-system) + (build-system node-build-system) (arguments - `(#:modules ((guix build utils)) - #:builder - (begin - (use-modules (guix build utils)) - (chdir (assoc-ref %build-inputs "source")) - (let ((esbuild (search-input-file %build-inputs "/bin/esbuild")) - (target (string-append %output "/share/javascript/commander"))) - (invoke esbuild - "--bundle" - "--minify" - "--tsconfig=tsconfig.json" - "--platform=node" - (string-append "--outfile=" target "/index.min.js") - "index.js"))))) + (list + #:tests? #f ; many more dependencies + #:phases + #~(modify-phases %standard-phases + (add-after 'patch-dependencies 'delete-dependencies + (lambda args + (delete-dependencies `(;; devDependencies + "@types/jest" + "@types/node" + "@typescript-eslint/eslint-plugin" + "@typescript-eslint/parser" + "eslint" + "eslint-config-standard" + "eslint-config-standard-with-typescript" + "eslint-plugin-import" + "eslint-plugin-jest" + "eslint-plugin-n" + "eslint-plugin-promise" + "jest" + "ts-jest" + "tsd" + "typescript")))) + (add-after 'install 'install-compat + (lambda args + ;; This is what this package built before adopting + ;; node-build-system. Does anything use it? + (invoke "esbuild" + "--bundle" + "--minify" + "--platform=node" + (string-append "--outfile=" + #$output + "/share/javascript/commander/index.min.js") + "index.js")))))) (native-inputs (list esbuild)) (home-page "https://github.com/tj/commander.js") -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Thu Nov 16 14:17:10 2023 Received: (at 67019) by debbugs.gnu.org; 16 Nov 2023 19:17:10 +0000 Received: from localhost ([127.0.0.1]:44599 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1r3hrR-0003mf-Va for submit@debbugs.gnu.org; Thu, 16 Nov 2023 14:17:10 -0500 Received: from out4-smtp.messagingengine.com ([66.111.4.28]:47283) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1r3hr4-0003iZ-MV for 67019@debbugs.gnu.org; Thu, 16 Nov 2023 14:16:47 -0500 Received: from compute1.internal (compute1.nyi.internal [10.202.2.41]) by mailout.nyi.internal (Postfix) with ESMTP id BD16A5C01E2; Thu, 16 Nov 2023 14:16:41 -0500 (EST) Received: from mailfrontend1 ([10.202.2.162]) by compute1.internal (MEProxy); Thu, 16 Nov 2023 14:16:41 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= philipmcgrath.com; h=cc:cc:content-transfer-encoding :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=1700162201; x=1700248601; bh=E9ocrdTfeE mbK+CG7oTU30PmquE0qggOBuAtfU+BvE4=; b=KE1D7WLCp80mgRokhVhUHig0tm Evytl/MYwSeECp8q4mTQq0k0mD6SkvWN7kiCXX78a6u+1bP9LvP08gg+fntuMPBS YnyP0j5VSi7XUINkWEsjx1t+HR7nixKpNqE7zG2g/g96yK7tbuENNdRecRmt+3EG 9WiSPeIipLRDbl/8/tpSsCTxTF7OrG+XJdpIpz9mAmiM8gqDdM++vRkrouRAEDwn s9YLx3ZLxY1j7mBWzMutXmYJPLhLJRNL8z63JkHMDfNRZUREJjKp1vWT/kdQKKJ4 IPS0ktm7s/+u4LADOX58uA5FI3mXcBL/Bp1IuJeIlbEkcg4px1s+YQEYGqeA== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:cc:content-transfer-encoding :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=1700162201; x= 1700248601; bh=E9ocrdTfeEmbK+CG7oTU30PmquE0qggOBuAtfU+BvE4=; b=O vEfzFBSzldWvrw0tJMj6EYVWnWL3n+xoGbxi7p36IIXBOdnTGiGMp/fZPhGj+Ier vD2yh4d8kdRJrkj+0TJe/ICk8R3qIw1bDafxgfTxTGvwKYwE1qm8k821qcDCzQas Ss2p7Gx1QdolBf4okhy+OVcIm4zsSxK225RwaxriBDEvw3IQTWeHfRfkD80ISdiV 8sZdnom7jo/voPkPpRohWKwwt5DL7t5e5urwe2CciSI5nZIWGxXiGZ6V41tu0j3Z qzef5o5n6RARbW/hgM3l+5mj56VYhJy46ddw/WutsoOho5d9n12z2WKvJKSt+Ho1 T9V+KEyMSFhbMVg3bq9Mw== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvkedrudefkedguddvtdcutefuodetggdotefrod ftvfcurfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfgh necuuegrihhlohhuthemuceftddtnecusecvtfgvtghiphhivghnthhsucdlqddutddtmd enucfjughrpefhvfevufffkffojghfggfgsedtkeertdertddtnecuhfhrohhmpefrhhhi lhhiphcuofgtifhrrghthhcuoehphhhilhhiphesphhhihhlihhpmhgtghhrrghthhdrtg homheqnecuggftrfgrthhtvghrnhepudehvdefjeetfffffeektdehtdetudfhtdfhuddt ueeukefhveehhfehvdfhheffnecuffhomhgrihhnpehgihhthhhusgdrtghomhenucevlh hushhtvghrufhiiigvpedtnecurfgrrhgrmhepmhgrihhlfhhrohhmpehphhhilhhiphes phhhihhlihhpmhgtghhrrghthhdrtghomh X-ME-Proxy: Feedback-ID: i2b1146f3:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Thu, 16 Nov 2023 14:16:41 -0500 (EST) From: Philip McGrath To: 67019@debbugs.gnu.org Subject: [PATCH v2 08/16] gnu: Add node-vlq. Date: Thu, 16 Nov 2023 14:15:46 -0500 Message-ID: <7f4e71aad9adc111dd5ff673d707ef9e3db0d7e0.1700161584.git.philip@philipmcgrath.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 67019 Cc: Philip McGrath , Liliana Marie Prikler X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) * gnu/packages/node-xyz.scm (node-vlq): New variable. --- gnu/packages/node-xyz.scm | 58 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 58 insertions(+) diff --git a/gnu/packages/node-xyz.scm b/gnu/packages/node-xyz.scm index ee96dee767..adbac8a6cd 100644 --- a/gnu/packages/node-xyz.scm +++ b/gnu/packages/node-xyz.scm @@ -1793,3 +1793,61 @@ (define-public node-copy-anything face of complications like special objects, symbols, and non-enumerable properties.") (license license:expat))) + +(define-public node-vlq + (package + (name "node-vlq") + (version "0.2.3") ; last version accepted by flow-remove-types ("^0.2.1") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/Rich-Harris/vlq") + (commit (string-append "v" version)))) + (sha256 + (base32 "1vdrarssrwxpcngyfx050ba0gnfinzi5jn3xs4w9rnjvxngx6m8f")) + (snippet + #~(delete-file "dist/vlq.js")) + (file-name (git-file-name name version)))) + (build-system node-build-system) + (native-inputs (list esbuild)) + (arguments + (list + #:modules + `((guix build node-build-system) + (ice-9 match) + (guix build utils)) + #:phases + #~(modify-phases %standard-phases + (add-after 'patch-dependencies 'delete-dependencies + (lambda args + (delete-dependencies + '("eslint" + "rollup")))) + (add-after 'delete-dependencies 'patch-build-script + (lambda args + (define new-build-script + "esbuild --bundle --platform=node --outdir=dist src/vlq.js") + (with-atomic-json-file-replacement "package.json" + (lambda (js) + (match js + (('@ . alist) + (cons '@ + (map (match-lambda + (("scripts" @ . alist) + `("scripts" @ ,@(map (match-lambda + (("build" . _) + (cons "build" + new-build-script)) + (other + other)) + alist))) + (other + other)) + alist))))))))))) + (home-page "https://github.com/Rich-Harris/vlq") + (synopsis "JavaScript library for @acronym{VLQ} encoding and decoding") + (description "This package provides a JavaScript library for converting +integers to and from Base64-encoded @acronym{VLQ, variable-length quantity} +strings.") + (license license:expat))) -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Thu Nov 16 14:17:10 2023 Received: (at 67019) by debbugs.gnu.org; 16 Nov 2023 19:17:11 +0000 Received: from localhost ([127.0.0.1]:44601 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1r3hrS-0003mi-BT for submit@debbugs.gnu.org; Thu, 16 Nov 2023 14:17:10 -0500 Received: from out4-smtp.messagingengine.com ([66.111.4.28]:38383) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1r3hr4-0003iQ-R1 for 67019@debbugs.gnu.org; Thu, 16 Nov 2023 14:16:47 -0500 Received: from compute7.internal (compute7.nyi.internal [10.202.2.48]) by mailout.nyi.internal (Postfix) with ESMTP id E73135C016D; Thu, 16 Nov 2023 14:16:46 -0500 (EST) Received: from mailfrontend1 ([10.202.2.162]) by compute7.internal (MEProxy); Thu, 16 Nov 2023 14:16:46 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= philipmcgrath.com; h=cc:cc:content-transfer-encoding :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=1700162206; x=1700248606; bh=TvLYFhRUmx QVgc7MzzlUM6Eaqi7+ZzgSDbtYajl7ego=; b=QsCppcQB6xyznfyM0suZaGrQc2 Y+10GGPrkjjbPxE6rG1Oy2Ka/sgrjfMxP89BxXlUubhhWJ8lR9m+rd9qULgxpmsI XPT/cjIjbOKRt6hPw8hCw1XOaAyegohdkiK/O6tZFqXWnTmTQcenHOft5nKbI9Av AxqrMQfpeYk8U3GH1CYulSfQjzQqxWcV6wpnvqRLo3MSOwFa4OHwQcx4hP7RGUVh gBICRQAH9C4lFkGy0RAUf1pZLPV4GyDGdYMSruckNAptIJcqf5s5khLmH7akUboS QZJTfVii5cWsMFjsRcSYQMDQsBBWb2ec/v5XlHYMdBuK+p+Ear9ITuxVMWfw== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:cc:content-transfer-encoding :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=1700162206; x= 1700248606; bh=TvLYFhRUmxQVgc7MzzlUM6Eaqi7+ZzgSDbtYajl7ego=; b=E kDVpqFah90/UFfwcVidxPJ0TnL/kjJalflMGav9WRQdAVcCRapnyKZkPda9Fvqmn AIaf4mbV4NEPkvn4hN54k17resuWv1jcghpwMUThRK4jGi86VAeLr0CHkv1lG0jE BilKInLBSHGqw/8PHxI/Xewpsw6CmK59CeBOZEpCb0/XmTycj5Xr791/RbFXipLS NdZY+/CuAuu4ie7j2app4aQSVwsuoG2VUKQ5vlV1ngLRI2qqrhc/CwsYRULnjseI f3y/ofZ93RecxxnNLiKxc08lydOc9CGD3YdfSi0rS4SUvGIXPMh1GtsUzg/RAEy8 1LSzYLdlZPzz0FVwvFxKg== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvkedrudefkedguddvtdcutefuodetggdotefrod ftvfcurfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfgh necuuegrihhlohhuthemuceftddtnecusecvtfgvtghiphhivghnthhsucdlqddutddtmd enogfuuhhsphgvtghtffhomhgrihhnucdlgeelmdenucfjughrpefhvfevufffkffojghf ggfgsedtkeertdertddtnecuhfhrohhmpefrhhhilhhiphcuofgtifhrrghthhcuoehphh hilhhiphesphhhihhlihhpmhgtghhrrghthhdrtghomheqnecuggftrfgrthhtvghrnhep geevuefggffgtdefueefvefgleeigfeiueefudekfeehueekhfegvdfgjeehuefgnecuff homhgrihhnpehsohhurhgtvghfohhrghgvrdhnvghtpdhgihhthhhusgdrtghomhdplhhi lhihphhonhgurdhorhhgnecuvehluhhsthgvrhfuihiivgeptdenucfrrghrrghmpehmrg hilhhfrhhomhepphhhihhlihhpsehphhhilhhiphhmtghgrhgrthhhrdgtohhm X-ME-Proxy: Feedback-ID: i2b1146f3:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Thu, 16 Nov 2023 14:16:46 -0500 (EST) From: Philip McGrath To: 67019@debbugs.gnu.org Subject: [PATCH v2 14/16] gnu: Add mftrace. Date: Thu, 16 Nov 2023 14:15:52 -0500 Message-ID: <4b3be6a948d9e6da5dd729caaaeff9c5fef06783.1700161584.git.philip@philipmcgrath.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 67019 Cc: Philip McGrath , Liliana Marie Prikler X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) * gnu/packages/fontutils.scm (mftrace): New variable. --- gnu/packages/fontutils.scm | 45 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 45 insertions(+) diff --git a/gnu/packages/fontutils.scm b/gnu/packages/fontutils.scm index 5bfdea1b27..6bab6ab7df 100644 --- a/gnu/packages/fontutils.scm +++ b/gnu/packages/fontutils.scm @@ -1182,6 +1182,51 @@ (define-public ttf2pt1 (home-page "https://ttf2pt1.sourceforge.net/") (license license:bsd-3))) +(define-public mftrace + (let ((commit "3b4bc2e5b8a4ae6f9c776593961b38389e62a484") + ;; see https://github.com/hanwen/mftrace/pull/12 + (revision "0")) + (package + (name "mftrace") + (version (git-version "1.2.20" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/hanwen/mftrace") + (commit commit))) + (sha256 + (base32 "01cg6z1z69za07wrvx1y5dnfagx4di2a9qnx25f97l6843x03s36")) + (file-name (git-file-name name version)))) + (build-system gnu-build-system) + (native-inputs (list autoconf + ;; for tests: + (texlive-updmap.cfg + (list texlive-cm)))) + (propagated-inputs (list potrace lcdf-typetools)) + (arguments + (list + ;; setting CC is needed for implicit rule + #:make-flags #~(list (string-append "CC=" #$(cc-for-target))) + #:test-target "test" + #:phases + #~(modify-phases %standard-phases + (replace 'bootstrap + (lambda args + (invoke "autoconf")))))) + (home-page "https://lilypond.org/mftrace/") + (synopsis "Scalable PostScript fonts for MetaFont") + (description "This package provides @command{mftrace}, a small Python +program that lets you trace a TeX bitmap font into a PFA or PFB font (a +PostScript Type 1 Scalable Font) or a @acronym{TTF,TrueType Font}. + +Scalable fonts offer many advantages over bitmaps, as they allow documents to +render correctly at many printer resolutions. Moreover, Ghostscript can +generate much better PDFs if given scalable PostScript fonts. + +Versions of this program prior to 1.0.5 were called @command{pktrace}.") + (license license:gpl2+)))) + (define-public woff2 (package (name "woff2") -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Thu Nov 16 14:17:11 2023 Received: (at 67019) by debbugs.gnu.org; 16 Nov 2023 19:17:12 +0000 Received: from localhost ([127.0.0.1]:44603 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1r3hrS-0003mp-Pm for submit@debbugs.gnu.org; Thu, 16 Nov 2023 14:17:11 -0500 Received: from out4-smtp.messagingengine.com ([66.111.4.28]:46637) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1r3hr5-0003ig-H6 for 67019@debbugs.gnu.org; Thu, 16 Nov 2023 14:16:48 -0500 Received: from compute7.internal (compute7.nyi.internal [10.202.2.48]) by mailout.nyi.internal (Postfix) with ESMTP id 962815C0203; Thu, 16 Nov 2023 14:16:42 -0500 (EST) Received: from mailfrontend1 ([10.202.2.162]) by compute7.internal (MEProxy); Thu, 16 Nov 2023 14:16:42 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= philipmcgrath.com; h=cc:cc:content-transfer-encoding :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=1700162202; x=1700248602; bh=PC89oKSYEC 0KHXt4QpB5Xv9CWn1muRIJ/dTa4CLnbLk=; b=m8WznaUdxkHgbV71irWDRQ5ZFf GVKW+6CNhb23CyPWU9VS1ABXSEigBb8SpLXVjouabk9RFLwpXEKF4Qv2ZPdQdyBs xRHEkpmbZc3PfEEUyekNO92rqyiXLMLnZPeT+U61ByrQInb/BmOBwC7mE+JY+DRm 7aQDictBfC5rZYTICrQ/YY71RTZm+ofS2V9DbGlFTO/v+9MfWCqzEVkX9YehfDPl aYcBa6j7rM9E9BHR8OuROC7mkAShZsisDvmAJHxfcxZ4KfhEAAgm4KjVkU2UCi0S 083+fgBtXJOuxeh/WTBdseg7PRqgRGUgXhelPLKCnEyjRGkRCslBJyUB/pmg== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:cc:content-transfer-encoding :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=1700162202; x= 1700248602; bh=PC89oKSYEC0KHXt4QpB5Xv9CWn1muRIJ/dTa4CLnbLk=; b=g /kyusBKqflNHyGPEd5U4toSC8qhHdWVW55oIDCtaL1tMe+ufPspdqADT26umHatz 1dy/r0BgzXi3bgrX5OJregL9DRnTy637b3GS5/l2QC5aIwithFkRECX18Qe0E5mX ZweQWgE/bBwrDYbOxVKHt4kNCZBzHQ/8pGGQFghEOjrEVsFFjHwVt45SNnpDm5sq ToetmNv+DwoXBFW52k6OhcJsTtCj2W3tm0zn0p9Gwrc2fMAd+eXtTwOak7FbXVNJ tpkZAnIQmx9zQY8X3MyH+vUgBol4UzLGRe78tvS3DfJbm6PYzuNpVq8VwO2D8+m1 RF0ZAeSFyoe1XbIcGFISg== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvkedrudefkedguddvtdcutefuodetggdotefrod ftvfcurfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfgh necuuegrihhlohhuthemuceftddtnecusecvtfgvtghiphhivghnthhsucdlqddutddtmd enucfjughrpefhvfevufffkffojghfggfgsedtkeertdertddtnecuhfhrohhmpefrhhhi lhhiphcuofgtifhrrghthhcuoehphhhilhhiphesphhhihhlihhpmhgtghhrrghthhdrtg homheqnecuggftrfgrthhtvghrnhepvdekuefhtefhiedvkeegtdeljeehvdfhheefteef heduveelgeelleetvddvjeffnecuffhomhgrihhnpehgihhthhhusgdrtghomhdpfhhloh ifrdhorhhgnecuvehluhhsthgvrhfuihiivgeptdenucfrrghrrghmpehmrghilhhfrhho mhepphhhihhlihhpsehphhhilhhiphhmtghgrhgrthhhrdgtohhm X-ME-Proxy: Feedback-ID: i2b1146f3:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Thu, 16 Nov 2023 14:16:41 -0500 (EST) From: Philip McGrath To: 67019@debbugs.gnu.org Subject: [PATCH v2 09/16] gnu: Add ocaml-flow-parser. Date: Thu, 16 Nov 2023 14:15:47 -0500 Message-ID: <9e31af33a03e3581f3c124b6b53241a34c31e42e.1700161584.git.philip@philipmcgrath.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 67019 Cc: Philip McGrath , Liliana Marie Prikler X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) * gnu/packages/web.scm (ocaml-flow-parser): New variable. --- gnu/packages/web.scm | 95 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 95 insertions(+) diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index 9efc6ebc9d..b222c2ae40 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -96,6 +96,7 @@ (define-module (gnu packages web) #:use-module (guix build-system cargo) #:use-module (guix build-system cmake) #:use-module (guix build-system copy) + #:use-module (guix build-system dune) #:use-module (guix build-system glib-or-gtk) #:use-module (guix build-system gnu) #:use-module (guix build-system go) @@ -173,6 +174,7 @@ (define-module (gnu packages web) #:use-module (gnu packages node) #:use-module (gnu packages node-xyz) #:use-module (gnu packages nss) + #:use-module (gnu packages ocaml) #:use-module (gnu packages openldap) #:use-module (gnu packages openstack) #:use-module (gnu packages package-management) @@ -1938,6 +1940,99 @@ (define-public esbuild and other data, for distribution on the web.") (license license:expat))) +(define-public ocaml-flow-parser + (package + (name "ocaml-flow-parser") + (version "0.159.0") + (outputs '("out" "js")) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/facebook/flow") + (commit (string-append "v" version)))) + (sha256 + (base32 "1i9svf641s24nj4w6y9vvglzg29h0lr4n9a6mvwrn9psy9x1lril")) + (file-name (git-file-name "flow" version)))) + (build-system dune-build-system) + (propagated-inputs (list ocaml-base + ocaml-core-kernel + ocaml-dtoa + ocaml-sedlex + ocaml-wtf8)) + (native-inputs (list js-of-ocaml + ocamlbuild + ocaml-findlib + ocaml-ounit2 + ocaml-ppx-deriving + ocaml-ppx-gen-rec + ocaml-visitors)) + (arguments + (list + #:tests? #f ; tests need lwt_ppx + #:package "flow_parser" + #:phases + #~(modify-phases %standard-phases + (add-before 'build 'chdir + (lambda args + (chdir "src/parser"))) + (add-before 'build 'patch-source + (lambda args + ;; Avoid errors with newer OCaml: + ;; "Error (warning 16 [unerasable-optional-argument]):" + ;; " this optional argument cannot be erased." + ;; "Error (warning 69 [unused-field]):" + ;; " mutable record field buf is never mutated." + ;; "Error (warning 70 [missing-mli]): Cannot find interface file." + (substitute* "_tags" + (("<\\*\\.ml\\*>: warn[(]-39[)]") + "<*.ml*>: warn(-16-39-70)")) + (substitute* "../../_tags" + (("<\\*\\*/\\*.ml\\*>: ") + "<**/*.ml*>: warn(-69), ")) + ;; Deprecation of Js.Unsafe.variable, Js.Error, Js.raise_js_error + (substitute* "flow_parser_js.ml" + (("Js\\.Unsafe\\.variable") + "Js.Unsafe.pure_js_expr")) + (substitute* "flow_parser_dot_js.ml" + (("Js\\.Error") + "Js_of_ocaml.Js_error.Exn") + (("Js\\.raise_js_error") + "Js_of_ocaml.Js_error.raise_")))) + (replace 'build + (lambda args + (invoke "make" + (string-append "CC=" #$(cc-for-target)) + "build-parser"))) + (add-after 'build 'build-js + (lambda args + (invoke "make" + (string-append "CC=" #$(cc-for-target)) + "js"))) + (replace 'check + (lambda* (#:key tests? #:allow-other-keys) + (when tests? + (invoke "make" + (string-append "CC=" #$(cc-for-target)) + "test-ocaml")))) + (replace 'install + (lambda args + (invoke "make" + (string-append "CC=" #$(cc-for-target)) + "ocamlfind-install"))) + (add-after 'install 'install-js + (lambda args + (install-file "flow_parser.js" + (string-append #$output:js + "/share/javascript/flow"))))))) + (properties `((upstream-name . "flow_parser"))) + (home-page "https://flow.org") + (synopsis "Parser for the Flow JavaScript type system") + (description "Flow is a gradual type system for JavaScript. This package +provides the Flow parser, which is an OCaml library that can also be compiled +to JavaScript.") + (license license:expat))) + (define-public tinyproxy (package (name "tinyproxy") -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Thu Nov 16 14:17:12 2023 Received: (at 67019) by debbugs.gnu.org; 16 Nov 2023 19:17:12 +0000 Received: from localhost ([127.0.0.1]:44605 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1r3hrT-0003mx-RG for submit@debbugs.gnu.org; Thu, 16 Nov 2023 14:17:12 -0500 Received: from out4-smtp.messagingengine.com ([66.111.4.28]:32825) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1r3hr6-0003ii-94 for 67019@debbugs.gnu.org; Thu, 16 Nov 2023 14:16:49 -0500 Received: from compute5.internal (compute5.nyi.internal [10.202.2.45]) by mailout.nyi.internal (Postfix) with ESMTP id 58F155C021F; Thu, 16 Nov 2023 14:16:43 -0500 (EST) Received: from mailfrontend1 ([10.202.2.162]) by compute5.internal (MEProxy); Thu, 16 Nov 2023 14:16:43 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= philipmcgrath.com; h=cc:cc:content-transfer-encoding :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=1700162203; x=1700248603; bh=UoMSbMCFbk o/f4S44kDxI4VO5nX5AwCbi/SD3SLPnWc=; b=aamYuSG/Cz0jgn86lnt5o8GYG9 JxecDd3XrVI7+L+bniWsswh1qipJoVY3mIQPoUG8I0fb+7aWV9+T5Mh14lYK06AP 4B69Rpj+l6svBX7cnVllTsH74J3QIptnj0xoQ89WF1EgMxCJzbnfeWebPnmhjFo7 B7qh4ZQqbbrHS1m7DHc9VEfZlBVaZ8rSpM+hYyy/QY5oX6ZNYcLl4JVReXr7o/pK uKa3OL2o4aUjVZVQD0MJJFAYoPofZwyMiWebCV85htq68ipPDvz8MffTRP/IgekU Oq+Yp9eM+y1Upj/ueiyti0iB6DiROsa14s7AAEQY/ZpVmcsk69kiMdqORJLw== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:cc:content-transfer-encoding :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=1700162203; x= 1700248603; bh=UoMSbMCFbko/f4S44kDxI4VO5nX5AwCbi/SD3SLPnWc=; b=u C3T4FI06iN6NAidao68gO7hM8YpngBBb+hH2yiV38IFrR75BDkrOrmjRHCOmm03I diCzQjdzhdD0xK34G/JdGaKjgC/pIfDxlyEWdX8j8RUFGA5bzOZzfTmTuQZNC9DI Yf0YBQkeRRsnnqX9geUFW+LPrlOILqoDuubdeeXplkTDUGFKrO2LJItdPNfTVDHe 0KB9mSb82i/yy8X0yYF6lVkPPALCr+8ktbM/Fb9/VqE1oDExewFsolsiDoNz1uRB 3KPXRR0adohdJnzHOSy5g9yeFDF6o1jkEkXeSBvt3asl26eOr+1zRybD8kvbHZY2 0Btf/hD/bw7G0KUJB0CFg== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvkedrudefkedguddvtdcutefuodetggdotefrod ftvfcurfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfgh necuuegrihhlohhuthemuceftddtnecusecvtfgvtghiphhivghnthhsucdlqddutddtmd enucfjughrpefhvfevufffkffojghfggfgsedtkeertdertddtnecuhfhrohhmpefrhhhi lhhiphcuofgtifhrrghthhcuoehphhhilhhiphesphhhihhlihhpmhgtghhrrghthhdrtg homheqnecuggftrfgrthhtvghrnhepgffhgfffjeegudejvddvgedvheefveehvdffuedu udeivdfhgeeileehvdfhfeefnecuvehluhhsthgvrhfuihiivgeptdenucfrrghrrghmpe hmrghilhhfrhhomhepphhhihhlihhpsehphhhilhhiphhmtghgrhgrthhhrdgtohhm X-ME-Proxy: Feedback-ID: i2b1146f3:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Thu, 16 Nov 2023 14:16:42 -0500 (EST) From: Philip McGrath To: 67019@debbugs.gnu.org Subject: [PATCH v2 10/16] gnu: Add node-flow-parser. Date: Thu, 16 Nov 2023 14:15:48 -0500 Message-ID: X-Mailer: git-send-email 2.41.0 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 67019 Cc: Philip McGrath , Liliana Marie Prikler X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) * gnu/packages/web.scm (node-flow-parser): New variable. (ocaml-flow-parser)[description]: Mention it. --- gnu/packages/web.scm | 45 +++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 44 insertions(+), 1 deletion(-) diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index b222c2ae40..b8646e9d0d 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -2030,9 +2030,52 @@ (define-public ocaml-flow-parser (synopsis "Parser for the Flow JavaScript type system") (description "Flow is a gradual type system for JavaScript. This package provides the Flow parser, which is an OCaml library that can also be compiled -to JavaScript.") +to JavaScript. To use the compiled parser with Node.js or NPM, see the Guix +package @code{node-flow-parser}.") (license license:expat))) +(define-public node-flow-parser + (package + (inherit ocaml-flow-parser) + (name "node-flow-parser") + (properties '()) + (outputs '("out")) + (propagated-inputs '()) + (native-inputs '()) + (inputs (list `(,ocaml-flow-parser "js"))) + (build-system node-build-system) + (arguments + (list + #:tests? #f ; need unpackaged dependencies + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'delete-workspace-file + (lambda args + ;; this workspace file causes NPM to try to install dependencies + ;; of other packages developed in this source repository + (delete-file "package.json"))) + (add-after 'delete-workspace-file 'chdir + (lambda args + (chdir "packages/flow-parser"))) + (add-after 'chdir 'unpack-generated-js + (lambda* (#:key inputs #:allow-other-keys) + (install-file + (search-input-file inputs + "share/javascript/flow/flow_parser.js") + ".") + (delete-file "Makefile"))) + (add-after 'patch-dependencies 'delete-dependencies + (lambda args + (delete-dependencies + '("ast-types" + "colors" + "esprima-fb" + "minimist"))))))) + (synopsis "Parser for the Flow JavaScript type system") + (description "Flow is a gradual type system for JavaScript. This package +provides the Flow parser in its compiled-to-JavaScript form for use with +Node.js and NPM."))) + (define-public tinyproxy (package (name "tinyproxy") -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Thu Nov 16 14:17:12 2023 Received: (at 67019) by debbugs.gnu.org; 16 Nov 2023 19:17:12 +0000 Received: from localhost ([127.0.0.1]:44607 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1r3hrU-0003n5-AJ for submit@debbugs.gnu.org; Thu, 16 Nov 2023 14:17:12 -0500 Received: from out4-smtp.messagingengine.com ([66.111.4.28]:48699) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1r3hr5-0003iU-Jf for 67019@debbugs.gnu.org; Thu, 16 Nov 2023 14:16:49 -0500 Received: from compute3.internal (compute3.nyi.internal [10.202.2.43]) by mailout.nyi.internal (Postfix) with ESMTP id AFAE85C0176; Thu, 16 Nov 2023 14:16:47 -0500 (EST) Received: from mailfrontend1 ([10.202.2.162]) by compute3.internal (MEProxy); Thu, 16 Nov 2023 14:16:47 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= philipmcgrath.com; h=cc:cc:content-transfer-encoding :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=1700162207; x=1700248607; bh=hzOWIYY8DG eo2gwVnQmIMFa+q3DnC8RCm3VUsXPBkXI=; b=DHlF81scWg5IOEXhJ691LhqREU oHZRf35whrF9j8Virb3wqUMQ4Fg1O7+9Ae0qrjF1zlr3dq4jyIxibPUJdPx+Hwdn gqDe33j5f9+e14ImRup857FL1i2OgyzLogcZX8J2k6yxliG0ymO0OfWbvJPLMZSj DUVhJO89od96ubo0Ot5XMNJqNE8Zg61ZV8fNm0/7NKhHoLknw7dzxeej2RcIVpXv R5cp8qjRMFo96p3IPeL+iQXwboRNAqOeqX+3H0gWAL3YNGPUDTvHOCpDHZseYY65 Yu42AX8x08PQXNRK3x9ljGHW0BVqB3aGe5vj0jsk79/Z8oGSRSPeOVsf8OKw== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:cc:content-transfer-encoding :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=1700162207; x= 1700248607; bh=hzOWIYY8DGeo2gwVnQmIMFa+q3DnC8RCm3VUsXPBkXI=; b=S ddzJ5TLSPjyuCaCZMm5xeRf1pHrxkWDdZnXC6OI5jB1iwyC9lu8meuP+8SkefUsP oy1QvAYIeWaZabDQ4kkSLf4H57nbf3kWbDI285xmeWXFbIm7X+czbaTj/Tl/U5lz qbrdULWYtOH6FUp+jNQSXbYzRgMqIMsiuwFqjpGN+EYxxFp30kk8E1OfpUMicS7s NF7H6ws3GynrkO4hVHFaJj/VS4V6suHLaSD1ZE/dWL6K9qnPSQNrUPHm93tW8SFI CRTO+x9BHsmKPjm7NeE07loz7cY3pNLW56Ob1mbTaNYVar2lsfvMl1UpP1ZO6NQc HBsGMXxu9eqAUVk1JfZZQ== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvkedrudefkedguddvtdcutefuodetggdotefrod ftvfcurfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfgh necuuegrihhlohhuthemuceftddtnecusecvtfgvtghiphhivghnthhsucdlqddutddtmd enucfjughrpefhvfevufffkffojghfggfgsedtkeertdertddtnecuhfhrohhmpefrhhhi lhhiphcuofgtifhrrghthhcuoehphhhilhhiphesphhhihhlihhpmhgtghhrrghthhdrtg homheqnecuggftrfgrthhtvghrnhepjeeuveduleduteelfeevhfehtdeikeelheegheej geetkeefhedukeevhedvgefgnecuffhomhgrihhnpehgihhthhhusgdrtghomhdpkhgrth gvgidrohhrghenucevlhhushhtvghrufhiiigvpedtnecurfgrrhgrmhepmhgrihhlfhhr ohhmpehphhhilhhiphesphhhihhlihhpmhgtghhrrghthhdrtghomh X-ME-Proxy: Feedback-ID: i2b1146f3:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Thu, 16 Nov 2023 14:16:47 -0500 (EST) From: Philip McGrath To: 67019@debbugs.gnu.org Subject: [PATCH v2 15/16] gnu: Add font-katex. Date: Thu, 16 Nov 2023 14:15:53 -0500 Message-ID: <16f8bf6f752e012ec9a61c8cfc6029cb7c46e536.1700161584.git.philip@philipmcgrath.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 67019 Cc: Philip McGrath , Liliana Marie Prikler X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) * gnu/packages/javascript.scm (font-katex): New variable. --- gnu/packages/javascript.scm | 74 +++++++++++++++++++++++++++++++++++++ 1 file changed, 74 insertions(+) diff --git a/gnu/packages/javascript.scm b/gnu/packages/javascript.scm index 97cb3b6270..ee7a48154c 100644 --- a/gnu/packages/javascript.scm +++ b/gnu/packages/javascript.scm @@ -30,9 +30,15 @@ (define-module (gnu packages javascript) #:use-module (gnu packages base) #:use-module (gnu packages bash) #:use-module (gnu packages compression) + #:use-module (gnu packages fontutils) #:use-module (gnu packages java) #:use-module (gnu packages node) + #:use-module (gnu packages perl) + #:use-module (gnu packages python) + #:use-module (gnu packages python-compression) + #:use-module (gnu packages python-xyz) #:use-module (gnu packages readline) + #:use-module (gnu packages tex) #:use-module (gnu packages uglifyjs) #:use-module (gnu packages web) #:use-module (guix gexp) @@ -41,6 +47,7 @@ (define-module (gnu packages javascript) #:use-module (guix git-download) #:use-module (guix build-system ant) #:use-module (guix build-system cmake) + #:use-module (guix build-system copy) #:use-module (guix build-system gnu) #:use-module (guix build-system minify) #:use-module (guix build-system node) @@ -372,6 +379,73 @@ (define-public js-mathjax-for-r-mathjaxr (base32 "1q063l6477z285j6h5wvccp6iswvlp0jmb96sgk32sh0lf7nhknh"))))))))) +(define-public font-katex + (package + (name "font-katex") + (version "0.16.4") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/KaTeX/KaTeX") + (commit (string-append "v" version)))) + (sha256 + (base32 + "0z6y2188lhfv0gk0hp4rm37g6fs99qb3ab2q3n9g76ga9dwxhw3s")) + (snippet + ;; unbundle generated files + #~(begin + (use-modules (guix build utils)) + (delete-file "src/fontMetricsData.js") + (delete-file-recursively "fonts"))) + (file-name (git-file-name "katex" version)))) + (build-system copy-build-system) + (native-inputs (list (texlive-updmap.cfg + (list texlive-amsfonts + texlive-cm + texlive-fonts-rsfs)) + fontforge + mftrace + ttfautohint + perl + perl-json + python + python-fonttools + python-brotli + python-zopfli + which)) + (arguments + (list + #:install-plan + #~`(("fonts/" "share/fonts/truetype/katex/") + ("src/fontMetricsData.js" "share/katex/")) + #:imported-modules + `((guix build union) + ,@%copy-build-system-modules) + #:modules + '((guix build copy-build-system) + (guix build union) + (guix build utils)) + #:phases + #~(modify-phases %standard-phases + (add-before 'install 'build + (lambda args + (invoke "make" "-C" "src/fonts" "all") + (union-build "fonts" + '("src/fonts/ttf" + "src/fonts/woff" + "src/fonts/woff2") + #:symlink copy-file))) + (add-after 'build 'build-metrics + (lambda args + (with-directory-excursion "dockers/fonts" + ;; script assumes it is run from this directory + (invoke "./buildMetrics.sh"))))))) + (home-page "https://katex.org") + (synopsis "Fonts for KaTeX") + (description "This package contains the fonts required for KaTeX.") + (license license:expat))) + (define-public js-commander (package (name "js-commander") -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Thu Nov 16 14:17:13 2023 Received: (at 67019) by debbugs.gnu.org; 16 Nov 2023 19:17:13 +0000 Received: from localhost ([127.0.0.1]:44609 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1r3hrU-0003nC-RO for submit@debbugs.gnu.org; Thu, 16 Nov 2023 14:17:13 -0500 Received: from out4-smtp.messagingengine.com ([66.111.4.28]:60411) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1r3hr6-0003iG-IV for 67019@debbugs.gnu.org; Thu, 16 Nov 2023 14:16:50 -0500 Received: from compute3.internal (compute3.nyi.internal [10.202.2.43]) by mailout.nyi.internal (Postfix) with ESMTP id A72365C016D; Thu, 16 Nov 2023 14:16:48 -0500 (EST) Received: from mailfrontend1 ([10.202.2.162]) by compute3.internal (MEProxy); Thu, 16 Nov 2023 14:16:48 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= philipmcgrath.com; h=cc:cc:content-transfer-encoding :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=1700162208; x=1700248608; bh=cVOIUCojWI MibNt/4/ps5FcqYscpDwqoSyikZmtVKZU=; b=HpF5x55eH/1qWFQcg5YY+ZyrU4 D+t9ZLKxD+ThHh+IysVxaCmioYKGrEb4sU+QByHuC/xYYo1Z4QpSIhcgTWuD7nHX nug5PZrX0HXlS8NKLuIgN9BtpDz+ORWOA26qqf21Z3z3s6MGTFchSdKAox3O99/p cmHd8TsgHZu2uFmL5p7UeMT6+W+B5/t604KYTG9n/vfTbDu5wQEKfEDlfKbpcc6C onBht1UrFA1UIfpyGUiB9Ke2IUaI9Vj/YLKlMByNfGiEi9Le+BTP1wpjhs0+bEOf Mkbu7ybPLYPTxLblBoGzgiNrzK/ORRmsdZeFGNgW5HerKbTv5TEXiS9PGfQw== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:cc:content-transfer-encoding :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=1700162208; x= 1700248608; bh=cVOIUCojWIMibNt/4/ps5FcqYscpDwqoSyikZmtVKZU=; b=x 0JA73z772mGB+5wPpmx/AcTBsS/VMnAJGDwwFejoodDaeOMIF6LeaaWd5N5qcKG3 5yY773seIVNei9VJXnyK1LtKfUY4y2tVy5r6U5YF0wQxXJU4DNtlBZAiNg+bI+s1 jnKtAkKTjX48ngkXTZwBdQoEvDuId6W01+ZF1T0NGmM0dEG7y4V5v9rZl+0phK/3 rzNh0+XMU235zGAlLiIAbCrS2C3wEVGQg3pjqP/iUkmRXfPlaJE3NOkwPhqP8c2u qJg4VCy2g90zTq9RtfKuw9+8SdvTMSlIxO8bli0/yc++LJDvbvP4NgHzHaWkQzw4 L7vdoyTqwnLlZUTn8z2LA== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvkedrudefkedguddvtdcutefuodetggdotefrod ftvfcurfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfgh necuuegrihhlohhuthemuceftddtnecusecvtfgvtghiphhivghnthhsucdlqddutddtmd enucfjughrpefhvfevufffkffojghfggfgsedtkeertdertddtnecuhfhrohhmpefrhhhi lhhiphcuofgtifhrrghthhcuoehphhhilhhiphesphhhihhlihhpmhgtghhrrghthhdrtg homheqnecuggftrfgrthhtvghrnhepleevkeffuedvgfeihefhgeefjeevueekudfhteff ueffieekudehvdeivefgudejnecuffhomhgrihhnpehkrghtvgigrdhorhhgnecuvehluh hsthgvrhfuihiivgeptdenucfrrghrrghmpehmrghilhhfrhhomhepphhhihhlihhpsehp hhhilhhiphhmtghgrhgrthhhrdgtohhm X-ME-Proxy: Feedback-ID: i2b1146f3:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Thu, 16 Nov 2023 14:16:47 -0500 (EST) From: Philip McGrath To: 67019@debbugs.gnu.org Subject: [PATCH v2 16/16] gnu: Add katex. Date: Thu, 16 Nov 2023 14:15:54 -0500 Message-ID: X-Mailer: git-send-email 2.41.0 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 67019 Cc: Philip McGrath , Liliana Marie Prikler X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) * gnu/packages/javascript.scm (katex): New variable. --- gnu/packages/javascript.scm | 255 +++++++++++++++++++++++++++++++++++- 1 file changed, 253 insertions(+), 2 deletions(-) diff --git a/gnu/packages/javascript.scm b/gnu/packages/javascript.scm index ee7a48154c..76a51c22ac 100644 --- a/gnu/packages/javascript.scm +++ b/gnu/packages/javascript.scm @@ -32,6 +32,7 @@ (define-module (gnu packages javascript) #:use-module (gnu packages compression) #:use-module (gnu packages fontutils) #:use-module (gnu packages java) + #:use-module (gnu packages man) #:use-module (gnu packages node) #:use-module (gnu packages perl) #:use-module (gnu packages python) @@ -382,7 +383,7 @@ (define-public js-mathjax-for-r-mathjaxr (define-public font-katex (package (name "font-katex") - (version "0.16.4") + (version "0.16.9") (source (origin (method git-fetch) @@ -391,7 +392,7 @@ (define-public font-katex (commit (string-append "v" version)))) (sha256 (base32 - "0z6y2188lhfv0gk0hp4rm37g6fs99qb3ab2q3n9g76ga9dwxhw3s")) + "1aq8n9s4r15m1fdi4h58qxal4brkafm4xsw6rpz40wqi9454kkgn")) (snippet ;; unbundle generated files #~(begin @@ -446,6 +447,256 @@ (define-public font-katex (description "This package contains the fonts required for KaTeX.") (license license:expat))) +(define-public katex + (package + (inherit font-katex) + (name "katex") + (outputs '("out" "dist")) + (build-system node-build-system) + (native-inputs + (list esbuild + flow-remove-types + help2man + lessc)) + (inputs + (list font-katex + js-commander)) + (arguments + (list + #:tests? #f ; many more dependencies + #:modules + `((guix build node-build-system) + (ice-9 match) + (srfi srfi-1) + (srfi srfi-26) + (guix build utils)) + #:phases + #~(modify-phases %standard-phases + (add-before 'patch-dependencies 'move-sources + (lambda* (#:key inputs #:allow-other-keys) + ;; Our node-build-system doesn't properly respect the "files" + ;; entry in "package.json" to determine which files to install. + ;; This case is particularly egregious because the source + ;; repository also contains the source for the whole katex.org + ;; website. For now, manually do what "files" ought to do. + (mkdir "../guix-source") + (copy-recursively "src" "../guix-source/src") + (copy-recursively "contrib" "../guix-source/contrib") + (for-each (cut install-file <> "../guix-source") + '("README.md" + "LICENSE" + "package.json" + "katex.js" + "cli.js")) + (install-file + (search-input-file inputs "share/katex/fontMetricsData.js") + "../guix-source/src") + (chdir "../guix-source"))) + (add-after 'move-sources 'patch-package-json + (lambda args + (with-atomic-json-file-replacement "package.json" + (match-lambda + (('@ . alist) + (cons '@ + (filter-map + (match-lambda + (((or "devDependencies" "scripts") . _) + #f) + ;; ESBuild can't generate Universal Module Definitions, + ;; so keep our CJS separate from our browser builds: + (("files" . lst) + `("files" "guix-node-cjs/" ,@lst)) + (("main" . "dist/katex.js") + `("main" . "guix-node-cjs/katex.js")) + (("exports" '@ . alist) + `("exports" @ + ,@(map (match-lambda + (("./*" . "./*") + `("./*" . "./*")) + ((lhs '@ . alist) + `(,lhs @ + ,@(map (match-lambda + (("require" . ,str) + (cons + "require" + (string-append + "./guix-node-cjs/" + (substring str + (string-length + "./dist"))))) + (other + other)) + alist)))) + alist))) + (other + other)) + alist))))))) + (add-after 'patch-dependencies 'patch-sources + (lambda* (#:key inputs #:allow-other-keys) + (substitute* "src/SourceLocation.js" + ;; for some reason, the + prefix isn't handled + ;; by flow-remove-types + (("[+](lexer|start|end)" _ name) + name)) + (substitute* "src/fonts.less" + ;; what webpack would do + (("@font-folder: \"\\.\\./fonts\";" orig) + (string-append "@font-folder: \"fonts\"; // " orig))) + (define version + #$(package-version this-package)) + (substitute* "src/katex.less" + (("@version: \"\";" orig) + (string-append "@version: \"" version "\"; // " orig))) + (substitute* "katex.js" + (("version: __VERSION__," orig) + (string-append "version: \"" version "\", // " orig))))) + (add-after 'patch-sources 'erase-types + (lambda args + (invoke "flow-remove-types" + "--sourcemaps" + "--out-dir" "../erased/src/" + "src/") + (invoke "flow-remove-types" + "--sourcemaps" + "--out-dir" "../erased/" + "katex.js") + (invoke "flow-remove-types" + "--sourcemaps" + "--out-dir" "../erased/contrib/" + "contrib/"))) + (add-after 'erase-types 'build-js + (lambda args + (with-directory-excursion "../erased" + ;; ^ avoid "../erased" in generated code + (define (esbuild . args) + (apply invoke `("esbuild" + "--bundle" + "--log-limit=0" + "--platform=neutral" + ,@args))) + (esbuild "--outfile=../guix-source/dist/katex.mjs" + "--format=esm" + "katex.js") + ;; Workaround for different handling of ES6 default export + ;; when generating CJS: + (esbuild "--outfile=katex-cjs.js" + "--format=cjs" + "katex.js") + (with-output-to-file "katex-wrapper.js" + (lambda () + (display + "module.exports = require('./katex-cjs.js').default;\n"))) + (esbuild "--outfile=../guix-source/guix-node-cjs/katex.js" + "--format=cjs" + "katex-wrapper.js") + (esbuild "--outfile=../guix-source/dist/katex.js" + "--format=iife" + "--global-name=katex" + "katex-wrapper.js") + (esbuild "--outfile=../guix-source/dist/katex.min.js" + "--minify" + "--format=iife" + "--global-name=katex" + "katex-wrapper.js") + ;; Build extensions: + (for-each + (match-lambda + ((name export) + ;; The copy-tex extension doesn't actually import katex, + ;; but it's harmless to handle it the same way. + (with-directory-excursion (string-append "contrib/" name) + (esbuild (string-append "--outfile=../../../guix-source" + "/guix-node-cjs/contrib/" + name ".js") + "--format=cjs" + "--external:katex" + (string-append name ".js")) + (substitute* (string-append name ".js") + (("import katex from \"katex\";") + "import katex from \"../katex.mjs\";")) + (esbuild (string-append "--outfile=" name ".mjs") + "--format=esm" + "--external:../katex.mjs" + (string-append name ".js")) + (install-file (string-append name ".mjs") + "../../../guix-source/dist/contrib") + (substitute* (string-append name ".js") + (("import katex") + "// import katex")) + (for-each + (lambda (minify?) + (apply + esbuild + `(,(string-append "--outfile=../../.." + "/guix-source/dist/contrib/" + name + (if minify? ".min" "") + ".js") + "--format=iife" + ,@(if minify? + '("--minify") + '()) + ,@(if export + `("--global-name=guixTmp" + ,(string-append "--banner:js=const " + export + " = (() => {") + "--footer:js=return guixTmp.default;\n})();") + '()) + ,(string-append name ".js")))) + '(#t #f))))) + '(("auto-render" "renderMathInElement") + ("copy-tex" #f) + ("mathtex-script-type" #f) + ("mhchem" #f) + ("render-a11y-string" "renderA11yString")))))) + (add-after 'build-js 'build-css + (lambda args + (invoke "lessc" "src/katex.less" "dist/katex.css"))) + (add-after 'install 'generate-man-page + (lambda args + (invoke "help2man" + "-N" + "-n" "render TeX math to HTML and MathML" + "--output=katex.1" + (string-append #$output "/bin/katex")) + (install-file "katex.1" + (string-append #$output "/share/man/man1")))) + (add-after 'generate-man-page 'install-dist + (lambda* (#:key inputs #:allow-other-keys) + ;; The CSS, fonts, etc. needed for KaTeX, plus the optional + ;; bundled version of the JavaScript for dynamic use in the + ;; browser, are in the 'dist' directory of the Node module. + ;; Putting them in a separate output lets them be used without + ;; retaining a reference to Node and the cli utility. + ;; In Debian, 'dist' is a symlink to /usr/share/javascript/katex: + ;; do likewise to help tools that may need to find it. + (define up-dist-dir + (string-append #$output:dist "/share/javascript")) + (define dist-dir + (string-append up-dist-dir "/katex")) + (mkdir-p up-dist-dir) + (with-directory-excursion + (string-append #$output "/lib/node_modules/katex") + (rename-file "dist" dist-dir) + (symlink dist-dir "dist")) + (with-directory-excursion dist-dir + ;; Link the fonts to where the CSS expects them: + (symlink (search-input-directory inputs + "share/fonts/truetype/katex") + "fonts") + ;; We can't actually minify the CSS, but fake it for anything + ;; that may expect it. With Brotli compression, the difference + ;; is only about 300 bytes anyway. + (symlink "katex.css" "katex.min.css"))))))) + (synopsis "Fast math typesetting for the web") + (description "KaTeX renders TeX math notation to HTML and/or MathML. The +rendered output does not depend on JavaScript, so rendering can be done +entirely ahead-of-time using the @command{katex} command-line tool. When +desired, KaTeX can also be used as a JavaScript library in the browser to +render math dynamically, and it is designed to be fast, even on pages with +hundreds of mathematical expressions."))) + (define-public js-commander (package (name "js-commander") -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Thu Nov 16 15:29:23 2023 Received: (at 67019) by debbugs.gnu.org; 16 Nov 2023 20:29:24 +0000 Received: from localhost ([127.0.0.1]:44677 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1r3izL-0005gk-84 for submit@debbugs.gnu.org; Thu, 16 Nov 2023 15:29:23 -0500 Received: from mail-wr1-x444.google.com ([2a00:1450:4864:20::444]:57855) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1r3izG-0005gN-Oc for 67019@debbugs.gnu.org; Thu, 16 Nov 2023 15:29:21 -0500 Received: by mail-wr1-x444.google.com with SMTP id ffacd0b85a97d-32fa7d15f4eso914329f8f.3 for <67019@debbugs.gnu.org>; Thu, 16 Nov 2023 12:29:18 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1700166553; x=1700771353; darn=debbugs.gnu.org; h=mime-version:user-agent:content-transfer-encoding:references :in-reply-to:date:to:from:subject:message-id:from:to:cc:subject:date :message-id:reply-to; bh=eyYas/f/hAeoPEAQmwhfESpt85gpmvJf/DsHxOe1rpE=; b=g8rlNbwuhc48ObnX6QFyrhmLaHhU4ezA4ZsQfcSWzNB4lE82QQ5Hso4pcGE4OVouS2 tk5TIP8aDFO60yHyfWb4JI+HVBklLobc4fiWEIAuil/WXvyc9WRqVVIKaspdgRC1W/Xi plOhnNxdoybkKLkVXEZbsvGfF60ZC9/xbBUjVxmVqb9Lk2yJMMXnSOICsr9fQI/b+SYU 53JRzxJBX/fBP3gXPG9CmQLEWJh0S7rbVWM4ca/B/tS0Fyb4Di7j/UmGVWcvFwKa2VFj Yuz3Q9tUDOnm+WVihm4aqRlRZZHArD8GtaHK/6RCX/1r/tI7Iff7nrY6D35VJIgczHqL 6uFQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1700166553; x=1700771353; h=mime-version:user-agent:content-transfer-encoding:references :in-reply-to:date:to:from:subject:message-id:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=eyYas/f/hAeoPEAQmwhfESpt85gpmvJf/DsHxOe1rpE=; b=p5MpCGiCzUgosK0Qf4ukI7wz6NBdxsGyus383YzWyUK+B59sYpox0B+2lwQ8k+kcPN wDYI69ZhresAWZBIPXc69KsGksuiyMdo+cCk2rLhmn9yH8vXotU+iVB3YI6s8FplKRcB aF7ODClGZXd7xXU1K6j+OyvPpCROSdd9f2arVXPWsnh2x5XlYIAjorrNzNO2aeOg8803 aY+gffobCSP7w6HFEFQK4/1lbLM8Vxl1VHO2CZBcv1Pe41VDKKfY4lowpJjuZLIFg2eT 2eT9XQ7ZBk170D3b0e7Tj4A2lt3Aztjt8kJGhpz+iU27s93dfY1RcFW/OQYcQM7pye+I fxBw== X-Gm-Message-State: AOJu0YzKcCq+7DYHsCC+2FhpUtg2Op9+dY86AdhJw8uyA74XHgMkzgYt ZEc/PGqPZWnGne4KTxCo7oCKUynqTzyITQ== X-Google-Smtp-Source: AGHT+IEQufQCyjT5hQtrfiD0UvABXr5Ao/ARzmorxNuFQmX6aiywo1iKhRFBWB5N04UKZzV3dFEnmQ== X-Received: by 2002:a5d:584e:0:b0:32d:a4e5:d3d1 with SMTP id i14-20020a5d584e000000b0032da4e5d3d1mr14105678wrf.4.1700166552651; Thu, 16 Nov 2023 12:29:12 -0800 (PST) Received: from lumine.fritz.box (85-127-52-93.dsl.dynamic.surfer.at. [85.127.52.93]) by smtp.gmail.com with ESMTPSA id q16-20020adfcd90000000b0032d9caeab0fsm299668wrj.77.2023.11.16.12.29.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 16 Nov 2023 12:29:11 -0800 (PST) Message-ID: <596d17b7a4895a8a4ae2045133ab694416b0583b.camel@gmail.com> Subject: Re: [PATCH v2 09/16] gnu: Add ocaml-flow-parser. From: Liliana Marie Prikler To: Philip McGrath , 67019@debbugs.gnu.org Date: Thu, 16 Nov 2023 21:29:09 +0100 In-Reply-To: <9e31af33a03e3581f3c124b6b53241a34c31e42e.1700161584.git.philip@philipmcgrath.com> References: <9e31af33a03e3581f3c124b6b53241a34c31e42e.1700161584.git.philip@philipmcgrath.com> Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: base64 User-Agent: Evolution 3.46.4 MIME-Version: 1.0 X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 67019 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) QW0gRG9ubmVyc3RhZywgZGVtIDE2LjExLjIwMjMgdW0gMTQ6MTUgLTA1MDAgc2NocmllYiBQaGls aXAgTWNHcmF0aDoKPiAqIGdudS9wYWNrYWdlcy93ZWIuc2NtIChvY2FtbC1mbG93LXBhcnNlcik6 IE5ldyB2YXJpYWJsZS4KPiAtLS0KPiDCoGdudS9wYWNrYWdlcy93ZWIuc2NtIHwgOTUKPiArKysr KysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKwo+IMKgMSBmaWxlIGNoYW5n ZWQsIDk1IGluc2VydGlvbnMoKykKPiAKPiBkaWZmIC0tZ2l0IGEvZ251L3BhY2thZ2VzL3dlYi5z Y20gYi9nbnUvcGFja2FnZXMvd2ViLnNjbQo+IGluZGV4IDllZmM2ZWJjOWQuLmIyMjJjMmFlNDAg MTAwNjQ0Cj4gLS0tIGEvZ251L3BhY2thZ2VzL3dlYi5zY20KPiArKysgYi9nbnUvcGFja2FnZXMv d2ViLnNjbQo+IEBAIC05Niw2ICs5Niw3IEBAIChkZWZpbmUtbW9kdWxlIChnbnUgcGFja2FnZXMg d2ViKQo+IMKgwqAgIzp1c2UtbW9kdWxlIChndWl4IGJ1aWxkLXN5c3RlbSBjYXJnbykKPiDCoMKg ICM6dXNlLW1vZHVsZSAoZ3VpeCBidWlsZC1zeXN0ZW0gY21ha2UpCj4gwqDCoCAjOnVzZS1tb2R1 bGUgKGd1aXggYnVpbGQtc3lzdGVtIGNvcHkpCj4gK8KgICM6dXNlLW1vZHVsZSAoZ3VpeCBidWls ZC1zeXN0ZW0gZHVuZSkKPiDCoMKgICM6dXNlLW1vZHVsZSAoZ3VpeCBidWlsZC1zeXN0ZW0gZ2xp Yi1vci1ndGspCj4gwqDCoCAjOnVzZS1tb2R1bGUgKGd1aXggYnVpbGQtc3lzdGVtIGdudSkKPiDC oMKgICM6dXNlLW1vZHVsZSAoZ3VpeCBidWlsZC1zeXN0ZW0gZ28pCj4gQEAgLTE3Myw2ICsxNzQs NyBAQCAoZGVmaW5lLW1vZHVsZSAoZ251IHBhY2thZ2VzIHdlYikKPiDCoMKgICM6dXNlLW1vZHVs ZSAoZ251IHBhY2thZ2VzIG5vZGUpCj4gwqDCoCAjOnVzZS1tb2R1bGUgKGdudSBwYWNrYWdlcyBu b2RlLXh5eikKPiDCoMKgICM6dXNlLW1vZHVsZSAoZ251IHBhY2thZ2VzIG5zcykKPiArwqAgIzp1 c2UtbW9kdWxlIChnbnUgcGFja2FnZXMgb2NhbWwpCj4gwqDCoCAjOnVzZS1tb2R1bGUgKGdudSBw YWNrYWdlcyBvcGVubGRhcCkKPiDCoMKgICM6dXNlLW1vZHVsZSAoZ251IHBhY2thZ2VzIG9wZW5z dGFjaykKPiDCoMKgICM6dXNlLW1vZHVsZSAoZ251IHBhY2thZ2VzIHBhY2thZ2UtbWFuYWdlbWVu dCkKPiBAQCAtMTkzOCw2ICsxOTQwLDk5IEBAIChkZWZpbmUtcHVibGljIGVzYnVpbGQKPiDCoGFu ZCBvdGhlciBkYXRhLCBmb3IgZGlzdHJpYnV0aW9uIG9uIHRoZSB3ZWIuIikKPiDCoMKgwqDCoCAo bGljZW5zZSBsaWNlbnNlOmV4cGF0KSkpCj4gwqAKPiArKGRlZmluZS1wdWJsaWMgb2NhbWwtZmxv dy1wYXJzZXIKPiArwqAgKHBhY2thZ2UKPiArwqDCoMKgIChuYW1lICJvY2FtbC1mbG93LXBhcnNl ciIpCj4gK8KgwqDCoCAodmVyc2lvbiAiMC4xNTkuMCIpCj4gK8KgwqDCoCAob3V0cHV0cyAnKCJv dXQiICJqcyIpKQo+ICvCoMKgwqAgKHNvdXJjZQo+ICvCoMKgwqDCoCAob3JpZ2luCj4gK8KgwqDC oMKgwqDCoCAobWV0aG9kIGdpdC1mZXRjaCkKPiArwqDCoMKgwqDCoMKgICh1cmkgKGdpdC1yZWZl cmVuY2UKPiArwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgICh1cmwgImh0dHBzOi8vZ2l0aHViLmNv bS9mYWNlYm9vay9mbG93IikKPiArwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgIChjb21taXQgKHN0 cmluZy1hcHBlbmQgInYiIHZlcnNpb24pKSkpCj4gK8KgwqDCoMKgwqDCoCAoc2hhMjU2Cj4gK8Kg wqDCoMKgwqDCoMKgIChiYXNlMzIKPiAiMWk5c3ZmNjQxczI0bmo0dzZ5OXZ2Z2x6ZzI5aDBscjRu OWE2bXZ3cm45cHN5OXgxbHJpbCIpKQo+ICvCoMKgwqDCoMKgwqAgKGZpbGUtbmFtZSAoZ2l0LWZp bGUtbmFtZSAiZmxvdyIgdmVyc2lvbikpKSkKPiArwqDCoMKgIChidWlsZC1zeXN0ZW0gZHVuZS1i dWlsZC1zeXN0ZW0pCj4gK8KgwqDCoCAocHJvcGFnYXRlZC1pbnB1dHMgKGxpc3Qgb2NhbWwtYmFz ZQo+ICvCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKg wqDCoCBvY2FtbC1jb3JlLWtlcm5lbAo+ICvCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDC oMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoCBvY2FtbC1kdG9hCj4gK8KgwqDCoMKgwqDCoMKgwqDC oMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgIG9jYW1sLXNlZGxleAo+ICvC oMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoCBv Y2FtbC13dGY4KSkKPiArwqDCoMKgIChuYXRpdmUtaW5wdXRzIChsaXN0IGpzLW9mLW9jYW1sCj4g K8KgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoCBvY2FtbGJ1 aWxkCj4gK8KgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoCBv Y2FtbC1maW5kbGliCj4gK8KgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDC oMKgwqDCoCBvY2FtbC1vdW5pdDIKPiArwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDC oMKgwqDCoMKgwqDCoMKgIG9jYW1sLXBweC1kZXJpdmluZwo+ICvCoMKgwqDCoMKgwqDCoMKgwqDC oMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqAgb2NhbWwtcHB4LWdlbi1yZWMKPiArwqDCoMKg wqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgIG9jYW1sLXZpc2l0b3Jz KSkKPiArwqDCoMKgIChhcmd1bWVudHMKPiArwqDCoMKgwqAgKGxpc3QKPiArwqDCoMKgwqDCoCAj OnRlc3RzPyAjZiA7IHRlc3RzIG5lZWQgbHd0X3BweAo+ICvCoMKgwqDCoMKgICM6cGFja2FnZSAi Zmxvd19wYXJzZXIiCj4gK8KgwqDCoMKgwqAgIzpwaGFzZXMKPiArwqDCoMKgwqDCoCAjfihtb2Rp ZnktcGhhc2VzICVzdGFuZGFyZC1waGFzZXMKPiArwqDCoMKgwqDCoMKgwqDCoMKgIChhZGQtYmVm b3JlICdidWlsZCAnY2hkaXIKPiArwqDCoMKgwqDCoMKgwqDCoMKgwqDCoCAobGFtYmRhIGFyZ3MK PiArwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqAgKGNoZGlyICJzcmMvcGFyc2VyIikpKQo+ICvC oMKgwqDCoMKgwqDCoMKgwqAgKGFkZC1iZWZvcmUgJ2J1aWxkICdwYXRjaC1zb3VyY2UKPiArwqDC oMKgwqDCoMKgwqDCoMKgwqDCoCAobGFtYmRhIGFyZ3MKPiArwqDCoMKgwqDCoMKgwqDCoMKgwqDC oMKgwqAgOzsgQXZvaWQgZXJyb3JzIHdpdGggbmV3ZXIgT0NhbWw6Cj4gK8KgwqDCoMKgwqDCoMKg wqDCoMKgwqDCoMKgIDs7ICJFcnJvciAod2FybmluZyAxNiBbdW5lcmFzYWJsZS1vcHRpb25hbC0K PiBhcmd1bWVudF0pOiIKPiArwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqAgOzvCoMKgICIgdGhp cyBvcHRpb25hbCBhcmd1bWVudCBjYW5ub3QgYmUgZXJhc2VkLiIKPiArwqDCoMKgwqDCoMKgwqDC oMKgwqDCoMKgwqAgOzsgIkVycm9yICh3YXJuaW5nIDY5IFt1bnVzZWQtZmllbGRdKToiCj4gK8Kg wqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgIDs7wqDCoCAiIG11dGFibGUgcmVjb3JkIGZpZWxkIGJ1 ZiBpcyBuZXZlciBtdXRhdGVkLiIKPiArwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqAgOzsgIkVy cm9yICh3YXJuaW5nIDcwIFttaXNzaW5nLW1saV0pOiBDYW5ub3QgZmluZAo+IGludGVyZmFjZSBm aWxlLiIKPiArwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqAgKHN1YnN0aXR1dGUqICJfdGFncyIK PiArwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgICgoIjxcXCpcXC5tbFxcKj46IHdhcm5b KF0tMzlbKV0iKQo+ICvCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoCAiPCoubWwqPjog d2FybigtMTYtMzktNzApIikpCj4gK8KgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgIChzdWJzdGl0 dXRlKiAiLi4vLi4vX3RhZ3MiCj4gK8KgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoCAoKCI8 XFwqXFwqL1xcKi5tbFxcKj46ICIpCj4gK8KgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKg ICI8KiovKi5tbCo+OiB3YXJuKC02OSksICIpKQo+ICvCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDC oCA7OyBEZXByZWNhdGlvbiBvZiBKcy5VbnNhZmUudmFyaWFibGUsIEpzLkVycm9yLAo+IEpzLnJh aXNlX2pzX2Vycm9yCj4gK8KgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgIChzdWJzdGl0dXRlKiAi Zmxvd19wYXJzZXJfanMubWwiCj4gK8KgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoCAoKCJK c1xcLlVuc2FmZVxcLnZhcmlhYmxlIikKPiArwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKg wqAgIkpzLlVuc2FmZS5wdXJlX2pzX2V4cHIiKSkKPiArwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKg wqAgKHN1YnN0aXR1dGUqICJmbG93X3BhcnNlcl9kb3RfanMubWwiCj4gK8KgwqDCoMKgwqDCoMKg wqDCoMKgwqDCoMKgwqDCoCAoKCJKc1xcLkVycm9yIikKPiArwqDCoMKgwqDCoMKgwqDCoMKgwqDC oMKgwqDCoMKgwqAgIkpzX29mX29jYW1sLkpzX2Vycm9yLkV4biIpCj4gK8KgwqDCoMKgwqDCoMKg wqDCoMKgwqDCoMKgwqDCoCAoKCJKc1xcLnJhaXNlX2pzX2Vycm9yIikKPiArwqDCoMKgwqDCoMKg wqDCoMKgwqDCoMKgwqDCoMKgwqAgIkpzX29mX29jYW1sLkpzX2Vycm9yLnJhaXNlXyIpKSkpCj4g K8KgwqDCoMKgwqDCoMKgwqDCoCAocmVwbGFjZSAnYnVpbGQKPiArwqDCoMKgwqDCoMKgwqDCoMKg wqDCoCAobGFtYmRhIGFyZ3MKPiArwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqAgKGludm9rZSAi bWFrZSIKPiArwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgIChzdHJp bmctYXBwZW5kICJDQz0iICMkKGNjLWZvci10YXJnZXQpKQo+ICvCoMKgwqDCoMKgwqDCoMKgwqDC oMKgwqDCoMKgwqDCoMKgwqDCoMKgwqAgImJ1aWxkLXBhcnNlciIpKSkKWW91IG1pZ2h0IHdhbnQg dG8gbGV0LWJpbmQgKGludm9rZSAibWFrZSIgIkNDPS4uLiIgPD4pIHNvIHRoYXQgeW91IGNhbgpj YWxsIGl0IHdpdGggYSBzaW5nbGUgYXJndW1lbnQgaW4gdGhpcyBhbmQgb3RoZXIgcGhhc2VzLgo+ ICvCoMKgwqDCoMKgwqDCoMKgwqAgKGFkZC1hZnRlciAnYnVpbGQgJ2J1aWxkLWpzCj4gK8KgwqDC oMKgwqDCoMKgwqDCoMKgwqAgKGxhbWJkYSBhcmdzCj4gK8KgwqDCoMKgwqDCoMKgwqDCoMKgwqDC oMKgIChpbnZva2UgIm1ha2UiCj4gK8KgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDC oMKgwqDCoCAoc3RyaW5nLWFwcGVuZCAiQ0M9IiAjJChjYy1mb3ItdGFyZ2V0KSkKPiArwqDCoMKg wqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgICJqcyIpKSkKPiArwqDCoMKgwqDC oMKgwqDCoMKgIChyZXBsYWNlICdjaGVjawo+ICvCoMKgwqDCoMKgwqDCoMKgwqDCoMKgIChsYW1i ZGEqICgjOmtleSB0ZXN0cz8gIzphbGxvdy1vdGhlci1rZXlzKQo+ICvCoMKgwqDCoMKgwqDCoMKg wqDCoMKgwqDCoCAod2hlbiB0ZXN0cz8KPiArwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKg IChpbnZva2UgIm1ha2UiCj4gK8KgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKg wqDCoMKgwqAgKHN0cmluZy1hcHBlbmQgIkNDPSIgIyQoY2MtZm9yLXRhcmdldCkpCj4gK8KgwqDC oMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqAgInRlc3Qtb2NhbWwiKSkp KQo+ICvCoMKgwqDCoMKgwqDCoMKgwqAgKHJlcGxhY2UgJ2luc3RhbGwKPiArwqDCoMKgwqDCoMKg wqDCoMKgwqDCoCAobGFtYmRhIGFyZ3MKPiArwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqAgKGlu dm9rZSAibWFrZSIKPiArwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKg IChzdHJpbmctYXBwZW5kICJDQz0iICMkKGNjLWZvci10YXJnZXQpKQo+ICvCoMKgwqDCoMKgwqDC oMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqAgIm9jYW1sZmluZC1pbnN0YWxsIikpKQo+ICvC oMKgwqDCoMKgwqDCoMKgwqAgKGFkZC1hZnRlciAnaW5zdGFsbCAnaW5zdGFsbC1qcwo+ICvCoMKg wqDCoMKgwqDCoMKgwqDCoMKgIChsYW1iZGEgYXJncwo+ICvCoMKgwqDCoMKgwqDCoMKgwqDCoMKg wqDCoCAoaW5zdGFsbC1maWxlICJmbG93X3BhcnNlci5qcyIKPiArwqDCoMKgwqDCoMKgwqDCoMKg wqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgIChzdHJpbmctYXBwZW5kICMkb3V0 cHV0OmpzCj4gK8KgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDC oMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoAo+ICIvc2hhcmUvamF2YXNjcmlw dC9mbG93IikpKSkpKSkKPiArwqDCoMKgIChwcm9wZXJ0aWVzIGAoKHVwc3RyZWFtLW5hbWUgLiAi Zmxvd19wYXJzZXIiKSkpCj4gK8KgwqDCoCAoaG9tZS1wYWdlICJodHRwczovL2Zsb3cub3JnIikK PiArwqDCoMKgIChzeW5vcHNpcyAiUGFyc2VyIGZvciB0aGUgRmxvdyBKYXZhU2NyaXB0IHR5cGUg c3lzdGVtIikKPiArwqDCoMKgIChkZXNjcmlwdGlvbiAiRmxvdyBpcyBhIGdyYWR1YWwgdHlwZSBz eXN0ZW0gZm9yIEphdmFTY3JpcHQuwqAKPiBUaGlzIHBhY2thZ2UKPiArcHJvdmlkZXMgdGhlIEZs b3cgcGFyc2VyLCB3aGljaCBpcyBhbiBPQ2FtbCBsaWJyYXJ5IHRoYXQgY2FuIGFsc28gYmUKPiBj b21waWxlZAo+ICt0byBKYXZhU2NyaXB0LiIpCj4gK8KgwqDCoCAobGljZW5zZSBsaWNlbnNlOmV4 cGF0KSkpCj4gKwpDaGVlcnMK