From patchwork Thu Nov 9 16:12:18 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Philip McGrath X-Patchwork-Id: 56137 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id D4A6627BBE2; Thu, 9 Nov 2023 16:15:56 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id D374927BBE9 for ; Thu, 9 Nov 2023 16:15:55 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1r17gv-00011h-4h; Thu, 09 Nov 2023 11:15:37 -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 1r17gh-0000ul-Ik for guix-patches@gnu.org; Thu, 09 Nov 2023 11:15:31 -0500 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1r17gh-0003nl-5l for guix-patches@gnu.org; Thu, 09 Nov 2023 11:15:23 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1r17hK-0004Hw-BH for guix-patches@gnu.org; Thu, 09 Nov 2023 11:16:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#67019] [PATCH 01/16] gnu: Add node-is-what. Resent-From: Philip McGrath Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 09 Nov 2023 16:16:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 67019 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 67019@debbugs.gnu.org Cc: Philip McGrath Received: via spool by 67019-submit@debbugs.gnu.org id=B67019.169954650316398 (code B ref 67019); Thu, 09 Nov 2023 16:16:02 +0000 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 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 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * 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))) From patchwork Thu Nov 9 16:26:24 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Philip McGrath X-Patchwork-Id: 56139 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id D556427BBE2; Thu, 9 Nov 2023 16:27:55 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 58C8527BBEA for ; Thu, 9 Nov 2023 16:27:53 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1r17sN-0007Fe-75; Thu, 09 Nov 2023 11:27:27 -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 1r17sL-0007F5-LI for guix-patches@gnu.org; Thu, 09 Nov 2023 11:27:25 -0500 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1r17sL-00065d-DB for guix-patches@gnu.org; Thu, 09 Nov 2023 11:27:25 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1r17sv-0004af-RH; Thu, 09 Nov 2023 11:28:01 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#67019] [PATCH 02/16] gnu: Add node-copy-anything. Resent-From: Philip McGrath Original-Sender: "Debbugs-submit" Resent-CC: philip@philipmcgrath.com, julien@lepiller.eu, pukkamustard@posteo.net, guix-patches@gnu.org Resent-Date: Thu, 09 Nov 2023 16:28:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 67019 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 67019@debbugs.gnu.org Cc: Philip McGrath , Philip McGrath , Julien Lepiller , pukkamustard X-Debbugs-Original-Xcc: Philip McGrath , Julien Lepiller , pukkamustard Received: via spool by 67019-submit@debbugs.gnu.org id=B67019.169954727617610 (code B ref 67019); Thu, 09 Nov 2023 16:28:01 +0000 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 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-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * 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))) From patchwork Thu Nov 9 16:26:25 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Philip McGrath X-Patchwork-Id: 56138 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 967A427BBE2; Thu, 9 Nov 2023 16:27:55 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 4904827BBE9 for ; Thu, 9 Nov 2023 16:27:53 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1r17sP-0007HL-9N; Thu, 09 Nov 2023 11:27:29 -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 1r17sM-0007FR-LK for guix-patches@gnu.org; Thu, 09 Nov 2023 11:27:26 -0500 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1r17sM-00067E-DN for guix-patches@gnu.org; Thu, 09 Nov 2023 11:27:26 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1r17sw-0004as-Ek; Thu, 09 Nov 2023 11:28:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#67019] [PATCH 03/16] gnu: Add lessc. Resent-From: Philip McGrath Original-Sender: "Debbugs-submit" Resent-CC: philip@philipmcgrath.com, julien@lepiller.eu, pukkamustard@posteo.net, guix-patches@gnu.org Resent-Date: Thu, 09 Nov 2023 16:28:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 67019 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 67019@debbugs.gnu.org Cc: Philip McGrath , Philip McGrath , Julien Lepiller , pukkamustard X-Debbugs-Original-Xcc: Philip McGrath , Julien Lepiller , pukkamustard Received: via spool by 67019-submit@debbugs.gnu.org id=B67019.169954727917630 (code B ref 67019); Thu, 09 Nov 2023 16:28:02 +0000 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 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-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * 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 From patchwork Thu Nov 9 16:26:26 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Philip McGrath X-Patchwork-Id: 56142 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id A71BF27BBEA; Thu, 9 Nov 2023 16:28:48 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 970B027BBE2 for ; Thu, 9 Nov 2023 16:28:47 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1r17tL-00084W-Vx; Thu, 09 Nov 2023 11:28:28 -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 1r17tK-00083Q-VC for guix-patches@gnu.org; Thu, 09 Nov 2023 11:28:26 -0500 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1r17tK-0006aC-Ms for guix-patches@gnu.org; Thu, 09 Nov 2023 11:28:26 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1r17tv-0004fS-Qr; Thu, 09 Nov 2023 11:29:03 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#67019] [PATCH 04/16] gnu: Add ocaml-wtf8. Resent-From: Philip McGrath Original-Sender: "Debbugs-submit" Resent-CC: philip@philipmcgrath.com, julien@lepiller.eu, pukkamustard@posteo.net, guix-patches@gnu.org Resent-Date: Thu, 09 Nov 2023 16:29:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 67019 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 67019@debbugs.gnu.org Cc: Philip McGrath , Philip McGrath , Julien Lepiller , pukkamustard X-Debbugs-Original-Xcc: Philip McGrath , Julien Lepiller , pukkamustard Received: via spool by 67019-submit@debbugs.gnu.org id=B67019.169954729117768 (code B ref 67019); Thu, 09 Nov 2023 16:29:03 +0000 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 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-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * 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") From patchwork Thu Nov 9 16:26:27 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Philip McGrath X-Patchwork-Id: 56144 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 2F72727BBE2; Thu, 9 Nov 2023 16:28:56 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 9134A27BBEA for ; Thu, 9 Nov 2023 16:28:54 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1r17tK-00083F-Nn; Thu, 09 Nov 2023 11:28:26 -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 1r17tJ-00081q-9u for guix-patches@gnu.org; Thu, 09 Nov 2023 11:28:25 -0500 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1r17tJ-0006Zh-2F for guix-patches@gnu.org; Thu, 09 Nov 2023 11:28:25 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1r17tu-0004ev-Bb; Thu, 09 Nov 2023 11:29:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#67019] [PATCH 05/16] gnu: Add ocaml-visitors. Resent-From: Philip McGrath Original-Sender: "Debbugs-submit" Resent-CC: philip@philipmcgrath.com, julien@lepiller.eu, pukkamustard@posteo.net, guix-patches@gnu.org Resent-Date: Thu, 09 Nov 2023 16:29:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 67019 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 67019@debbugs.gnu.org Cc: Philip McGrath , Philip McGrath , Julien Lepiller , pukkamustard X-Debbugs-Original-Xcc: Philip McGrath , Julien Lepiller , pukkamustard Received: via spool by 67019-submit@debbugs.gnu.org id=B67019.169954728217670 (code B ref 67019); Thu, 09 Nov 2023 16:29:02 +0000 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 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-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * 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") From patchwork Thu Nov 9 16:26:28 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Philip McGrath X-Patchwork-Id: 56152 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 60C0527BBEA; Thu, 9 Nov 2023 16:29:26 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id E518C27BBE2 for ; Thu, 9 Nov 2023 16:29:25 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1r17tM-00084o-3t; Thu, 09 Nov 2023 11:28:28 -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 1r17tJ-00082E-O4 for guix-patches@gnu.org; Thu, 09 Nov 2023 11:28:25 -0500 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1r17tJ-0006Zn-G0 for guix-patches@gnu.org; Thu, 09 Nov 2023 11:28:25 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1r17tu-0004f1-Oi; Thu, 09 Nov 2023 11:29:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#67019] [PATCH 06/16] gnu: Add ocaml-ppx-gen-rec. Resent-From: Philip McGrath Original-Sender: "Debbugs-submit" Resent-CC: philip@philipmcgrath.com, julien@lepiller.eu, pukkamustard@posteo.net, guix-patches@gnu.org Resent-Date: Thu, 09 Nov 2023 16:29:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 67019 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 67019@debbugs.gnu.org Cc: Philip McGrath , Philip McGrath , Julien Lepiller , pukkamustard X-Debbugs-Original-Xcc: Philip McGrath , Julien Lepiller , pukkamustard Received: via spool by 67019-submit@debbugs.gnu.org id=B67019.169954728617726 (code B ref 67019); Thu, 09 Nov 2023 16:29:02 +0000 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 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-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * 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") From patchwork Thu Nov 9 16:26:29 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Philip McGrath X-Patchwork-Id: 56145 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id DCC8027BBEA; Thu, 9 Nov 2023 16:29:04 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 6150527BBE2 for ; Thu, 9 Nov 2023 16:29:04 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1r17tO-000883-AH; Thu, 09 Nov 2023 11:28:30 -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 1r17tK-00083P-St for guix-patches@gnu.org; Thu, 09 Nov 2023 11:28:26 -0500 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1r17tK-0006aB-LA for guix-patches@gnu.org; Thu, 09 Nov 2023 11:28:26 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1r17tx-0004gB-Pz; Thu, 09 Nov 2023 11:29:05 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#67019] [PATCH 07/16] gnu: Add ocaml-dtoa. Resent-From: Philip McGrath Original-Sender: "Debbugs-submit" Resent-CC: philip@philipmcgrath.com, julien@lepiller.eu, pukkamustard@posteo.net, guix-patches@gnu.org Resent-Date: Thu, 09 Nov 2023 16:29:05 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 67019 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 67019@debbugs.gnu.org Cc: Philip McGrath , Philip McGrath , Julien Lepiller , pukkamustard X-Debbugs-Original-Xcc: Philip McGrath , Julien Lepiller , pukkamustard Received: via spool by 67019-submit@debbugs.gnu.org id=B67019.169954729317806 (code B ref 67019); Thu, 09 Nov 2023 16:29:05 +0000 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 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-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * 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") From patchwork Thu Nov 9 16:26:30 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Philip McGrath X-Patchwork-Id: 56143 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 9E22127BBEC; Thu, 9 Nov 2023 16:28:54 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id B3A4427BBE2 for ; Thu, 9 Nov 2023 16:28:53 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1r17tN-00087j-Pm; Thu, 09 Nov 2023 11:28:29 -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 1r17tL-00083l-C0 for guix-patches@gnu.org; Thu, 09 Nov 2023 11:28:27 -0500 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1r17tL-0006aN-4O for guix-patches@gnu.org; Thu, 09 Nov 2023 11:28:27 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1r17tw-0004fb-8L; Thu, 09 Nov 2023 11:29:04 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#67019] [PATCH 08/16] gnu: Add node-vlq. Resent-From: Philip McGrath Original-Sender: "Debbugs-submit" Resent-CC: philip@philipmcgrath.com, julien@lepiller.eu, pukkamustard@posteo.net, guix-patches@gnu.org Resent-Date: Thu, 09 Nov 2023 16:29:04 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 67019 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 67019@debbugs.gnu.org Cc: Philip McGrath , Philip McGrath , Julien Lepiller , pukkamustard X-Debbugs-Original-Xcc: Philip McGrath , Julien Lepiller , pukkamustard Received: via spool by 67019-submit@debbugs.gnu.org id=B67019.169954729117777 (code B ref 67019); Thu, 09 Nov 2023 16:29:04 +0000 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 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-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * 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))) From patchwork Thu Nov 9 16:26:31 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Philip McGrath X-Patchwork-Id: 56147 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id C579227BBEA; Thu, 9 Nov 2023 16:29:14 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id C209127BBE2 for ; Thu, 9 Nov 2023 16:29:13 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1r17tN-00087W-G9; Thu, 09 Nov 2023 11:28:29 -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 1r17tM-00085z-I8 for guix-patches@gnu.org; Thu, 09 Nov 2023 11:28:28 -0500 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1r17tM-0006ae-A2 for guix-patches@gnu.org; Thu, 09 Nov 2023 11:28:28 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1r17tx-0004fz-7a; Thu, 09 Nov 2023 11:29:05 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#67019] [PATCH 09/16] gnu: Add ocaml-flow-parser. Resent-From: Philip McGrath Original-Sender: "Debbugs-submit" Resent-CC: philip@philipmcgrath.com, julien@lepiller.eu, pukkamustard@posteo.net, guix-patches@gnu.org Resent-Date: Thu, 09 Nov 2023 16:29:05 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 67019 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 67019@debbugs.gnu.org Cc: Philip McGrath , Philip McGrath , Julien Lepiller , pukkamustard X-Debbugs-Original-Xcc: Philip McGrath , Julien Lepiller , pukkamustard Received: via spool by 67019-submit@debbugs.gnu.org id=B67019.169954729317793 (code B ref 67019); Thu, 09 Nov 2023 16:29:05 +0000 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 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-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * 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") From patchwork Thu Nov 9 16:26:32 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Philip McGrath X-Patchwork-Id: 56146 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 6F94227BBE2; Thu, 9 Nov 2023 16:29:11 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 706C827BBE9 for ; Thu, 9 Nov 2023 16:29:09 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1r17tL-00084Q-Vz; Thu, 09 Nov 2023 11:28:28 -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 1r17tK-00082a-4X for guix-patches@gnu.org; Thu, 09 Nov 2023 11:28:26 -0500 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1r17tJ-0006a0-Sr for guix-patches@gnu.org; Thu, 09 Nov 2023 11:28:25 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1r17tv-0004fB-3l; Thu, 09 Nov 2023 11:29:03 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#67019] [PATCH 10/16] gnu: Add node-flow-parser. Resent-From: Philip McGrath Original-Sender: "Debbugs-submit" Resent-CC: philip@philipmcgrath.com, julien@lepiller.eu, pukkamustard@posteo.net, guix-patches@gnu.org Resent-Date: Thu, 09 Nov 2023 16:29:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 67019 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 67019@debbugs.gnu.org Cc: Philip McGrath , Philip McGrath , Julien Lepiller , pukkamustard X-Debbugs-Original-Xcc: Philip McGrath , Julien Lepiller , pukkamustard Received: via spool by 67019-submit@debbugs.gnu.org id=B67019.169954728717745 (code B ref 67019); Thu, 09 Nov 2023 16:29:03 +0000 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 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-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * 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") From patchwork Thu Nov 9 16:26:33 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Philip McGrath X-Patchwork-Id: 56140 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 63A9A27BBEA; Thu, 9 Nov 2023 16:28:33 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 54DAB27BBE2 for ; Thu, 9 Nov 2023 16:28:32 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1r17tL-00083x-Kk; Thu, 09 Nov 2023 11:28:27 -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 1r17tK-00082X-2G for guix-patches@gnu.org; Thu, 09 Nov 2023 11:28:26 -0500 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1r17tJ-0006Zx-Qp for guix-patches@gnu.org; Thu, 09 Nov 2023 11:28:25 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1r17tv-0004fK-FC; Thu, 09 Nov 2023 11:29:03 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#67019] [PATCH 11/16] gnu: Add flow-remove-types. Resent-From: Philip McGrath Original-Sender: "Debbugs-submit" Resent-CC: philip@philipmcgrath.com, julien@lepiller.eu, pukkamustard@posteo.net, guix-patches@gnu.org Resent-Date: Thu, 09 Nov 2023 16:29:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 67019 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 67019@debbugs.gnu.org Cc: Philip McGrath , Philip McGrath , Julien Lepiller , pukkamustard X-Debbugs-Original-Xcc: Philip McGrath , Julien Lepiller , pukkamustard Received: via spool by 67019-submit@debbugs.gnu.org id=B67019.169954728717752 (code B ref 67019); Thu, 09 Nov 2023 16:29:03 +0000 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 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-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * 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") From patchwork Thu Nov 9 16:26:34 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Philip McGrath X-Patchwork-Id: 56150 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id CA05E27BBE2; Thu, 9 Nov 2023 16:29:20 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 4095527BBEB for ; Thu, 9 Nov 2023 16:29:19 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1r17tM-00085h-FU; Thu, 09 Nov 2023 11:28:28 -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 1r17tJ-00082G-Oc for guix-patches@gnu.org; Thu, 09 Nov 2023 11:28:25 -0500 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1r17tJ-0006Zo-Gi for guix-patches@gnu.org; Thu, 09 Nov 2023 11:28:25 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1r17tw-0004fm-MX; Thu, 09 Nov 2023 11:29:04 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#67019] [PATCH 12/16] gnu: js-commander: Update to 11.1.0. Resent-From: Philip McGrath Original-Sender: "Debbugs-submit" Resent-CC: philip@philipmcgrath.com, julien@lepiller.eu, pukkamustard@posteo.net, guix-patches@gnu.org Resent-Date: Thu, 09 Nov 2023 16:29:04 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 67019 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 67019@debbugs.gnu.org Cc: Philip McGrath , Philip McGrath , Julien Lepiller , pukkamustard X-Debbugs-Original-Xcc: Philip McGrath , Julien Lepiller , pukkamustard Received: via spool by 67019-submit@debbugs.gnu.org id=B67019.169954729217785 (code B ref 67019); Thu, 09 Nov 2023 16:29:04 +0000 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 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-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * 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)) From patchwork Thu Nov 9 16:26:35 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Philip McGrath X-Patchwork-Id: 56148 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 72E5727BBEA; Thu, 9 Nov 2023 16:29:16 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id B417C27BBE2 for ; Thu, 9 Nov 2023 16:29:15 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1r17tP-00088H-5J; Thu, 09 Nov 2023 11:28:31 -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 1r17tN-00087Y-GP for guix-patches@gnu.org; Thu, 09 Nov 2023 11:28:29 -0500 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1r17tN-0006al-7Y for guix-patches@gnu.org; Thu, 09 Nov 2023 11:28:29 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1r17ty-0004gL-8r; Thu, 09 Nov 2023 11:29:06 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#67019] [PATCH 13/16] gnu: js-commander: Install as a node module. Resent-From: Philip McGrath Original-Sender: "Debbugs-submit" Resent-CC: philip@philipmcgrath.com, julien@lepiller.eu, pukkamustard@posteo.net, guix-patches@gnu.org Resent-Date: Thu, 09 Nov 2023 16:29:06 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 67019 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 67019@debbugs.gnu.org Cc: Philip McGrath , Philip McGrath , Julien Lepiller , pukkamustard X-Debbugs-Original-Xcc: Philip McGrath , Julien Lepiller , pukkamustard Received: via spool by 67019-submit@debbugs.gnu.org id=B67019.169954729817828 (code B ref 67019); Thu, 09 Nov 2023 16:29:06 +0000 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 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-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches 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") From patchwork Thu Nov 9 16:26:36 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Philip McGrath X-Patchwork-Id: 56151 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 81BBF27BBE9; Thu, 9 Nov 2023 16:29:21 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id DB41A27BBEA for ; Thu, 9 Nov 2023 16:29:20 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1r17tN-00087m-UP; Thu, 09 Nov 2023 11:28:29 -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 1r17tL-000848-QH for guix-patches@gnu.org; Thu, 09 Nov 2023 11:28:27 -0500 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1r17tL-0006aT-Hd for guix-patches@gnu.org; Thu, 09 Nov 2023 11:28:27 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1r17ty-0004gV-ND; Thu, 09 Nov 2023 11:29:06 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#67019] [PATCH 14/16] gnu: Add mftrace. Resent-From: Philip McGrath Original-Sender: "Debbugs-submit" Resent-CC: philip@philipmcgrath.com, julien@lepiller.eu, pukkamustard@posteo.net, guix-patches@gnu.org Resent-Date: Thu, 09 Nov 2023 16:29:06 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 67019 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 67019@debbugs.gnu.org Cc: Philip McGrath , Philip McGrath , Julien Lepiller , pukkamustard X-Debbugs-Original-Xcc: Philip McGrath , Julien Lepiller , pukkamustard Received: via spool by 67019-submit@debbugs.gnu.org id=B67019.169954730017842 (code B ref 67019); Thu, 09 Nov 2023 16:29:06 +0000 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 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-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * 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") From patchwork Thu Nov 9 16:26:37 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Philip McGrath X-Patchwork-Id: 56149 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 9FBC227BBEA; Thu, 9 Nov 2023 16:29:20 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 18CC327BBE2 for ; Thu, 9 Nov 2023 16:29:19 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1r17tP-00088r-JC; Thu, 09 Nov 2023 11:28:31 -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 1r17tM-00085Q-7F for guix-patches@gnu.org; Thu, 09 Nov 2023 11:28:28 -0500 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1r17tL-0006aZ-V4 for guix-patches@gnu.org; Thu, 09 Nov 2023 11:28:27 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1r17tz-0004gg-4m; Thu, 09 Nov 2023 11:29:07 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#67019] [PATCH 15/16] gnu: Add font-katex. Resent-From: Philip McGrath Original-Sender: "Debbugs-submit" Resent-CC: philip@philipmcgrath.com, julien@lepiller.eu, pukkamustard@posteo.net, guix-patches@gnu.org Resent-Date: Thu, 09 Nov 2023 16:29:07 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 67019 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 67019@debbugs.gnu.org Cc: Philip McGrath , Philip McGrath , Julien Lepiller , pukkamustard X-Debbugs-Original-Xcc: Philip McGrath , Julien Lepiller , pukkamustard Received: via spool by 67019-submit@debbugs.gnu.org id=B67019.169954730017850 (code B ref 67019); Thu, 09 Nov 2023 16:29:07 +0000 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 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-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * 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") From patchwork Thu Nov 9 16:26:38 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Philip McGrath X-Patchwork-Id: 56141 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 891DB27BBEA; Thu, 9 Nov 2023 16:28:47 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 6A8D627BBE2 for ; Thu, 9 Nov 2023 16:28:46 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1r17tS-0008D1-9O; Thu, 09 Nov 2023 11:28:34 -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 1r17tP-00088M-53 for guix-patches@gnu.org; Thu, 09 Nov 2023 11:28:31 -0500 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1r17tO-0006ay-Sn for guix-patches@gnu.org; Thu, 09 Nov 2023 11:28:30 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1r17tz-0004gr-KK; Thu, 09 Nov 2023 11:29:07 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#67019] [PATCH 16/16] gnu: Add katex. Resent-From: Philip McGrath Original-Sender: "Debbugs-submit" Resent-CC: philip@philipmcgrath.com, julien@lepiller.eu, pukkamustard@posteo.net, guix-patches@gnu.org Resent-Date: Thu, 09 Nov 2023 16:29:07 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 67019 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 67019@debbugs.gnu.org Cc: Philip McGrath , Philip McGrath , Julien Lepiller , pukkamustard X-Debbugs-Original-Xcc: Philip McGrath , Julien Lepiller , pukkamustard Received: via spool by 67019-submit@debbugs.gnu.org id=B67019.169954730117857 (code B ref 67019); Thu, 09 Nov 2023 16:29:07 +0000 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 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-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * 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")