From patchwork Thu Nov 16 19:15:39 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Philip McGrath X-Patchwork-Id: 56523 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 4552B27BBE2; Thu, 16 Nov 2023 19:17:39 +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 F0CDF27BBE9 for ; Thu, 16 Nov 2023 19:17:36 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1r3hrN-0003YT-6W; Thu, 16 Nov 2023 14:17:05 -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 1r3hrK-0003XZ-SN for guix-patches@gnu.org; Thu, 16 Nov 2023 14:17:02 -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 1r3hrK-0003DI-Jj for guix-patches@gnu.org; Thu, 16 Nov 2023 14:17:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1r3hrK-0003lC-B7 for guix-patches@gnu.org; Thu, 16 Nov 2023 14:17:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#67019] [PATCH v2 01/16] gnu: Add node-is-what. Resent-From: Philip McGrath Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 16 Nov 2023 19:17: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 , Liliana Marie Prikler Received: via spool by 67019-submit@debbugs.gnu.org id=B67019.170016220514323 (code B ref 67019); Thu, 16 Nov 2023 19:17:02 +0000 Received: (at 67019) by debbugs.gnu.org; 16 Nov 2023 19:16:45 +0000 Received: from localhost ([127.0.0.1]:44532 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1r3hr2-0003io-46 for submit@debbugs.gnu.org; Thu, 16 Nov 2023 14:16:44 -0500 Received: from out4-smtp.messagingengine.com ([66.111.4.28]:46227) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1r3hqy-0003i3-Li for 67019@debbugs.gnu.org; Thu, 16 Nov 2023 14:16:41 -0500 Received: from compute7.internal (compute7.nyi.internal [10.202.2.48]) by mailout.nyi.internal (Postfix) with ESMTP id B932C5C016D; Thu, 16 Nov 2023 14:16:35 -0500 (EST) Received: from mailfrontend1 ([10.202.2.162]) by compute7.internal (MEProxy); Thu, 16 Nov 2023 14:16:35 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= philipmcgrath.com; h=cc:cc:content-transfer-encoding :content-type:date:date:from:from:in-reply-to:in-reply-to :message-id:mime-version:references:reply-to:sender:subject :subject:to:to; s=fm1; t=1700162195; x=1700248595; bh=E5IupjeBbL q8FEGOhGUFOfGxUd7pyAq4UrFRk0wuaQY=; b=LyNtnpz2c665FHs8iav/RjvHth fVeoMFdCSONlxA5T71sAXQNRq23oiHjhzSnV2KXAevCrgS39PSlHVX7ufphZCqB4 8bygJ2eSqRvCynz1PKzE8oYuosyYywbW18d8kwFJMWavfGFzRufYyRwNxvk/mrCg kDsgGEE7MqjikGsc3y2zpMs4YDzbt4uccmx+WT77bC4XOde4vLWikLtaGkb7qt4P qTPJ6wPtVoHu6BeCDIX2QbuONPmcubFgPEZe8gvYNG2kM63J+EwvCGPB/UEFjeDG MGB/xOpy23y26ctXICUSM2qepqyHABWKv9gt/rf83ccS3iP0NEt07FUfpBVg== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:cc:content-transfer-encoding :content-type:date:date:feedback-id:feedback-id:from:from :in-reply-to:in-reply-to:message-id:mime-version:references :reply-to:sender:subject:subject:to:to:x-me-proxy:x-me-proxy :x-me-sender:x-me-sender:x-sasl-enc; s=fm1; t=1700162195; x= 1700248595; bh=E5IupjeBbLq8FEGOhGUFOfGxUd7pyAq4UrFRk0wuaQY=; b=p 7rkx66n+e5DkRGTYBPYzkNwBwAnG2w1RwQAryHWu46d6IhheucEgjxz/R55jlp3s RlFLTYSe1+6ar+gynUoWtuIEkFjtn3pSSuOLk1xRn8BsimzKRmcvqb2JyE/V+wAH pbx+XkSf/vJQBUHb1Mm0I1ZuBgdrbnK/R3aBoNwT9XEPJFW3EpJOeXKnaGBy0UIT Nk7KuY4xFHQe9IMkyxuezNGyizIVNH4PWyxv5FNt8p0g8dEbip5tZZ63+fBJsIT0 BPuWHGo9XnoVtsl1az5yjSwiRVVmhETr/MgSWgITWQerQia73yB+CVJGtgudAJfT djn5R+sfKT5gqEUCeU+Gw== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvkedrudefkedguddvtdcutefuodetggdotefrod ftvfcurfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfgh necuuegrihhlohhuthemuceftddtnecusecvtfgvtghiphhivghnthhsucdlqddutddtmd enucfjughrpefhvfevufffkffojghfggfgsedtkeertdertddtnecuhfhrohhmpefrhhhi lhhiphcuofgtifhrrghthhcuoehphhhilhhiphesphhhihhlihhpmhgtghhrrghthhdrtg homheqnecuggftrfgrthhtvghrnhepgfevgfeljeekgefhgeeigfdvhfeukefgvdduieeg tdetvdfhvdffjeeggfduffeknecuffhomhgrihhnpehgihhthhhusgdrtghomhdpnhhpmh hjshdrtghomhenucevlhhushhtvghrufhiiigvpedtnecurfgrrhgrmhepmhgrihhlfhhr ohhmpehphhhilhhiphesphhhihhlihhpmhgtghhrrghthhdrtghomh X-ME-Proxy: Feedback-ID: i2b1146f3:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Thu, 16 Nov 2023 14:16:35 -0500 (EST) From: Philip McGrath Date: Thu, 16 Nov 2023 14:15:39 -0500 Message-ID: <9daf928c3989a207159dd6f53b531be65e7bae64.1700161584.git.philip@philipmcgrath.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: References: MIME-Version: 1.0 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 16 19:15:40 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Philip McGrath X-Patchwork-Id: 56524 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 138F427BBE2; Thu, 16 Nov 2023 19:17:44 +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 EF8AD27BBE2 for ; Thu, 16 Nov 2023 19:17:41 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1r3hrN-0003Yf-M7; Thu, 16 Nov 2023 14:17:05 -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 1r3hrL-0003Xm-9a for guix-patches@gnu.org; Thu, 16 Nov 2023 14:17:03 -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 1r3hrL-0003DU-1A for guix-patches@gnu.org; Thu, 16 Nov 2023 14:17:03 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1r3hrK-0003lJ-Oe for guix-patches@gnu.org; Thu, 16 Nov 2023 14:17:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#67019] [PATCH v2 02/16] gnu: Add node-copy-anything. Resent-From: Philip McGrath Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 16 Nov 2023 19:17: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 , Liliana Marie Prikler Received: via spool by 67019-submit@debbugs.gnu.org id=B67019.170016220614349 (code B ref 67019); Thu, 16 Nov 2023 19:17:02 +0000 Received: (at 67019) by debbugs.gnu.org; 16 Nov 2023 19:16:46 +0000 Received: from localhost ([127.0.0.1]:44540 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1r3hr2-0003j3-So for submit@debbugs.gnu.org; Thu, 16 Nov 2023 14:16:45 -0500 Received: from out4-smtp.messagingengine.com ([66.111.4.28]:50323) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1r3hqz-0003i7-Hm for 67019@debbugs.gnu.org; Thu, 16 Nov 2023 14:16:41 -0500 Received: from compute5.internal (compute5.nyi.internal [10.202.2.45]) by mailout.nyi.internal (Postfix) with ESMTP id 998025C00A7; Thu, 16 Nov 2023 14:16:36 -0500 (EST) Received: from mailfrontend1 ([10.202.2.162]) by compute5.internal (MEProxy); Thu, 16 Nov 2023 14:16:36 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= philipmcgrath.com; h=cc:cc:content-transfer-encoding :content-type:date:date:from:from:in-reply-to:in-reply-to :message-id:mime-version:references:reply-to:sender:subject :subject:to:to; s=fm1; t=1700162196; x=1700248596; bh=wTfCkR6nx9 494RMShtidiWRHC466SgApjQMOOyLBocE=; b=YHTINx5ikPTnZ77/DPYCDGESyz VqEh1vwf1HFeyHSs5/ShnqguT6NNzVhKozYRsX3C3jaNGEuJPV0HpuoHt6WguIUP faiQl1BKPuY3X9rKCMqCpSjrFnqIk3BSotocExI/1SFpTpbuiW7FMC+XMtUCCQ40 5k3MuNA3lq8sSbkQNGL1tYZrd6a/hc+xrUXef/iO+wdvk7rsFFNLfQWN3R6eCQmP //1GC/UloRuC5fjAzP3wi7ufP1KyRfM+2Xz4K7aXdOYYDhrfyT9CsV5IVzJxwqBL HWPPlSY+KVF576iiSmdNc4OJWG/NqpR66QZpXPDI9Ew9altk8M6xDDEeszKQ== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:cc:content-transfer-encoding :content-type:date:date:feedback-id:feedback-id:from:from :in-reply-to:in-reply-to:message-id:mime-version:references :reply-to:sender:subject:subject:to:to:x-me-proxy:x-me-proxy :x-me-sender:x-me-sender:x-sasl-enc; s=fm1; t=1700162196; x= 1700248596; bh=wTfCkR6nx9494RMShtidiWRHC466SgApjQMOOyLBocE=; b=v Tk6ODXQf8AHwGUrA/M/ubvcxaVXTraKezOFJPKlTcpvRjNGTw/M2Bgmt4U9fGB4b tE7vpqFMf6Y7xNbT55Dm9CGilBpmSX8yv2EfS085HVEzH0DWFAMvJoaQMstNGsIA 2/Qp6xxipfL/wJa7PXDd1KIEFLAphbYzX2Flw4oGjE4FcOfPQvUAxzoH0eB9+Ia2 KrCiDt6ijdzLKcaJDxmq4WYDjmVPRjeTgIBirMcTCJNbeHvZ5Bz6yV26KnzQ7RSp +6QDo82inkjOVcAUe42P1uRcd5XubHmBkDAHMOvSTv4u0AoqL5NGtCrcrpeW7c5J cMhhdaGOKLIxwFvzkGvTw== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvkedrudefkedguddvtdcutefuodetggdotefrod ftvfcurfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfgh necuuegrihhlohhuthemuceftddtnecusecvtfgvtghiphhivghnthhsucdlqddutddtmd enucfjughrpefhvfevufffkffojghfggfgsedtkeertdertddtnecuhfhrohhmpefrhhhi lhhiphcuofgtifhrrghthhcuoehphhhilhhiphesphhhihhlihhpmhgtghhrrghthhdrtg homheqnecuggftrfgrthhtvghrnhepgfevgfeljeekgefhgeeigfdvhfeukefgvdduieeg tdetvdfhvdffjeeggfduffeknecuffhomhgrihhnpehgihhthhhusgdrtghomhdpnhhpmh hjshdrtghomhenucevlhhushhtvghrufhiiigvpedtnecurfgrrhgrmhepmhgrihhlfhhr ohhmpehphhhilhhiphesphhhihhlihhpmhgtghhrrghthhdrtghomh X-ME-Proxy: Feedback-ID: i2b1146f3:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Thu, 16 Nov 2023 14:16:35 -0500 (EST) From: Philip McGrath Date: Thu, 16 Nov 2023 14:15:40 -0500 Message-ID: <5bfba55639dc6d855faf260358c25c37aa34b3de.1700161584.git.philip@philipmcgrath.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: References: MIME-Version: 1.0 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 16 19:15:41 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Philip McGrath X-Patchwork-Id: 56525 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 C928327BBE9; Thu, 16 Nov 2023 19:17:46 +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 BAFBA27BBE2 for ; Thu, 16 Nov 2023 19:17:44 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1r3hrN-0003Yb-JI; Thu, 16 Nov 2023 14:17:05 -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 1r3hrM-0003Xy-5I for guix-patches@gnu.org; Thu, 16 Nov 2023 14:17:04 -0500 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1r3hrL-0003Dc-TE for guix-patches@gnu.org; Thu, 16 Nov 2023 14:17:03 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1r3hrL-0003lS-87 for guix-patches@gnu.org; Thu, 16 Nov 2023 14:17:03 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#67019] [PATCH v2 03/16] gnu: Add lessc. Resent-From: Philip McGrath Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 16 Nov 2023 19:17: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 , Liliana Marie Prikler Received: via spool by 67019-submit@debbugs.gnu.org id=B67019.170016220714371 (code B ref 67019); Thu, 16 Nov 2023 19:17:03 +0000 Received: (at 67019) by debbugs.gnu.org; 16 Nov 2023 19:16:47 +0000 Received: from localhost ([127.0.0.1]:44548 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1r3hr3-0003jN-RO for submit@debbugs.gnu.org; Thu, 16 Nov 2023 14:16:47 -0500 Received: from out4-smtp.messagingengine.com ([66.111.4.28]:49843) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1r3hr0-0003i9-D2 for 67019@debbugs.gnu.org; Thu, 16 Nov 2023 14:16:43 -0500 Received: from compute1.internal (compute1.nyi.internal [10.202.2.41]) by mailout.nyi.internal (Postfix) with ESMTP id 763D85C01DC; Thu, 16 Nov 2023 14:16:37 -0500 (EST) Received: from mailfrontend1 ([10.202.2.162]) by compute1.internal (MEProxy); Thu, 16 Nov 2023 14:16:37 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= philipmcgrath.com; h=cc:cc:content-transfer-encoding :content-type:content-type:date:date:from:from:in-reply-to :in-reply-to:message-id:mime-version:references:reply-to:sender :subject:subject:to:to; s=fm1; t=1700162197; x=1700248597; bh=Xv OdDLqITROSIaJCOiKqKZz7yf9S3X44B15JWjrJT20=; b=JhYAaRDghhdFWTa6IV BcL+qt6Gyj2u0t4xZSLPMV0biVHSzXAD5CQeTyZ8OtwYiUdP5RVCZfyRu3mCe8zP kkt/2N/dKau9U5jYxRaKBz0yTFY2EiY+jFcez3da+7i1xcXrnW0UaF5GhW7tWcub zHSjEboVYpSBD2hKWvwRnfee2s8Pbbz7uz6nWeDpEAHcYE5dVpl7GVbI3B2OppVf ObE8yX0q7DccQNHN9fNxsECookk90K1QzuR71VxIzkTff9ZvseR353VplwTz4lGK 4d0r8jckdV2HEQgJD2JZSWkVVocVdXJG9JXSRVOt/MJV9BJfnxM8XEkTpOhi6TIc AGoQ== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:cc:content-transfer-encoding :content-type:content-type:date:date:feedback-id:feedback-id :from:from:in-reply-to:in-reply-to:message-id:mime-version :references:reply-to:sender:subject:subject:to:to:x-me-proxy :x-me-proxy:x-me-sender:x-me-sender:x-sasl-enc; s=fm1; t= 1700162197; x=1700248597; bh=XvOdDLqITROSIaJCOiKqKZz7yf9S3X44B15 JWjrJT20=; b=L1McXzZQiMmDvzfgNP1pfcwZZYSpo8eW4jKOPg2Ti5I2LytWzoN 8hCFtjm0BoDdae+dBDRZ38ErYAj3Unu46j7I0nFBjPWuIcMSnXMW1tHDqICdNLqx QqEZXOMvOi5L8xxj2IecalVs2DfLEjcLBM3b8daiLAEEFfABB6hMVzeS3Pd3Hojb X2Hy4L66ADepG4wL4YeL1Alkxrln7Tz+N2AutIwoUnnIiDvxMW/KeA7kPsVVU23f ezewgRPLgHd/dOP/mpET7ghCkIBNxxSZ1kGhJMHLNnucP2MNLovXEDu8/wLVax2k LnYs5K4mqQtYdSYP75ltguf8urqwW9R1mMg== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvkedrudefkedguddvtdcutefuodetggdotefrod ftvfcurfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfgh necuuegrihhlohhuthemuceftddtnecusecvtfgvtghiphhivghnthhsucdlqddutddtmd enucfjughrpefhvfevufffkffojghfgggtgfesthekredtredtjeenucfhrhhomheprfhh ihhlihhpucfotgfirhgrthhhuceophhhihhlihhpsehphhhilhhiphhmtghgrhgrthhhrd gtohhmqeenucggtffrrghtthgvrhhnpefhgfekhfdtgfeitdetuefhvedvteefvdevuddt kefgvdevhfekveejuefgfeekheenucffohhmrghinhepghhithhhuhgsrdgtohhmpdhlvg hsshgtshhsrdhorhhgnecuvehluhhsthgvrhfuihiivgeptdenucfrrghrrghmpehmrghi lhhfrhhomhepphhhihhlihhpsehphhhilhhiphhmtghgrhgrthhhrdgtohhm X-ME-Proxy: Feedback-ID: i2b1146f3:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Thu, 16 Nov 2023 14:16:36 -0500 (EST) From: Philip McGrath Date: Thu, 16 Nov 2023 14:15:41 -0500 Message-ID: <83a3e16cf7d86bb07f6cf728acf3872dcae604dc.1700161584.git.philip@philipmcgrath.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: References: MIME-Version: 1.0 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 | 183 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 183 insertions(+) diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index 389f7d1375..9efc6ebc9d 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -65,6 +65,7 @@ ;;; Copyright © 2023 Christopher Howard ;;; Copyright © 2023 Felix Lechner ;;; Copyright © 2023 Evgeny Pisemsky +;;; Copyright © 2023 Philip McGrath ;;; ;;; This file is part of GNU Guix. ;;; @@ -99,6 +100,7 @@ (define-module (gnu packages web) #:use-module (guix build-system gnu) #:use-module (guix build-system go) #:use-module (guix build-system meson) + #:use-module (guix build-system node) #:use-module (guix build-system perl) #:use-module (guix build-system pyproject) #:use-module (guix build-system python) @@ -169,6 +171,7 @@ (define-module (gnu packages web) #:use-module (gnu packages ncurses) #:use-module (gnu packages networking) #:use-module (gnu packages node) + #:use-module (gnu packages node-xyz) #:use-module (gnu packages nss) #:use-module (gnu packages openldap) #:use-module (gnu packages openstack) @@ -2344,6 +2347,186 @@ (define-public sassc/libsass-3.5 "0830pjcvhzxh6yixj82x5k5r1xnadjqzi16kp53213icbly0r9ma"))))))) (properties '((hidden? . #t))))) +(define-public lessc + (package + (name "lessc") + (version "4.2.0") + (source + (origin (method git-fetch) + (uri (git-reference + (url "https://github.com/less/less.js") + (commit (string-append "v" version)))) + (sha256 + (base32 "1b6anlafk7lnayxy3vhsi474jcdah2ffaw2qyac5s2ibxb1wmr54")) + (snippet + #~(begin + (use-modules (guix build utils)) + (delete-file-recursively "packages/less/dist"))) + (file-name (git-file-name name version)))) + (build-system node-build-system) + (native-inputs (list esbuild)) + (inputs (list node-copy-anything)) + (arguments + (list + #:tests? #f ; many more dependencies + #:modules + `((guix build node-build-system) + (ice-9 match) + (guix build utils)) + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'chdir + (lambda args + (chdir "packages/less"))) + (add-after 'patch-dependencies 'delete-dependencies + (lambda args + (delete-dependencies + '(;; dependencies + "parse-node-version" ; patched out + "tslib" ; probably not needed w/ esbuild + ;; devDependencies + "@less/test-data" + "@less/test-import-module" + "@rollup/plugin-commonjs" + "@rollup/plugin-json" + "@rollup/plugin-node-resolve" + "@typescript-eslint/eslint-plugin" + "@typescript-eslint/parser" + "benny" + "bootstrap-less-port" + "chai" + "cross-env" + "diff" + "eslint" + "fs-extra" + "git-rev" + "globby" + "grunt" + "grunt-cli" + "grunt-contrib-clean" + "grunt-contrib-connect" + "grunt-eslint" + "grunt-saucelabs" + "grunt-shell" + "html-template-tag" + "jit-grunt" + "less-plugin-autoprefix" + "less-plugin-clean-css" + "minimist" + "mocha" + "mocha-headless-chrome" + "mocha-teamcity-reporter" + "nock" + "npm-run-all" + "performance-now" + "phin" + "promise" + "read-glob" + "resolve" + "rollup" + "rollup-plugin-terser" + "rollup-plugin-typescript2" + "semver" + "shx" + "time-grunt" + "ts-node" + "typescript" + "uikit" + ;; optionalDependencies + "errno" + "graceful-fs" + "image-size" + "make-dir" + "mime" + "needle" + "source-map")))) + (add-after 'delete-dependencies 'avoid-parse-node-version + (lambda args + (define version + #$(package-version this-package)) + (substitute* "src/less/index.js" + (("import [{] version [}]" orig) + (string-append "// " orig)) + (("import parseVersion from 'parse-node-version';" orig) + (string-append "// " orig)) + (("const v = parseVersion[(]`v\\$[{]version[}]`[)];" orig) + (string-append "// " orig)) + (("(version: )(\\[v\\.major, v\\.minor, v\\.patch],)" _ lhs rhs) + (string-append + lhs + "[" + (string-join + (list-head (string-split + version (char-set-complement char-set:digit)) + 3) + ", ") + "], // " + rhs))))) + (add-after 'avoid-parse-node-version 'do-not-target-es5 + (lambda args + ;; esbuild can't compile all features to ES5 + (with-atomic-json-file-replacement "tsconfig.json" + (match-lambda + (('@ . alist) + (cons '@ + (map (match-lambda + (("compilerOptions" '@ . alist) + `("compilerOptions" @ ,@(delete '("target" . "ES5") + alist))) + (other + other)) + alist))))))) + (add-after 'do-not-target-es5 'patch-build-script + (lambda args + (define new-build-script + (string-join + `("esbuild" + "--platform=node" + "--format=cjs" + "--outdir=lib" + ,@(find-files "src/less" "\\.js$") + ,@(find-files "src/less-node" "\\.js$")))) + (with-atomic-json-file-replacement "package.json" + (match-lambda + (('@ . alist) + (cons '@ + (map (match-lambda + (("scripts" @ . alist) + `("scripts" @ ,@(map (match-lambda + (("build" . _) + (cons "build" + new-build-script)) + (other + other)) + alist))) + (other + other)) + alist))))))) + (add-after 'build 'build-browser + (lambda args + (invoke "esbuild" + "--bundle" + "--platform=browser" + "--format=cjs" + "--outfile=dist/less.js" + "src/less-browser/bootstrap.js") + (invoke "esbuild" + "--bundle" + "--minify" + "--sourcemap" + "--platform=browser" + "--format=cjs" + "--outfile=dist/less.min.js" + "src/less-browser/bootstrap.js")))))) + (home-page "https://lesscss.org") + (synopsis "Compiler for @acronym{Less} @acronym{CSS} language extension") + ;; XXX: @abbr{} seems better for Less (which is always capitalized that + ;; way), but it is rejected as invalid Texinfo markup here. + (description "@acronym{Less, Leaner Style Sheets} is a +backwards-compatible language extension for @acronym{CSS}. This package +provides @command{lessc}, which compiles Less files to plain @acronym{CSS}.") + (license license:asl2.0))) + (define-public perl-apache-logformat-compiler (package From patchwork Thu Nov 16 19:15:42 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Philip McGrath X-Patchwork-Id: 56522 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 8C79A27BBE2; Thu, 16 Nov 2023 19:17:38 +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 2C02E27BBEA for ; Thu, 16 Nov 2023 19:17:37 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1r3hrS-0003ka-Ls; Thu, 16 Nov 2023 14:17:10 -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 1r3hrR-0003kB-L9 for guix-patches@gnu.org; Thu, 16 Nov 2023 14:17:09 -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 1r3hrR-0003Eq-9Q for guix-patches@gnu.org; Thu, 16 Nov 2023 14:17:09 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1r3hrL-0003la-Mh; Thu, 16 Nov 2023 14:17:03 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#67019] [PATCH v2 04/16] gnu: Add ocaml-wtf8. Resent-From: Philip McGrath Original-Sender: "Debbugs-submit" Resent-CC: julien@lepiller.eu, pukkamustard@posteo.net, guix-patches@gnu.org Resent-Date: Thu, 16 Nov 2023 19:17: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 , Liliana Marie Prikler , Julien Lepiller , pukkamustard X-Debbugs-Original-Xcc: Julien Lepiller , pukkamustard Received: via spool by 67019-submit@debbugs.gnu.org id=B67019.170016220814389 (code B ref 67019); Thu, 16 Nov 2023 19:17:03 +0000 Received: (at 67019) by debbugs.gnu.org; 16 Nov 2023 19:16:48 +0000 Received: from localhost ([127.0.0.1]:44562 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1r3hr5-0003jk-7A for submit@debbugs.gnu.org; Thu, 16 Nov 2023 14:16:48 -0500 Received: from out4-smtp.messagingengine.com ([66.111.4.28]:60411) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1r3hr1-0003iG-BP for 67019@debbugs.gnu.org; Thu, 16 Nov 2023 14:16:44 -0500 Received: from compute5.internal (compute5.nyi.internal [10.202.2.45]) by mailout.nyi.internal (Postfix) with ESMTP id 4DCED5C0176; Thu, 16 Nov 2023 14:16:38 -0500 (EST) Received: from mailfrontend1 ([10.202.2.162]) by compute5.internal (MEProxy); Thu, 16 Nov 2023 14:16:38 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= philipmcgrath.com; h=cc:cc:content-transfer-encoding :content-type:content-type:date:date:from:from:in-reply-to :in-reply-to:message-id:mime-version:references:reply-to:sender :subject:subject:to:to; s=fm1; t=1700162198; x=1700248598; bh=Q1 91TlGayI1CczNXYQ0pMNiFs4iKQfeHjS5vyhHe1G4=; b=INNclnv8qydo8SI4Bc ZALb3zxgUmC+Ilc9/ELq0Bs+0jxmpVEj2k4zo76PFu0hR6SN/BpdD6UC64Usfv8j alHuNAzope6nuIWxVGExrZY5GzeE2m1z+/WhAK9zAPiYbaTJyBxoB3dFTPylibPd Nq1dNwGOo+U2KMCMH/DIALRDGYm8900uZHHDnoCh4F8vjcM4tELAx0BhYdb8Jje9 3xJtIYZUx1M40+rJ5xEwL6RX7IuKds3nzptJGGZWtGRpfI5ObhpmZNSjuwNl5I/M LYRhchIahniU6UBTbzoagkq7SSHiAltHFmrm7Z7eGG3p1TDXxIWeLF7qIDrMXaeN /RyA== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:cc:content-transfer-encoding :content-type:content-type:date:date:feedback-id:feedback-id :from:from:in-reply-to:in-reply-to:message-id:mime-version :references:reply-to:sender:subject:subject:to:to:x-me-proxy :x-me-proxy:x-me-sender:x-me-sender:x-sasl-enc; s=fm1; t= 1700162198; x=1700248598; bh=Q191TlGayI1CczNXYQ0pMNiFs4iKQfeHjS5 vyhHe1G4=; b=tWs9fDPR7jAdHtOu8svq1FUT+vip3M2QTlaPnpxiRdY4RxxQJca Q0jCLdQrKnP2hwolmn7Up0xkbBXODDDrx//yqbiEyOkfsGiqePv38msaKS4N217N H69NRxwr0fZRn2sSbDkZlCWu4TggTlgiPHNj1Lu/1LBOAq4mdeDb1XRkb6cSWHv4 2bRQDIToF/7/yV7sXUcX8Wlmn6taLfUZWBoUaIGOk7yqTba4SP3xvvCx38QvuLso GERMvmUtRC3Podj3UsHjDpAmZNvicIz81sA0aE5LMITO+fK2x54meRKFtFwslsbW oMXjhgszN6R9AAwQsy5Ai6nfl6EbFCobDFg== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvkedrudefkedguddvtdcutefuodetggdotefrod ftvfcurfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfgh necuuegrihhlohhuthemuceftddtnecusecvtfgvtghiphhivghnthhsucdlqddutddtmd enucfjughrpefhvfevufffkffojghfgggtgfesthekredtredtjeenucfhrhhomheprfhh ihhlihhpucfotgfirhgrthhhuceophhhihhlihhpsehphhhilhhiphhmtghgrhgrthhhrd gtohhmqeenucggtffrrghtthgvrhhnpeeggfeugfeftddvjefhtedtuedvudehheegvedv kefgleevffeftdfhhfekteegffenucffohhmrghinhepghhithhhuhgsrdgtohhmnecuve hluhhsthgvrhfuihiivgeptdenucfrrghrrghmpehmrghilhhfrhhomhepphhhihhlihhp sehphhhilhhiphhmtghgrhgrthhhrdgtohhm X-ME-Proxy: Feedback-ID: i2b1146f3:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Thu, 16 Nov 2023 14:16:37 -0500 (EST) From: Philip McGrath Date: Thu, 16 Nov 2023 14:15:42 -0500 Message-ID: X-Mailer: git-send-email 2.41.0 In-Reply-To: References: MIME-Version: 1.0 X-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 16 19:15:43 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Philip McGrath X-Patchwork-Id: 56521 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 8969527BBE9; Thu, 16 Nov 2023 19:17:28 +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 1CF8C27BBE2 for ; Thu, 16 Nov 2023 19:17:27 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1r3hrT-0003ny-JM; Thu, 16 Nov 2023 14:17:11 -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 1r3hrR-0003iL-7r for guix-patches@gnu.org; Thu, 16 Nov 2023 14:17:09 -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 1r3hrQ-0003Ek-Vs for guix-patches@gnu.org; Thu, 16 Nov 2023 14:17:09 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1r3hrM-0003lg-5f; Thu, 16 Nov 2023 14:17:04 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#67019] [PATCH v2 05/16] gnu: Add ocaml-visitors. Resent-From: Philip McGrath Original-Sender: "Debbugs-submit" Resent-CC: julien@lepiller.eu, pukkamustard@posteo.net, guix-patches@gnu.org Resent-Date: Thu, 16 Nov 2023 19:17: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 , Liliana Marie Prikler , Julien Lepiller , pukkamustard X-Debbugs-Original-Xcc: Julien Lepiller , pukkamustard Received: via spool by 67019-submit@debbugs.gnu.org id=B67019.170016220914403 (code B ref 67019); Thu, 16 Nov 2023 19:17:04 +0000 Received: (at 67019) by debbugs.gnu.org; 16 Nov 2023 19:16:49 +0000 Received: from localhost ([127.0.0.1]:44570 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1r3hr6-0003k2-7Q for submit@debbugs.gnu.org; Thu, 16 Nov 2023 14:16:49 -0500 Received: from out4-smtp.messagingengine.com ([66.111.4.28]:52651) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1r3hr2-0003iM-3y for 67019@debbugs.gnu.org; Thu, 16 Nov 2023 14:16:44 -0500 Received: from compute3.internal (compute3.nyi.internal [10.202.2.43]) by mailout.nyi.internal (Postfix) with ESMTP id 30F175C01D3; Thu, 16 Nov 2023 14:16:39 -0500 (EST) Received: from mailfrontend1 ([10.202.2.162]) by compute3.internal (MEProxy); Thu, 16 Nov 2023 14:16:39 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= philipmcgrath.com; h=cc:cc:content-transfer-encoding :content-type:date:date:from:from:in-reply-to:in-reply-to :message-id:mime-version:references:reply-to:sender:subject :subject:to:to; s=fm1; t=1700162199; x=1700248599; bh=QvgChRQ5Cl uj4mlf8xoUQBN/Lo8HstlmvjAE0E2Cjdo=; b=vo0GJpy8lizH1ZRGND5Ud5ADoS bCE4yWf/dRvCAzI1lB47rCkgQjxxhQjbx5cLt4AIUjLpnJ2IE8d0b/l/BLX8plTN Oh0N4VZW9tYsyb841mggmEcCv1EnalXiVrYN9KfYZzlKojjcSlN/GrBlOpsKqqiI HHfOHjqEpBEPIIjXhEq7KCBu2Z2cTbDu95EBjZzToaE/fa+YEEolPe+irLsCZ1ha k7BTLfgG90fh31bHEqYtUxjV+Z1i83luPrK0ujMqAs0MOPp9sJ8eI2UR1EK6iMLj wXK56vikb7qEmcjvYCjP5S9LbiRcpuA2XVdKSia5bO4M33mgNcKLD/BmYw0A== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:cc:content-transfer-encoding :content-type:date:date:feedback-id:feedback-id:from:from :in-reply-to:in-reply-to:message-id:mime-version:references :reply-to:sender:subject:subject:to:to:x-me-proxy:x-me-proxy :x-me-sender:x-me-sender:x-sasl-enc; s=fm1; t=1700162199; x= 1700248599; bh=QvgChRQ5Cluj4mlf8xoUQBN/Lo8HstlmvjAE0E2Cjdo=; b=Q iN2D2eNLVUcLb8e33td8UgP8d5VQxOuRo6VytDc8vsGGqT2vYL6ob80fc9XHEFsj 6eWT34bfrKIEAl3cf8b+xwxx8ntuK9tlgmgIbcswVkoZQ4W9fAK2VK8HTdgaNODA /Rf6YN/Lj/f5BgROj8mVI6bZvjv0ugIzNa7chXq/FANvmTTNQXfXWvQqsR/ExxDa 9rChynBp3sly0jSczECoiAVXmEI0ffLbk4ByqgIWeF4WqyrFvwDqMB+qZrPgavDt eP//90cMOQOcx5muALEOrso838Sv08jhSxYvufvxnaiI8TzpVZplD8klPR6UlC04 ZykIZedJEGuVD8MRRHKdw== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvkedrudefkedguddvtdcutefuodetggdotefrod ftvfcurfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfgh necuuegrihhlohhuthemuceftddtnecusecvtfgvtghiphhivghnthhsucdlqddutddtmd enucfjughrpefhvfevufffkffojghfggfgsedtkeertdertddtnecuhfhrohhmpefrhhhi lhhiphcuofgtifhrrghthhcuoehphhhilhhiphesphhhihhlihhpmhgtghhrrghthhdrtg homheqnecuggftrfgrthhtvghrnhepledtteevudeuueduheefheeuieehudekiefgtddt tdelfeevveehhfejudelkeegnecuffhomhgrihhnpehinhhrihgrrdhfrhenucevlhhush htvghrufhiiigvpedtnecurfgrrhgrmhepmhgrihhlfhhrohhmpehphhhilhhiphesphhh ihhlihhpmhgtghhrrghthhdrtghomh X-ME-Proxy: Feedback-ID: i2b1146f3:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Thu, 16 Nov 2023 14:16:38 -0500 (EST) From: Philip McGrath Date: Thu, 16 Nov 2023 14:15:43 -0500 Message-ID: X-Mailer: git-send-email 2.41.0 In-Reply-To: References: MIME-Version: 1.0 X-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 16 19:15:44 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Philip McGrath X-Patchwork-Id: 56529 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 100A127BBEA; Thu, 16 Nov 2023 19:18:28 +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 231AC27BBE9 for ; Thu, 16 Nov 2023 19:18:27 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1r3hsK-0004Ld-4e; Thu, 16 Nov 2023 14:18:04 -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 1r3hsI-0004L8-J4 for guix-patches@gnu.org; Thu, 16 Nov 2023 14:18:02 -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 1r3hsI-0004Vs-AS for guix-patches@gnu.org; Thu, 16 Nov 2023 14:18:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1r3hsI-0003oP-1P; Thu, 16 Nov 2023 14:18:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#67019] [PATCH v2 06/16] gnu: Add ocaml-ppx-gen-rec. Resent-From: Philip McGrath Original-Sender: "Debbugs-submit" Resent-CC: julien@lepiller.eu, pukkamustard@posteo.net, guix-patches@gnu.org Resent-Date: Thu, 16 Nov 2023 19:18: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 , Liliana Marie Prikler , Julien Lepiller , pukkamustard X-Debbugs-Original-Xcc: Julien Lepiller , pukkamustard Received: via spool by 67019-submit@debbugs.gnu.org id=B67019.170016222814519 (code B ref 67019); Thu, 16 Nov 2023 19:18:02 +0000 Received: (at 67019) by debbugs.gnu.org; 16 Nov 2023 19:17:08 +0000 Received: from localhost ([127.0.0.1]:44585 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1r3hrP-0003m6-S2 for submit@debbugs.gnu.org; Thu, 16 Nov 2023 14:17:08 -0500 Received: from out4-smtp.messagingengine.com ([66.111.4.28]:38383) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1r3hr2-0003iQ-Tk for 67019@debbugs.gnu.org; Thu, 16 Nov 2023 14:16:45 -0500 Received: from compute1.internal (compute1.nyi.internal [10.202.2.41]) by mailout.nyi.internal (Postfix) with ESMTP id 00F7B5C00D1; Thu, 16 Nov 2023 14:16:40 -0500 (EST) Received: from mailfrontend1 ([10.202.2.162]) by compute1.internal (MEProxy); Thu, 16 Nov 2023 14:16:39 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= philipmcgrath.com; h=cc:cc:content-transfer-encoding :content-type:date:date:from:from:in-reply-to:in-reply-to :message-id:mime-version:references:reply-to:sender:subject :subject:to:to; s=fm1; t=1700162199; x=1700248599; bh=uBPGilGjd9 Aw7cXVuG4eXD+LGRM9MnxL+qpQY+GT7EU=; b=Dwcu19gb0mQSzaFDyMCfy1smw0 AC9PHJuiK+TPpmLeadtu65V2Obd60dVyY3mfxcKSLmmZcHc8ZvBOIlfpik2EHIPA HngAYgztt34BFj0ju/dag772NG2mMprXDkM0WyaAvnF0mbh+TWKmgZPaFCCq8Dvc 4kpInicgacRoHsr9Re4FBBmzchf05OoKhHLWrtnwG0YiiHLyMujPgu9hLg6xeK2o oUj0a5Sr5UcnuMVKAKS25+K/6+8nugN+zOAQ22olLVLiJF9jpEuoPFP5lar011Ha YZ813kCzdh5GfEWXt+27uoEWvZRBfct7X4kJGEWcOqIHrCsVOWea6CDWKJEw== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:cc:content-transfer-encoding :content-type:date:date:feedback-id:feedback-id:from:from :in-reply-to:in-reply-to:message-id:mime-version:references :reply-to:sender:subject:subject:to:to:x-me-proxy:x-me-proxy :x-me-sender:x-me-sender:x-sasl-enc; s=fm1; t=1700162199; x= 1700248599; bh=uBPGilGjd9Aw7cXVuG4eXD+LGRM9MnxL+qpQY+GT7EU=; b=o w6vdEt8iazzHLTb66UbRI080Wn1xapcJNVeJGG57spZhmlyZe1LR7SB64wTgeVVf xyJlQ/W+pF6uskS2zayyaQulnPe0AwmG3/LtfwOfaU/3sfOStlpnMQw/7vQHVuhV qhs8InHtGKtKkqhQV7luJBepzetzqQRboQRJPUB3dIHcsCZ3q4ZHHiyDeO/LxTau VE471JfGyKeBSOs+kAV6woOqOc9+/NlkIn0w7WBBQ+Z4bUsQzriyfkzVNV8qSkGA AQscRp52IvF4MxX7iLr/zVRBYMPb8jQVzS7epsFVY80r5rLj8et/tLfiig5lGT6D vJ0QqyxQkjTLqszNqqnTg== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvkedrudefkedguddvtdcutefuodetggdotefrod ftvfcurfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfgh necuuegrihhlohhuthemuceftddtnecusecvtfgvtghiphhivghnthhsucdlqddutddtmd enucfjughrpefhvfevufffkffojghfggfgsedtkeertdertddtnecuhfhrohhmpefrhhhi lhhiphcuofgtifhrrghthhcuoehphhhilhhiphesphhhihhlihhpmhgtghhrrghthhdrtg homheqnecuggftrfgrthhtvghrnhepudehvdefjeetfffffeektdehtdetudfhtdfhuddt ueeukefhveehhfehvdfhheffnecuffhomhgrihhnpehgihhthhhusgdrtghomhenucevlh hushhtvghrufhiiigvpedtnecurfgrrhgrmhepmhgrihhlfhhrohhmpehphhhilhhiphes phhhihhlihhpmhgtghhrrghthhdrtghomh X-ME-Proxy: Feedback-ID: i2b1146f3:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Thu, 16 Nov 2023 14:16:39 -0500 (EST) From: Philip McGrath Date: Thu, 16 Nov 2023 14:15:44 -0500 Message-ID: X-Mailer: git-send-email 2.41.0 In-Reply-To: References: MIME-Version: 1.0 X-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 16 19:15:45 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Philip McGrath X-Patchwork-Id: 56531 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 C24A227BBEA; Thu, 16 Nov 2023 19:18:43 +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 1C28C27BBE2 for ; Thu, 16 Nov 2023 19:18:43 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1r3hsO-0004PV-9p; Thu, 16 Nov 2023 14:18:08 -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 1r3hsJ-0004LP-Hn for guix-patches@gnu.org; Thu, 16 Nov 2023 14:18:03 -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 1r3hsJ-0004WD-9C for guix-patches@gnu.org; Thu, 16 Nov 2023 14:18:03 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1r3hsJ-0003og-12; Thu, 16 Nov 2023 14:18:03 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#67019] [PATCH v2 07/16] gnu: Add ocaml-dtoa. Resent-From: Philip McGrath Original-Sender: "Debbugs-submit" Resent-CC: julien@lepiller.eu, pukkamustard@posteo.net, guix-patches@gnu.org Resent-Date: Thu, 16 Nov 2023 19:18: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 , Liliana Marie Prikler , Julien Lepiller , pukkamustard X-Debbugs-Original-Xcc: Julien Lepiller , pukkamustard Received: via spool by 67019-submit@debbugs.gnu.org id=B67019.170016222914540 (code B ref 67019); Thu, 16 Nov 2023 19:18:02 +0000 Received: (at 67019) by debbugs.gnu.org; 16 Nov 2023 19:17:09 +0000 Received: from localhost ([127.0.0.1]:44592 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1r3hrR-0003mJ-2f for submit@debbugs.gnu.org; Thu, 16 Nov 2023 14:17:09 -0500 Received: from out4-smtp.messagingengine.com ([66.111.4.28]:48699) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1r3hr4-0003iU-5s for 67019@debbugs.gnu.org; Thu, 16 Nov 2023 14:16:46 -0500 Received: from compute1.internal (compute1.nyi.internal [10.202.2.41]) by mailout.nyi.internal (Postfix) with ESMTP id D99095C0211; Thu, 16 Nov 2023 14:16:40 -0500 (EST) Received: from mailfrontend1 ([10.202.2.162]) by compute1.internal (MEProxy); Thu, 16 Nov 2023 14:16:40 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= philipmcgrath.com; h=cc:cc:content-transfer-encoding :content-type:date:date:from:from:in-reply-to:in-reply-to :message-id:mime-version:references:reply-to:sender:subject :subject:to:to; s=fm1; t=1700162200; x=1700248600; bh=TyXto21Pr0 l88vZ+0tPI9VWoQSPznZA9OTS3c3MA20s=; b=wNIUjXpoB0Z6Lq/jSANh6b6fVV bWXx+udw3m9d7JY6H78TMhftlq6+o5xzBaG725mzs8a/RjgIxg2BGgcFmo6ogYUs EqrRZBKJnEZ07hkYQUTuNHnqmDgM2xLoP6+VP2GxF1a0hY0UglblQU/mvpM/lbdV QkmosJCD8aoVpmCiNWv4iQYRA+LZiCV6OFLCUofnWtO4NBJgwNMwhxzMyG0w1sb4 F0Jrqbq29jz2C6KPMfJuveRIlNnhEY7wGgjE19Ntv/8ZcLrMQgv81imsNs/79lEz +YSIWrcz+SEekEPnL7PGDpCn17V14crI94iC6PkwbRqgzrF5FWLI+6VVVjnA== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:cc:content-transfer-encoding :content-type:date:date:feedback-id:feedback-id:from:from :in-reply-to:in-reply-to:message-id:mime-version:references :reply-to:sender:subject:subject:to:to:x-me-proxy:x-me-proxy :x-me-sender:x-me-sender:x-sasl-enc; s=fm1; t=1700162200; x= 1700248600; bh=TyXto21Pr0l88vZ+0tPI9VWoQSPznZA9OTS3c3MA20s=; b=K RodDmIiW14ew2wmrl41wNla4fY9SGJ08eUQEXA0AU78BhQMmvDB0W0vBLwO1eKuO 2guTiKnJcz05nL07hSHHYcjYf48iYQ9kO4r3SCOmZrFZaysndy6cUj0mfWF4NRSM 8iI0rWKN2sS0ylZAINci3SQS5U9iIhpi5N00/DgM7d55anWnIxrTD0g8I0BA+HJp TTV5npGHZjqJ9Na2ZmEc28NjxYbQNQ3b2QbDh3ZvEyleqZZQ4ztIEdnugYIkh5HF cFtgZGGJXXq3Xi2CxcrpoGaiqFokeiEhXAj8pXvcTfw2tBp95B+nllAoBHihzdk4 Fy1ZSfWyooX/oQY+9mwig== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvkedrudefkedguddvtdcutefuodetggdotefrod ftvfcurfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfgh necuuegrihhlohhuthemuceftddtnecusecvtfgvtghiphhivghnthhsucdlqddutddtmd enucfjughrpefhvfevufffkffojghfggfgsedtkeertdertddtnecuhfhrohhmpefrhhhi lhhiphcuofgtifhrrghthhcuoehphhhilhhiphesphhhihhlihhpmhgtghhrrghthhdrtg homheqnecuggftrfgrthhtvghrnhepudehvdefjeetfffffeektdehtdetudfhtdfhuddt ueeukefhveehhfehvdfhheffnecuffhomhgrihhnpehgihhthhhusgdrtghomhenucevlh hushhtvghrufhiiigvpedtnecurfgrrhgrmhepmhgrihhlfhhrohhmpehphhhilhhiphes phhhihhlihhpmhgtghhrrghthhdrtghomh X-ME-Proxy: Feedback-ID: i2b1146f3:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Thu, 16 Nov 2023 14:16:40 -0500 (EST) From: Philip McGrath Date: Thu, 16 Nov 2023 14:15:45 -0500 Message-ID: <4ccdb4652b68ad0cb1ed898b8ab5ecfc34125cb7.1700161584.git.philip@philipmcgrath.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: References: MIME-Version: 1.0 X-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 16 19:15:46 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Philip McGrath X-Patchwork-Id: 56530 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 C1A3E27BBEA; Thu, 16 Nov 2023 19:18:41 +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 EB3BF27BBE2 for ; Thu, 16 Nov 2023 19:18:40 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1r3hsM-0004Nk-D9; Thu, 16 Nov 2023 14:18:06 -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 1r3hsK-0004Lm-Cl for guix-patches@gnu.org; Thu, 16 Nov 2023 14:18:04 -0500 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1r3hsK-0004Yp-3t for guix-patches@gnu.org; Thu, 16 Nov 2023 14:18:04 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1r3hsJ-0003oz-Ry for guix-patches@gnu.org; Thu, 16 Nov 2023 14:18:03 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#67019] [PATCH v2 08/16] gnu: Add node-vlq. Resent-From: Philip McGrath Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 16 Nov 2023 19:18: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 , Liliana Marie Prikler Received: via spool by 67019-submit@debbugs.gnu.org id=B67019.170016223014555 (code B ref 67019); Thu, 16 Nov 2023 19:18:03 +0000 Received: (at 67019) by debbugs.gnu.org; 16 Nov 2023 19:17:10 +0000 Received: from localhost ([127.0.0.1]:44599 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1r3hrR-0003mf-Va for submit@debbugs.gnu.org; Thu, 16 Nov 2023 14:17:10 -0500 Received: from out4-smtp.messagingengine.com ([66.111.4.28]:47283) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1r3hr4-0003iZ-MV for 67019@debbugs.gnu.org; Thu, 16 Nov 2023 14:16:47 -0500 Received: from compute1.internal (compute1.nyi.internal [10.202.2.41]) by mailout.nyi.internal (Postfix) with ESMTP id BD16A5C01E2; Thu, 16 Nov 2023 14:16:41 -0500 (EST) Received: from mailfrontend1 ([10.202.2.162]) by compute1.internal (MEProxy); Thu, 16 Nov 2023 14:16:41 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= philipmcgrath.com; h=cc:cc:content-transfer-encoding :content-type:date:date:from:from:in-reply-to:in-reply-to :message-id:mime-version:references:reply-to:sender:subject :subject:to:to; s=fm1; t=1700162201; x=1700248601; bh=E9ocrdTfeE mbK+CG7oTU30PmquE0qggOBuAtfU+BvE4=; b=KE1D7WLCp80mgRokhVhUHig0tm Evytl/MYwSeECp8q4mTQq0k0mD6SkvWN7kiCXX78a6u+1bP9LvP08gg+fntuMPBS YnyP0j5VSi7XUINkWEsjx1t+HR7nixKpNqE7zG2g/g96yK7tbuENNdRecRmt+3EG 9WiSPeIipLRDbl/8/tpSsCTxTF7OrG+XJdpIpz9mAmiM8gqDdM++vRkrouRAEDwn s9YLx3ZLxY1j7mBWzMutXmYJPLhLJRNL8z63JkHMDfNRZUREJjKp1vWT/kdQKKJ4 IPS0ktm7s/+u4LADOX58uA5FI3mXcBL/Bp1IuJeIlbEkcg4px1s+YQEYGqeA== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:cc:content-transfer-encoding :content-type:date:date:feedback-id:feedback-id:from:from :in-reply-to:in-reply-to:message-id:mime-version:references :reply-to:sender:subject:subject:to:to:x-me-proxy:x-me-proxy :x-me-sender:x-me-sender:x-sasl-enc; s=fm1; t=1700162201; x= 1700248601; bh=E9ocrdTfeEmbK+CG7oTU30PmquE0qggOBuAtfU+BvE4=; b=O vEfzFBSzldWvrw0tJMj6EYVWnWL3n+xoGbxi7p36IIXBOdnTGiGMp/fZPhGj+Ier vD2yh4d8kdRJrkj+0TJe/ICk8R3qIw1bDafxgfTxTGvwKYwE1qm8k821qcDCzQas Ss2p7Gx1QdolBf4okhy+OVcIm4zsSxK225RwaxriBDEvw3IQTWeHfRfkD80ISdiV 8sZdnom7jo/voPkPpRohWKwwt5DL7t5e5urwe2CciSI5nZIWGxXiGZ6V41tu0j3Z qzef5o5n6RARbW/hgM3l+5mj56VYhJy46ddw/WutsoOho5d9n12z2WKvJKSt+Ho1 T9V+KEyMSFhbMVg3bq9Mw== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvkedrudefkedguddvtdcutefuodetggdotefrod ftvfcurfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfgh necuuegrihhlohhuthemuceftddtnecusecvtfgvtghiphhivghnthhsucdlqddutddtmd enucfjughrpefhvfevufffkffojghfggfgsedtkeertdertddtnecuhfhrohhmpefrhhhi lhhiphcuofgtifhrrghthhcuoehphhhilhhiphesphhhihhlihhpmhgtghhrrghthhdrtg homheqnecuggftrfgrthhtvghrnhepudehvdefjeetfffffeektdehtdetudfhtdfhuddt ueeukefhveehhfehvdfhheffnecuffhomhgrihhnpehgihhthhhusgdrtghomhenucevlh hushhtvghrufhiiigvpedtnecurfgrrhgrmhepmhgrihhlfhhrohhmpehphhhilhhiphes phhhihhlihhpmhgtghhrrghthhdrtghomh X-ME-Proxy: Feedback-ID: i2b1146f3:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Thu, 16 Nov 2023 14:16:41 -0500 (EST) From: Philip McGrath Date: Thu, 16 Nov 2023 14:15:46 -0500 Message-ID: <7f4e71aad9adc111dd5ff673d707ef9e3db0d7e0.1700161584.git.philip@philipmcgrath.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: References: MIME-Version: 1.0 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 16 19:15:47 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Philip McGrath X-Patchwork-Id: 56528 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 E31FE27BBEA; Thu, 16 Nov 2023 19:18: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 CEACC27BBE2 for ; Thu, 16 Nov 2023 19:18:20 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1r3hsO-0004QL-8c; Thu, 16 Nov 2023 14:18:08 -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 1r3hsL-0004N6-Lw for guix-patches@gnu.org; Thu, 16 Nov 2023 14:18:05 -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 1r3hsL-0004es-Bp for guix-patches@gnu.org; Thu, 16 Nov 2023 14:18:05 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1r3hsK-0003pE-Qp for guix-patches@gnu.org; Thu, 16 Nov 2023 14:18:04 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#67019] [PATCH v2 09/16] gnu: Add ocaml-flow-parser. Resent-From: Philip McGrath Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 16 Nov 2023 19:18: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 , Liliana Marie Prikler Received: via spool by 67019-submit@debbugs.gnu.org id=B67019.170016223214570 (code B ref 67019); Thu, 16 Nov 2023 19:18:04 +0000 Received: (at 67019) by debbugs.gnu.org; 16 Nov 2023 19:17:12 +0000 Received: from localhost ([127.0.0.1]:44603 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1r3hrS-0003mp-Pm for submit@debbugs.gnu.org; Thu, 16 Nov 2023 14:17:11 -0500 Received: from out4-smtp.messagingengine.com ([66.111.4.28]:46637) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1r3hr5-0003ig-H6 for 67019@debbugs.gnu.org; Thu, 16 Nov 2023 14:16:48 -0500 Received: from compute7.internal (compute7.nyi.internal [10.202.2.48]) by mailout.nyi.internal (Postfix) with ESMTP id 962815C0203; Thu, 16 Nov 2023 14:16:42 -0500 (EST) Received: from mailfrontend1 ([10.202.2.162]) by compute7.internal (MEProxy); Thu, 16 Nov 2023 14:16:42 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= philipmcgrath.com; h=cc:cc:content-transfer-encoding :content-type:date:date:from:from:in-reply-to:in-reply-to :message-id:mime-version:references:reply-to:sender:subject :subject:to:to; s=fm1; t=1700162202; x=1700248602; bh=PC89oKSYEC 0KHXt4QpB5Xv9CWn1muRIJ/dTa4CLnbLk=; b=m8WznaUdxkHgbV71irWDRQ5ZFf GVKW+6CNhb23CyPWU9VS1ABXSEigBb8SpLXVjouabk9RFLwpXEKF4Qv2ZPdQdyBs xRHEkpmbZc3PfEEUyekNO92rqyiXLMLnZPeT+U61ByrQInb/BmOBwC7mE+JY+DRm 7aQDictBfC5rZYTICrQ/YY71RTZm+ofS2V9DbGlFTO/v+9MfWCqzEVkX9YehfDPl aYcBa6j7rM9E9BHR8OuROC7mkAShZsisDvmAJHxfcxZ4KfhEAAgm4KjVkU2UCi0S 083+fgBtXJOuxeh/WTBdseg7PRqgRGUgXhelPLKCnEyjRGkRCslBJyUB/pmg== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:cc:content-transfer-encoding :content-type:date:date:feedback-id:feedback-id:from:from :in-reply-to:in-reply-to:message-id:mime-version:references :reply-to:sender:subject:subject:to:to:x-me-proxy:x-me-proxy :x-me-sender:x-me-sender:x-sasl-enc; s=fm1; t=1700162202; x= 1700248602; bh=PC89oKSYEC0KHXt4QpB5Xv9CWn1muRIJ/dTa4CLnbLk=; b=g /kyusBKqflNHyGPEd5U4toSC8qhHdWVW55oIDCtaL1tMe+ufPspdqADT26umHatz 1dy/r0BgzXi3bgrX5OJregL9DRnTy637b3GS5/l2QC5aIwithFkRECX18Qe0E5mX ZweQWgE/bBwrDYbOxVKHt4kNCZBzHQ/8pGGQFghEOjrEVsFFjHwVt45SNnpDm5sq ToetmNv+DwoXBFW52k6OhcJsTtCj2W3tm0zn0p9Gwrc2fMAd+eXtTwOak7FbXVNJ tpkZAnIQmx9zQY8X3MyH+vUgBol4UzLGRe78tvS3DfJbm6PYzuNpVq8VwO2D8+m1 RF0ZAeSFyoe1XbIcGFISg== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvkedrudefkedguddvtdcutefuodetggdotefrod ftvfcurfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfgh necuuegrihhlohhuthemuceftddtnecusecvtfgvtghiphhivghnthhsucdlqddutddtmd enucfjughrpefhvfevufffkffojghfggfgsedtkeertdertddtnecuhfhrohhmpefrhhhi lhhiphcuofgtifhrrghthhcuoehphhhilhhiphesphhhihhlihhpmhgtghhrrghthhdrtg homheqnecuggftrfgrthhtvghrnhepvdekuefhtefhiedvkeegtdeljeehvdfhheefteef heduveelgeelleetvddvjeffnecuffhomhgrihhnpehgihhthhhusgdrtghomhdpfhhloh ifrdhorhhgnecuvehluhhsthgvrhfuihiivgeptdenucfrrghrrghmpehmrghilhhfrhho mhepphhhihhlihhpsehphhhilhhiphhmtghgrhgrthhhrdgtohhm X-ME-Proxy: Feedback-ID: i2b1146f3:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Thu, 16 Nov 2023 14:16:41 -0500 (EST) From: Philip McGrath Date: Thu, 16 Nov 2023 14:15:47 -0500 Message-ID: <9e31af33a03e3581f3c124b6b53241a34c31e42e.1700161584.git.philip@philipmcgrath.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: References: MIME-Version: 1.0 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. --- gnu/packages/web.scm | 95 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 95 insertions(+) diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index 9efc6ebc9d..b222c2ae40 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -96,6 +96,7 @@ (define-module (gnu packages web) #:use-module (guix build-system cargo) #:use-module (guix build-system cmake) #:use-module (guix build-system copy) + #:use-module (guix build-system dune) #:use-module (guix build-system glib-or-gtk) #:use-module (guix build-system gnu) #:use-module (guix build-system go) @@ -173,6 +174,7 @@ (define-module (gnu packages web) #:use-module (gnu packages node) #:use-module (gnu packages node-xyz) #:use-module (gnu packages nss) + #:use-module (gnu packages ocaml) #:use-module (gnu packages openldap) #:use-module (gnu packages openstack) #:use-module (gnu packages package-management) @@ -1938,6 +1940,99 @@ (define-public esbuild and other data, for distribution on the web.") (license license:expat))) +(define-public ocaml-flow-parser + (package + (name "ocaml-flow-parser") + (version "0.159.0") + (outputs '("out" "js")) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/facebook/flow") + (commit (string-append "v" version)))) + (sha256 + (base32 "1i9svf641s24nj4w6y9vvglzg29h0lr4n9a6mvwrn9psy9x1lril")) + (file-name (git-file-name "flow" version)))) + (build-system dune-build-system) + (propagated-inputs (list ocaml-base + ocaml-core-kernel + ocaml-dtoa + ocaml-sedlex + ocaml-wtf8)) + (native-inputs (list js-of-ocaml + ocamlbuild + ocaml-findlib + ocaml-ounit2 + ocaml-ppx-deriving + ocaml-ppx-gen-rec + ocaml-visitors)) + (arguments + (list + #:tests? #f ; tests need lwt_ppx + #:package "flow_parser" + #:phases + #~(modify-phases %standard-phases + (add-before 'build 'chdir + (lambda args + (chdir "src/parser"))) + (add-before 'build 'patch-source + (lambda args + ;; Avoid errors with newer OCaml: + ;; "Error (warning 16 [unerasable-optional-argument]):" + ;; " this optional argument cannot be erased." + ;; "Error (warning 69 [unused-field]):" + ;; " mutable record field buf is never mutated." + ;; "Error (warning 70 [missing-mli]): Cannot find interface file." + (substitute* "_tags" + (("<\\*\\.ml\\*>: warn[(]-39[)]") + "<*.ml*>: warn(-16-39-70)")) + (substitute* "../../_tags" + (("<\\*\\*/\\*.ml\\*>: ") + "<**/*.ml*>: warn(-69), ")) + ;; Deprecation of Js.Unsafe.variable, Js.Error, Js.raise_js_error + (substitute* "flow_parser_js.ml" + (("Js\\.Unsafe\\.variable") + "Js.Unsafe.pure_js_expr")) + (substitute* "flow_parser_dot_js.ml" + (("Js\\.Error") + "Js_of_ocaml.Js_error.Exn") + (("Js\\.raise_js_error") + "Js_of_ocaml.Js_error.raise_")))) + (replace 'build + (lambda args + (invoke "make" + (string-append "CC=" #$(cc-for-target)) + "build-parser"))) + (add-after 'build 'build-js + (lambda args + (invoke "make" + (string-append "CC=" #$(cc-for-target)) + "js"))) + (replace 'check + (lambda* (#:key tests? #:allow-other-keys) + (when tests? + (invoke "make" + (string-append "CC=" #$(cc-for-target)) + "test-ocaml")))) + (replace 'install + (lambda args + (invoke "make" + (string-append "CC=" #$(cc-for-target)) + "ocamlfind-install"))) + (add-after 'install 'install-js + (lambda args + (install-file "flow_parser.js" + (string-append #$output:js + "/share/javascript/flow"))))))) + (properties `((upstream-name . "flow_parser"))) + (home-page "https://flow.org") + (synopsis "Parser for the Flow JavaScript type system") + (description "Flow is a gradual type system for JavaScript. This package +provides the Flow parser, which is an OCaml library that can also be compiled +to JavaScript.") + (license license:expat))) + (define-public tinyproxy (package (name "tinyproxy") From patchwork Thu Nov 16 19:15:48 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Philip McGrath X-Patchwork-Id: 56534 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 8207227BBEA; Thu, 16 Nov 2023 19:18: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 BE0E727BBE2 for ; Thu, 16 Nov 2023 19:18:54 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1r3hsM-0004Om-Uy; Thu, 16 Nov 2023 14:18:06 -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 1r3hsL-0004N7-Mv for guix-patches@gnu.org; Thu, 16 Nov 2023 14:18:05 -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 1r3hsL-0004gU-EJ for guix-patches@gnu.org; Thu, 16 Nov 2023 14:18:05 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1r3hsL-0003pL-69 for guix-patches@gnu.org; Thu, 16 Nov 2023 14:18:05 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#67019] [PATCH v2 10/16] gnu: Add node-flow-parser. Resent-From: Philip McGrath Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 16 Nov 2023 19:18: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 , Liliana Marie Prikler Received: via spool by 67019-submit@debbugs.gnu.org id=B67019.170016223214578 (code B ref 67019); Thu, 16 Nov 2023 19:18:05 +0000 Received: (at 67019) by debbugs.gnu.org; 16 Nov 2023 19:17:12 +0000 Received: from localhost ([127.0.0.1]:44605 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1r3hrT-0003mx-RG for submit@debbugs.gnu.org; Thu, 16 Nov 2023 14:17:12 -0500 Received: from out4-smtp.messagingengine.com ([66.111.4.28]:32825) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1r3hr6-0003ii-94 for 67019@debbugs.gnu.org; Thu, 16 Nov 2023 14:16:49 -0500 Received: from compute5.internal (compute5.nyi.internal [10.202.2.45]) by mailout.nyi.internal (Postfix) with ESMTP id 58F155C021F; Thu, 16 Nov 2023 14:16:43 -0500 (EST) Received: from mailfrontend1 ([10.202.2.162]) by compute5.internal (MEProxy); Thu, 16 Nov 2023 14:16:43 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= philipmcgrath.com; h=cc:cc:content-transfer-encoding :content-type:date:date:from:from:in-reply-to:in-reply-to :message-id:mime-version:references:reply-to:sender:subject :subject:to:to; s=fm1; t=1700162203; x=1700248603; bh=UoMSbMCFbk o/f4S44kDxI4VO5nX5AwCbi/SD3SLPnWc=; b=aamYuSG/Cz0jgn86lnt5o8GYG9 JxecDd3XrVI7+L+bniWsswh1qipJoVY3mIQPoUG8I0fb+7aWV9+T5Mh14lYK06AP 4B69Rpj+l6svBX7cnVllTsH74J3QIptnj0xoQ89WF1EgMxCJzbnfeWebPnmhjFo7 B7qh4ZQqbbrHS1m7DHc9VEfZlBVaZ8rSpM+hYyy/QY5oX6ZNYcLl4JVReXr7o/pK uKa3OL2o4aUjVZVQD0MJJFAYoPofZwyMiWebCV85htq68ipPDvz8MffTRP/IgekU Oq+Yp9eM+y1Upj/ueiyti0iB6DiROsa14s7AAEQY/ZpVmcsk69kiMdqORJLw== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:cc:content-transfer-encoding :content-type:date:date:feedback-id:feedback-id:from:from :in-reply-to:in-reply-to:message-id:mime-version:references :reply-to:sender:subject:subject:to:to:x-me-proxy:x-me-proxy :x-me-sender:x-me-sender:x-sasl-enc; s=fm1; t=1700162203; x= 1700248603; bh=UoMSbMCFbko/f4S44kDxI4VO5nX5AwCbi/SD3SLPnWc=; b=u C3T4FI06iN6NAidao68gO7hM8YpngBBb+hH2yiV38IFrR75BDkrOrmjRHCOmm03I diCzQjdzhdD0xK34G/JdGaKjgC/pIfDxlyEWdX8j8RUFGA5bzOZzfTmTuQZNC9DI Yf0YBQkeRRsnnqX9geUFW+LPrlOILqoDuubdeeXplkTDUGFKrO2LJItdPNfTVDHe 0KB9mSb82i/yy8X0yYF6lVkPPALCr+8ktbM/Fb9/VqE1oDExewFsolsiDoNz1uRB 3KPXRR0adohdJnzHOSy5g9yeFDF6o1jkEkXeSBvt3asl26eOr+1zRybD8kvbHZY2 0Btf/hD/bw7G0KUJB0CFg== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvkedrudefkedguddvtdcutefuodetggdotefrod ftvfcurfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfgh necuuegrihhlohhuthemuceftddtnecusecvtfgvtghiphhivghnthhsucdlqddutddtmd enucfjughrpefhvfevufffkffojghfggfgsedtkeertdertddtnecuhfhrohhmpefrhhhi lhhiphcuofgtifhrrghthhcuoehphhhilhhiphesphhhihhlihhpmhgtghhrrghthhdrtg homheqnecuggftrfgrthhtvghrnhepgffhgfffjeegudejvddvgedvheefveehvdffuedu udeivdfhgeeileehvdfhfeefnecuvehluhhsthgvrhfuihiivgeptdenucfrrghrrghmpe hmrghilhhfrhhomhepphhhihhlihhpsehphhhilhhiphhmtghgrhgrthhhrdgtohhm X-ME-Proxy: Feedback-ID: i2b1146f3:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Thu, 16 Nov 2023 14:16:42 -0500 (EST) From: Philip McGrath Date: Thu, 16 Nov 2023 14:15:48 -0500 Message-ID: X-Mailer: git-send-email 2.41.0 In-Reply-To: References: MIME-Version: 1.0 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 b222c2ae40..b8646e9d0d 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -2030,9 +2030,52 @@ (define-public ocaml-flow-parser (synopsis "Parser for the Flow JavaScript type system") (description "Flow is a gradual type system for JavaScript. This package provides the Flow parser, which is an OCaml library that can also be compiled -to JavaScript.") +to JavaScript. To use the compiled parser with Node.js or NPM, see the Guix +package @code{node-flow-parser}.") (license license:expat))) +(define-public node-flow-parser + (package + (inherit ocaml-flow-parser) + (name "node-flow-parser") + (properties '()) + (outputs '("out")) + (propagated-inputs '()) + (native-inputs '()) + (inputs (list `(,ocaml-flow-parser "js"))) + (build-system node-build-system) + (arguments + (list + #:tests? #f ; need unpackaged dependencies + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'delete-workspace-file + (lambda args + ;; this workspace file causes NPM to try to install dependencies + ;; of other packages developed in this source repository + (delete-file "package.json"))) + (add-after 'delete-workspace-file 'chdir + (lambda args + (chdir "packages/flow-parser"))) + (add-after 'chdir 'unpack-generated-js + (lambda* (#:key inputs #:allow-other-keys) + (install-file + (search-input-file inputs + "share/javascript/flow/flow_parser.js") + ".") + (delete-file "Makefile"))) + (add-after 'patch-dependencies 'delete-dependencies + (lambda args + (delete-dependencies + '("ast-types" + "colors" + "esprima-fb" + "minimist"))))))) + (synopsis "Parser for the Flow JavaScript type system") + (description "Flow is a gradual type system for JavaScript. This package +provides the Flow parser in its compiled-to-JavaScript form for use with +Node.js and NPM."))) + (define-public tinyproxy (package (name "tinyproxy") From patchwork Thu Nov 16 19:15:49 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Philip McGrath X-Patchwork-Id: 56526 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 DC66027BBE9; Thu, 16 Nov 2023 19:17:50 +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 999E427BBE2 for ; Thu, 16 Nov 2023 19:17:48 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1r3hrP-0003aX-4h; Thu, 16 Nov 2023 14:17:07 -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 1r3hrN-0003YS-3R for guix-patches@gnu.org; Thu, 16 Nov 2023 14:17:05 -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 1r3hrM-0003Dv-Rr for guix-patches@gnu.org; Thu, 16 Nov 2023 14:17:04 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1r3hrM-0003lo-JO for guix-patches@gnu.org; Thu, 16 Nov 2023 14:17:04 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#67019] [PATCH v2 11/16] gnu: Add flow-remove-types. Resent-From: Philip McGrath Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 16 Nov 2023 19:17: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 , Liliana Marie Prikler Received: via spool by 67019-submit@debbugs.gnu.org id=B67019.170016221214428 (code B ref 67019); Thu, 16 Nov 2023 19:17:04 +0000 Received: (at 67019) by debbugs.gnu.org; 16 Nov 2023 19:16:52 +0000 Received: from localhost ([127.0.0.1]:44578 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1r3hr7-0003kG-2G for submit@debbugs.gnu.org; Thu, 16 Nov 2023 14:16:52 -0500 Received: from out4-smtp.messagingengine.com ([66.111.4.28]:60411) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1r3hr2-0003iG-DD for 67019@debbugs.gnu.org; Thu, 16 Nov 2023 14:16:45 -0500 Received: from compute2.internal (compute2.nyi.internal [10.202.2.46]) by mailout.nyi.internal (Postfix) with ESMTP id 7F6455C016D; Thu, 16 Nov 2023 14:16:44 -0500 (EST) Received: from mailfrontend1 ([10.202.2.162]) by compute2.internal (MEProxy); Thu, 16 Nov 2023 14:16:44 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= philipmcgrath.com; h=cc:cc:content-transfer-encoding :content-type:date:date:from:from:in-reply-to:in-reply-to :message-id:mime-version:references:reply-to:sender:subject :subject:to:to; s=fm1; t=1700162204; x=1700248604; bh=uBxMIl98z1 QafFPnCZo1QGRCcJxaB99KsSJeQmDtnug=; b=ic6f5CHeJqHBv/ba1wOnG1bA3m /c9v1Cj4E6e6qFumlzAvd9Fqw1y3EEg/+W7kNzx3/Q6wTO1D9ValNoRxdtYzoBCb 35j99dDbhJ9U7+UVK1nT8chk4qkjDrn1S5yvjkHLzrU/AtckXYp+RFdzYKIsbEzw 2mh+3V3abl7fqjA/FzKqYKXHLRrOxTaksbyMyVl+DUpj30Og636EQmFzNOefbsse tv3yL18DtH/aiuxkoaTA65tQGfSw42Zd6WeMmDN3WH7OL5bLuxpIonBWrqgSfsMS pyTgrvjK6+u8Gk0Qu7oYl4yB5e8ABDYpmveG8XrK99OqjHfemPYtmaKsB5bQ== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:cc:content-transfer-encoding :content-type:date:date:feedback-id:feedback-id:from:from :in-reply-to:in-reply-to:message-id:mime-version:references :reply-to:sender:subject:subject:to:to:x-me-proxy:x-me-proxy :x-me-sender:x-me-sender:x-sasl-enc; s=fm1; t=1700162204; x= 1700248604; bh=uBxMIl98z1QafFPnCZo1QGRCcJxaB99KsSJeQmDtnug=; b=I 7XjIU/wIlifIwouSkOOH1kMOA4aZRwx+UFMVO/qQk1ebGirrndMjEFOyVmL9qAoq 45AaWfVWu9wqDctpAPUcmYN2DXztYCcdb1FZeDP1wSep/tJDGJ1e8x2+CSV2/27Y c+INtO5mtmmAKq5CT8buOYYDDzb5RBcCGAaIbhO03Epu2TCCfDVaXmkYoGYzoHRt nPLh99srVD0u579zpJnIpxxr2pVKDn37/uOhEBCFt33rNUfwXZhvl799dlCBkIve XNRIhP2Z9CyxYyHTdkwnRVgTwoHC9d5/f7+8SotU9CgrcKCq0hVFwH/65pz/CQWC CwaqHbf2frtsvlZgDjPYQ== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvkedrudefkedguddvtdcutefuodetggdotefrod ftvfcurfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfgh necuuegrihhlohhuthemuceftddtnecusecvtfgvtghiphhivghnthhsucdlqddutddtmd enucfjughrpefhvfevufffkffojghfggfgsedtkeertdertddtnecuhfhrohhmpefrhhhi lhhiphcuofgtifhrrghthhcuoehphhhilhhiphesphhhihhlihhpmhgtghhrrghthhdrtg homheqnecuggftrfgrthhtvghrnhepgffhgfffjeegudejvddvgedvheefveehvdffuedu udeivdfhgeeileehvdfhfeefnecuvehluhhsthgvrhfuihiivgeptdenucfrrghrrghmpe hmrghilhhfrhhomhepphhhihhlihhpsehphhhilhhiphhmtghgrhgrthhhrdgtohhm X-ME-Proxy: Feedback-ID: i2b1146f3:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Thu, 16 Nov 2023 14:16:43 -0500 (EST) From: Philip McGrath Date: Thu, 16 Nov 2023 14:15:49 -0500 Message-ID: <875d54cc655b21a748fbf0e981642475ddd94bde.1700161584.git.philip@philipmcgrath.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: References: MIME-Version: 1.0 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 b8646e9d0d..f5afb453f9 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -2076,6 +2076,66 @@ (define-public node-flow-parser provides the Flow parser in its compiled-to-JavaScript form for use with Node.js and NPM."))) +(define-public flow-remove-types + (package + (inherit node-flow-parser) + (name "flow-remove-types") + (inputs (list node-flow-parser node-vlq)) + (arguments + (list + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'delete-workspace-file + (lambda args + ;; this workspace file causes NPM to try to install dependencies + ;; of other packages developed in this source repository + (delete-file "package.json"))) + (add-after 'delete-workspace-file 'chdir + (lambda args + (chdir "packages/flow-remove-types"))) + (add-after 'patch-dependencies 'delete-dependencies + (lambda args + (delete-dependencies '("pirates")))) + (add-after 'delete-dependencies 'remove-unsupported-features + (lambda args + (delete-file "register.js") + (with-output-to-file "register.js" + (lambda () + (for-each + display + '("console.warn('flow-remove-types/register.js does not add" + " a require hook on Guix');\n" + "module.exports =" + " function setOptions(newOptions) {};\n")))) + (substitute* "flow-node" + (("var flowRemoveTypes") + (string-append + "process.stderr.write('flow-node: not yet supported" + " on Guix');\n" + "return process.exit(1);\n" + "var flowRemoveTypes"))) + (substitute* "test.sh" + (("echo \"Test: node require hook\"") + "echo \"SKIPPING Test: node require hook\"") + (("RES=\\$[(]node -e 'require[(]\"\\./register\"[)];") + "RES=42 # ") + (("echo \"Test: flow-node\"") + "echo \"SKIPPING Test: flow-node\"") + (("FLOW_NODE=") + "FLOW_NODE=42 # ") + (("echo \"Test: flow-node with options\"") + "echo \"SKIPPING Test: flow-node with options\"") + (("FLOW_NODE_OPTS=") + "FLOW_NODE_OPTS=4 # "))))))) + (synopsis "Utility to erase Flow type annotations from JavaScript") + (description "Flow is a gradual type system for JavaScript. This package +provides @command{flow-remove-types}, a command-line tool that erases Flow +type annotations, producing standard JavaScript files. The functionality is +also provided as a JavaScript library. + +Note that the Guix package does not yet support the @command{flow-node} +command or the Node.js require hook for interactive development."))) + (define-public tinyproxy (package (name "tinyproxy") From patchwork Thu Nov 16 19:15:50 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Philip McGrath X-Patchwork-Id: 56533 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 39D1127BBE9; Thu, 16 Nov 2023 19:18:53 +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 BA79D27BBE2 for ; Thu, 16 Nov 2023 19:18:51 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1r3hsK-0004Lu-M3; Thu, 16 Nov 2023 14:18:04 -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 1r3hsJ-0004LH-2X for guix-patches@gnu.org; Thu, 16 Nov 2023 14:18:03 -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 1r3hsI-0004W3-PM for guix-patches@gnu.org; Thu, 16 Nov 2023 14:18:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1r3hsI-0003oZ-GQ for guix-patches@gnu.org; Thu, 16 Nov 2023 14:18:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#67019] [PATCH v2 12/16] gnu: js-commander: Update to 11.1.0. Resent-From: Philip McGrath Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 16 Nov 2023 19:18: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 , Liliana Marie Prikler Received: via spool by 67019-submit@debbugs.gnu.org id=B67019.170016222914532 (code B ref 67019); Thu, 16 Nov 2023 19:18:02 +0000 Received: (at 67019) by debbugs.gnu.org; 16 Nov 2023 19:17:09 +0000 Received: from localhost ([127.0.0.1]:44587 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1r3hrQ-0003m9-Me for submit@debbugs.gnu.org; Thu, 16 Nov 2023 14:17:09 -0500 Received: from out4-smtp.messagingengine.com ([66.111.4.28]:52651) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1r3hr3-0003iM-4Q for 67019@debbugs.gnu.org; Thu, 16 Nov 2023 14:16:45 -0500 Received: from compute7.internal (compute7.nyi.internal [10.202.2.48]) by mailout.nyi.internal (Postfix) with ESMTP id 3C1885C0176; Thu, 16 Nov 2023 14:16:45 -0500 (EST) Received: from mailfrontend1 ([10.202.2.162]) by compute7.internal (MEProxy); Thu, 16 Nov 2023 14:16:45 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= philipmcgrath.com; h=cc:cc:content-transfer-encoding :content-type:date:date:from:from:in-reply-to:in-reply-to :message-id:mime-version:references:reply-to:sender:subject :subject:to:to; s=fm1; t=1700162205; x=1700248605; bh=WvZE3V0PDo TMe5ixoooqikSD6F6YmOVB9KyBxE7of/k=; b=ET9W+fgkmz3DtC5Ny9cv6L6cpe 1P/CGO7dAY46qwRBoAktz96ChiIEtYDZKbtElz40AWQRdpLZh5eA4EiGs260o1Ed hwE0LQPJDCI99JqGnTOlXVpz9eJkH7BshYFnZLMTmF4c7boklaa0ouVKCSgIVTQV BLHrIj6Pbcpop2SuuEAr0tjydyCwIvk0YWQzFcJiL2YVobDQAMPbBNUH8GcDmPNQ 8HIvxgVrggN6TAkNNT+4XwUXS/nQLfvv7pk/io65n9Z9uynN2y3kL/GZzonUQtxA ZSUBUbrbwuLYtzlKfhV/3ebFYE9jrYmg7xBkzHqpxSOJWERtvix1p13ubYTA== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:cc:content-transfer-encoding :content-type:date:date:feedback-id:feedback-id:from:from :in-reply-to:in-reply-to:message-id:mime-version:references :reply-to:sender:subject:subject:to:to:x-me-proxy:x-me-proxy :x-me-sender:x-me-sender:x-sasl-enc; s=fm1; t=1700162205; x= 1700248605; bh=WvZE3V0PDoTMe5ixoooqikSD6F6YmOVB9KyBxE7of/k=; b=C 6IRUw4rh5dwpBYX2nDLPlY6rxz6cBwERq8jVvbGs+qb2XQLW+NJSv4Jhti4DvQJd /piprNygPUJmllcZcvHDCekQNT8LjvIUKqeCAxUSOkAnhKifrCSvXoXvXZsTdOgt 4Nork4PG6Uii03qobjmdY8wUx5VrwwQmqEQKfa+4IKQsI0PotC6M7+h0qovxnfcm rBdtcXiDSF9fLuawaSnarxcH4xECYQwqrCcwg6ACU6K5+sfghq4yqdCNHOc7UCuZ Z9ULNw5Hw5hfR+OMCrYE9ShBWEXcdoREoExU0ED2i7vpJyYAoYiW8z5wKWBd6OOV 9+kVrtAylokX7bydYuJdQ== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvkedrudefkedguddvtdcutefuodetggdotefrod ftvfcurfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfgh necuuegrihhlohhuthemuceftddtnecusecvtfgvtghiphhivghnthhsucdlqddutddtmd enucfjughrpefhvfevufffkffojghfggfgsedtkeertdertddtnecuhfhrohhmpefrhhhi lhhiphcuofgtifhrrghthhcuoehphhhilhhiphesphhhihhlihhpmhgtghhrrghthhdrtg homheqnecuggftrfgrthhtvghrnhepgffhgfffjeegudejvddvgedvheefveehvdffuedu udeivdfhgeeileehvdfhfeefnecuvehluhhsthgvrhfuihiivgeptdenucfrrghrrghmpe hmrghilhhfrhhomhepphhhihhlihhpsehphhhilhhiphhmtghgrhgrthhhrdgtohhm X-ME-Proxy: Feedback-ID: i2b1146f3:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Thu, 16 Nov 2023 14:16:44 -0500 (EST) From: Philip McGrath Date: Thu, 16 Nov 2023 14:15:50 -0500 Message-ID: X-Mailer: git-send-email 2.41.0 In-Reply-To: References: MIME-Version: 1.0 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 16 19:15:51 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Philip McGrath X-Patchwork-Id: 56527 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 0FB5B27BBE9; Thu, 16 Nov 2023 19:18:09 +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 9700027BBE2 for ; Thu, 16 Nov 2023 19:18:07 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1r3hsL-0004MU-31; Thu, 16 Nov 2023 14:18:05 -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 1r3hsJ-0004LY-Un for guix-patches@gnu.org; Thu, 16 Nov 2023 14:18:03 -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 1r3hsJ-0004Wg-MA for guix-patches@gnu.org; Thu, 16 Nov 2023 14:18:03 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1r3hsJ-0003os-E7 for guix-patches@gnu.org; Thu, 16 Nov 2023 14:18:03 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#67019] [PATCH v2 13/16] gnu: js-commander: Install as a node module. Resent-From: Philip McGrath Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 16 Nov 2023 19:18: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 , Liliana Marie Prikler Received: via spool by 67019-submit@debbugs.gnu.org id=B67019.170016223014547 (code B ref 67019); Thu, 16 Nov 2023 19:18:03 +0000 Received: (at 67019) by debbugs.gnu.org; 16 Nov 2023 19:17:10 +0000 Received: from localhost ([127.0.0.1]:44597 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1r3hrR-0003mT-DM for submit@debbugs.gnu.org; Thu, 16 Nov 2023 14:17:09 -0500 Received: from out4-smtp.messagingengine.com ([66.111.4.28]:60411) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1r3hr3-0003iG-VQ for 67019@debbugs.gnu.org; Thu, 16 Nov 2023 14:16:46 -0500 Received: from compute3.internal (compute3.nyi.internal [10.202.2.43]) by mailout.nyi.internal (Postfix) with ESMTP id 14CB35C00D1; Thu, 16 Nov 2023 14:16:46 -0500 (EST) Received: from mailfrontend1 ([10.202.2.162]) by compute3.internal (MEProxy); Thu, 16 Nov 2023 14:16:46 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= philipmcgrath.com; h=cc:cc:content-transfer-encoding :content-type:content-type:date:date:from:from:in-reply-to :in-reply-to:message-id:mime-version:references:reply-to:sender :subject:subject:to:to; s=fm1; t=1700162206; x=1700248606; bh=Ki Wcea6wn/K24MSCD0fOryDe70WTqDSaNudxaoHqdSk=; b=ZvjohQt5pWNhV/O+Am V+oR0BB6mUGyZF1owTlpwHaQrDqDnqIs+toIErD/QdjtELn8qdLMcsE4jkFr9s1C 9saGhxc+D0cYieQ15LkiJceVwggvdoKGHh3QXg63vyzPOsoNh+uMouwoofvNvd9B hEzOyrRY77HqUivZHlVYO1Zad4Kf3MhW1ciBhrqlNEDl9fG500A32QPdysJTq/Bj 3xLBKoariwoeRMm4a4dUe+4ewovjMBz0rW1aNuWVFkA3jzgcMHUYRLu4SUYk18gv stQkzRfsGlWrbM2WE6xw5ZbdJpMooFY/GNpZeo/r8Y6u2rTsPm2Nv327fQ8pxrGU 2VQQ== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:cc:content-transfer-encoding :content-type:content-type:date:date:feedback-id:feedback-id :from:from:in-reply-to:in-reply-to:message-id:mime-version :references:reply-to:sender:subject:subject:to:to:x-me-proxy :x-me-proxy:x-me-sender:x-me-sender:x-sasl-enc; s=fm1; t= 1700162206; x=1700248606; bh=KiWcea6wn/K24MSCD0fOryDe70WTqDSaNud xaoHqdSk=; b=ahR49F/Jq2WrUmfNXACtNb+WjVlV1LsuDdbsCbUUcXe7i1eb6Xi G6pb9o/JH6UHp8vaq6ySzX4IPzlESgQnMUn341Uq6rHxXa1wBDknh846bHFmOpMh OuKYdRcjf8RkeNzUMGXxB0YhibutE/X5nm54/EfHUGg5gFXNOLY/dhkDq7V/QdBg oL9gjuqrMZpPC+50D2+gjLDNWp2NQsIjAB4EAYctaeM1bbsGrq9cx13bSnc/wRo2 CfveGS5TPiagjmUvQVPmuVKHjNj+4NKpvsaLz4NUcpA7x4LLnPgvKw4djhMo9uoO sD4FUS9Z8d+upryjBwCn3JuFkLzL3Vc1bgg== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvkedrudefkedguddvtdcutefuodetggdotefrod ftvfcurfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfgh necuuegrihhlohhuthemuceftddtnecusecvtfgvtghiphhivghnthhsucdlqddutddtmd enfghrlhcuvffnffculdefhedmnecujfgurhephffvvefufffkofgjfhggtgfgsehtkeer tdertdejnecuhfhrohhmpefrhhhilhhiphcuofgtifhrrghthhcuoehphhhilhhiphesph hhihhlihhpmhgtghhrrghthhdrtghomheqnecuggftrfgrthhtvghrnhepgefguefgfedt vdejhfettdeuvdduheehgeevvdekgfelvefffedthffhkeetgeffnecuffhomhgrihhnpe hgihhthhhusgdrtghomhenucevlhhushhtvghrufhiiigvpedtnecurfgrrhgrmhepmhgr ihhlfhhrohhmpehphhhilhhiphesphhhihhlihhpmhgtghhrrghthhdrtghomh X-ME-Proxy: Feedback-ID: i2b1146f3:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Thu, 16 Nov 2023 14:16:45 -0500 (EST) From: Philip McGrath Date: Thu, 16 Nov 2023 14:15:51 -0500 Message-ID: <2dbd50a275174556a071bc7047823c80fa20ee67.1700161584.git.philip@philipmcgrath.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: References: MIME-Version: 1.0 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 16 19:15:52 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Philip McGrath X-Patchwork-Id: 56532 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 3F35E27BBE9; Thu, 16 Nov 2023 19:18:45 +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 5E91E27BBE2 for ; Thu, 16 Nov 2023 19:18:44 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1r3hsM-0004OE-LS; Thu, 16 Nov 2023 14:18:06 -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 1r3hsK-0004MM-Tp for guix-patches@gnu.org; Thu, 16 Nov 2023 14:18:04 -0500 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1r3hsK-0004c2-LE for guix-patches@gnu.org; Thu, 16 Nov 2023 14:18:04 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1r3hsK-0003p7-CH for guix-patches@gnu.org; Thu, 16 Nov 2023 14:18:04 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#67019] [PATCH v2 14/16] gnu: Add mftrace. Resent-From: Philip McGrath Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 16 Nov 2023 19:18: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 , Liliana Marie Prikler Received: via spool by 67019-submit@debbugs.gnu.org id=B67019.170016223114562 (code B ref 67019); Thu, 16 Nov 2023 19:18:04 +0000 Received: (at 67019) by debbugs.gnu.org; 16 Nov 2023 19:17:11 +0000 Received: from localhost ([127.0.0.1]:44601 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1r3hrS-0003mi-BT for submit@debbugs.gnu.org; Thu, 16 Nov 2023 14:17:10 -0500 Received: from out4-smtp.messagingengine.com ([66.111.4.28]:38383) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1r3hr4-0003iQ-R1 for 67019@debbugs.gnu.org; Thu, 16 Nov 2023 14:16:47 -0500 Received: from compute7.internal (compute7.nyi.internal [10.202.2.48]) by mailout.nyi.internal (Postfix) with ESMTP id E73135C016D; Thu, 16 Nov 2023 14:16:46 -0500 (EST) Received: from mailfrontend1 ([10.202.2.162]) by compute7.internal (MEProxy); Thu, 16 Nov 2023 14:16:46 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= philipmcgrath.com; h=cc:cc:content-transfer-encoding :content-type:date:date:from:from:in-reply-to:in-reply-to :message-id:mime-version:references:reply-to:sender:subject :subject:to:to; s=fm1; t=1700162206; x=1700248606; bh=TvLYFhRUmx QVgc7MzzlUM6Eaqi7+ZzgSDbtYajl7ego=; b=QsCppcQB6xyznfyM0suZaGrQc2 Y+10GGPrkjjbPxE6rG1Oy2Ka/sgrjfMxP89BxXlUubhhWJ8lR9m+rd9qULgxpmsI XPT/cjIjbOKRt6hPw8hCw1XOaAyegohdkiK/O6tZFqXWnTmTQcenHOft5nKbI9Av AxqrMQfpeYk8U3GH1CYulSfQjzQqxWcV6wpnvqRLo3MSOwFa4OHwQcx4hP7RGUVh gBICRQAH9C4lFkGy0RAUf1pZLPV4GyDGdYMSruckNAptIJcqf5s5khLmH7akUboS QZJTfVii5cWsMFjsRcSYQMDQsBBWb2ec/v5XlHYMdBuK+p+Ear9ITuxVMWfw== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:cc:content-transfer-encoding :content-type:date:date:feedback-id:feedback-id:from:from :in-reply-to:in-reply-to:message-id:mime-version:references :reply-to:sender:subject:subject:to:to:x-me-proxy:x-me-proxy :x-me-sender:x-me-sender:x-sasl-enc; s=fm1; t=1700162206; x= 1700248606; bh=TvLYFhRUmxQVgc7MzzlUM6Eaqi7+ZzgSDbtYajl7ego=; b=E kDVpqFah90/UFfwcVidxPJ0TnL/kjJalflMGav9WRQdAVcCRapnyKZkPda9Fvqmn AIaf4mbV4NEPkvn4hN54k17resuWv1jcghpwMUThRK4jGi86VAeLr0CHkv1lG0jE BilKInLBSHGqw/8PHxI/Xewpsw6CmK59CeBOZEpCb0/XmTycj5Xr791/RbFXipLS NdZY+/CuAuu4ie7j2app4aQSVwsuoG2VUKQ5vlV1ngLRI2qqrhc/CwsYRULnjseI f3y/ofZ93RecxxnNLiKxc08lydOc9CGD3YdfSi0rS4SUvGIXPMh1GtsUzg/RAEy8 1LSzYLdlZPzz0FVwvFxKg== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvkedrudefkedguddvtdcutefuodetggdotefrod ftvfcurfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfgh necuuegrihhlohhuthemuceftddtnecusecvtfgvtghiphhivghnthhsucdlqddutddtmd enogfuuhhsphgvtghtffhomhgrihhnucdlgeelmdenucfjughrpefhvfevufffkffojghf ggfgsedtkeertdertddtnecuhfhrohhmpefrhhhilhhiphcuofgtifhrrghthhcuoehphh hilhhiphesphhhihhlihhpmhgtghhrrghthhdrtghomheqnecuggftrfgrthhtvghrnhep geevuefggffgtdefueefvefgleeigfeiueefudekfeehueekhfegvdfgjeehuefgnecuff homhgrihhnpehsohhurhgtvghfohhrghgvrdhnvghtpdhgihhthhhusgdrtghomhdplhhi lhihphhonhgurdhorhhgnecuvehluhhsthgvrhfuihiivgeptdenucfrrghrrghmpehmrg hilhhfrhhomhepphhhihhlihhpsehphhhilhhiphhmtghgrhgrthhhrdgtohhm X-ME-Proxy: Feedback-ID: i2b1146f3:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Thu, 16 Nov 2023 14:16:46 -0500 (EST) From: Philip McGrath Date: Thu, 16 Nov 2023 14:15:52 -0500 Message-ID: <4b3be6a948d9e6da5dd729caaaeff9c5fef06783.1700161584.git.philip@philipmcgrath.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: References: MIME-Version: 1.0 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 16 19:15:53 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Philip McGrath X-Patchwork-Id: 56535 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 14F3F27BBE2; Thu, 16 Nov 2023 19:18:58 +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 0E1F427BBE9 for ; Thu, 16 Nov 2023 19:18:57 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1r3hsO-0004Qu-KU; Thu, 16 Nov 2023 14:18:08 -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 1r3hsM-0004Nc-4O for guix-patches@gnu.org; Thu, 16 Nov 2023 14:18:06 -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 1r3hsL-0004gj-Rm for guix-patches@gnu.org; Thu, 16 Nov 2023 14:18:05 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1r3hsL-0003pU-Ja for guix-patches@gnu.org; Thu, 16 Nov 2023 14:18:05 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#67019] [PATCH v2 15/16] gnu: Add font-katex. Resent-From: Philip McGrath Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 16 Nov 2023 19:18: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 , Liliana Marie Prikler Received: via spool by 67019-submit@debbugs.gnu.org id=B67019.170016223214585 (code B ref 67019); Thu, 16 Nov 2023 19:18:05 +0000 Received: (at 67019) by debbugs.gnu.org; 16 Nov 2023 19:17:12 +0000 Received: from localhost ([127.0.0.1]:44607 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1r3hrU-0003n5-AJ for submit@debbugs.gnu.org; Thu, 16 Nov 2023 14:17:12 -0500 Received: from out4-smtp.messagingengine.com ([66.111.4.28]:48699) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1r3hr5-0003iU-Jf for 67019@debbugs.gnu.org; Thu, 16 Nov 2023 14:16:49 -0500 Received: from compute3.internal (compute3.nyi.internal [10.202.2.43]) by mailout.nyi.internal (Postfix) with ESMTP id AFAE85C0176; Thu, 16 Nov 2023 14:16:47 -0500 (EST) Received: from mailfrontend1 ([10.202.2.162]) by compute3.internal (MEProxy); Thu, 16 Nov 2023 14:16:47 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= philipmcgrath.com; h=cc:cc:content-transfer-encoding :content-type:date:date:from:from:in-reply-to:in-reply-to :message-id:mime-version:references:reply-to:sender:subject :subject:to:to; s=fm1; t=1700162207; x=1700248607; bh=hzOWIYY8DG eo2gwVnQmIMFa+q3DnC8RCm3VUsXPBkXI=; b=DHlF81scWg5IOEXhJ691LhqREU oHZRf35whrF9j8Virb3wqUMQ4Fg1O7+9Ae0qrjF1zlr3dq4jyIxibPUJdPx+Hwdn gqDe33j5f9+e14ImRup857FL1i2OgyzLogcZX8J2k6yxliG0ymO0OfWbvJPLMZSj DUVhJO89od96ubo0Ot5XMNJqNE8Zg61ZV8fNm0/7NKhHoLknw7dzxeej2RcIVpXv R5cp8qjRMFo96p3IPeL+iQXwboRNAqOeqX+3H0gWAL3YNGPUDTvHOCpDHZseYY65 Yu42AX8x08PQXNRK3x9ljGHW0BVqB3aGe5vj0jsk79/Z8oGSRSPeOVsf8OKw== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:cc:content-transfer-encoding :content-type:date:date:feedback-id:feedback-id:from:from :in-reply-to:in-reply-to:message-id:mime-version:references :reply-to:sender:subject:subject:to:to:x-me-proxy:x-me-proxy :x-me-sender:x-me-sender:x-sasl-enc; s=fm1; t=1700162207; x= 1700248607; bh=hzOWIYY8DGeo2gwVnQmIMFa+q3DnC8RCm3VUsXPBkXI=; b=S ddzJ5TLSPjyuCaCZMm5xeRf1pHrxkWDdZnXC6OI5jB1iwyC9lu8meuP+8SkefUsP oy1QvAYIeWaZabDQ4kkSLf4H57nbf3kWbDI285xmeWXFbIm7X+czbaTj/Tl/U5lz qbrdULWYtOH6FUp+jNQSXbYzRgMqIMsiuwFqjpGN+EYxxFp30kk8E1OfpUMicS7s NF7H6ws3GynrkO4hVHFaJj/VS4V6suHLaSD1ZE/dWL6K9qnPSQNrUPHm93tW8SFI CRTO+x9BHsmKPjm7NeE07loz7cY3pNLW56Ob1mbTaNYVar2lsfvMl1UpP1ZO6NQc HBsGMXxu9eqAUVk1JfZZQ== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvkedrudefkedguddvtdcutefuodetggdotefrod ftvfcurfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfgh necuuegrihhlohhuthemuceftddtnecusecvtfgvtghiphhivghnthhsucdlqddutddtmd enucfjughrpefhvfevufffkffojghfggfgsedtkeertdertddtnecuhfhrohhmpefrhhhi lhhiphcuofgtifhrrghthhcuoehphhhilhhiphesphhhihhlihhpmhgtghhrrghthhdrtg homheqnecuggftrfgrthhtvghrnhepjeeuveduleduteelfeevhfehtdeikeelheegheej geetkeefhedukeevhedvgefgnecuffhomhgrihhnpehgihhthhhusgdrtghomhdpkhgrth gvgidrohhrghenucevlhhushhtvghrufhiiigvpedtnecurfgrrhgrmhepmhgrihhlfhhr ohhmpehphhhilhhiphesphhhihhlihhpmhgtghhrrghthhdrtghomh X-ME-Proxy: Feedback-ID: i2b1146f3:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Thu, 16 Nov 2023 14:16:47 -0500 (EST) From: Philip McGrath Date: Thu, 16 Nov 2023 14:15:53 -0500 Message-ID: <16f8bf6f752e012ec9a61c8cfc6029cb7c46e536.1700161584.git.philip@philipmcgrath.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: References: MIME-Version: 1.0 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 16 19:15:54 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Philip McGrath X-Patchwork-Id: 56536 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 CDC4127BBE9; Thu, 16 Nov 2023 19:19:03 +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 3071B27BBE2 for ; Thu, 16 Nov 2023 19:19:01 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1r3hsO-0004Qy-Ui; Thu, 16 Nov 2023 14:18:08 -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 1r3hsM-0004OG-Lz for guix-patches@gnu.org; Thu, 16 Nov 2023 14:18:06 -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 1r3hsM-0004ii-CP for guix-patches@gnu.org; Thu, 16 Nov 2023 14:18:06 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1r3hsM-0003pb-3u for guix-patches@gnu.org; Thu, 16 Nov 2023 14:18:06 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#67019] [PATCH v2 16/16] gnu: Add katex. Resent-From: Philip McGrath Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 16 Nov 2023 19:18: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 , Liliana Marie Prikler Received: via spool by 67019-submit@debbugs.gnu.org id=B67019.170016223314592 (code B ref 67019); Thu, 16 Nov 2023 19:18:06 +0000 Received: (at 67019) by debbugs.gnu.org; 16 Nov 2023 19:17:13 +0000 Received: from localhost ([127.0.0.1]:44609 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1r3hrU-0003nC-RO for submit@debbugs.gnu.org; Thu, 16 Nov 2023 14:17:13 -0500 Received: from out4-smtp.messagingengine.com ([66.111.4.28]:60411) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1r3hr6-0003iG-IV for 67019@debbugs.gnu.org; Thu, 16 Nov 2023 14:16:50 -0500 Received: from compute3.internal (compute3.nyi.internal [10.202.2.43]) by mailout.nyi.internal (Postfix) with ESMTP id A72365C016D; Thu, 16 Nov 2023 14:16:48 -0500 (EST) Received: from mailfrontend1 ([10.202.2.162]) by compute3.internal (MEProxy); Thu, 16 Nov 2023 14:16:48 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= philipmcgrath.com; h=cc:cc:content-transfer-encoding :content-type:date:date:from:from:in-reply-to:in-reply-to :message-id:mime-version:references:reply-to:sender:subject :subject:to:to; s=fm1; t=1700162208; x=1700248608; bh=cVOIUCojWI MibNt/4/ps5FcqYscpDwqoSyikZmtVKZU=; b=HpF5x55eH/1qWFQcg5YY+ZyrU4 D+t9ZLKxD+ThHh+IysVxaCmioYKGrEb4sU+QByHuC/xYYo1Z4QpSIhcgTWuD7nHX nug5PZrX0HXlS8NKLuIgN9BtpDz+ORWOA26qqf21Z3z3s6MGTFchSdKAox3O99/p cmHd8TsgHZu2uFmL5p7UeMT6+W+B5/t604KYTG9n/vfTbDu5wQEKfEDlfKbpcc6C onBht1UrFA1UIfpyGUiB9Ke2IUaI9Vj/YLKlMByNfGiEi9Le+BTP1wpjhs0+bEOf Mkbu7ybPLYPTxLblBoGzgiNrzK/ORRmsdZeFGNgW5HerKbTv5TEXiS9PGfQw== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:cc:content-transfer-encoding :content-type:date:date:feedback-id:feedback-id:from:from :in-reply-to:in-reply-to:message-id:mime-version:references :reply-to:sender:subject:subject:to:to:x-me-proxy:x-me-proxy :x-me-sender:x-me-sender:x-sasl-enc; s=fm1; t=1700162208; x= 1700248608; bh=cVOIUCojWIMibNt/4/ps5FcqYscpDwqoSyikZmtVKZU=; b=x 0JA73z772mGB+5wPpmx/AcTBsS/VMnAJGDwwFejoodDaeOMIF6LeaaWd5N5qcKG3 5yY773seIVNei9VJXnyK1LtKfUY4y2tVy5r6U5YF0wQxXJU4DNtlBZAiNg+bI+s1 jnKtAkKTjX48ngkXTZwBdQoEvDuId6W01+ZF1T0NGmM0dEG7y4V5v9rZl+0phK/3 rzNh0+XMU235zGAlLiIAbCrS2C3wEVGQg3pjqP/iUkmRXfPlaJE3NOkwPhqP8c2u qJg4VCy2g90zTq9RtfKuw9+8SdvTMSlIxO8bli0/yc++LJDvbvP4NgHzHaWkQzw4 L7vdoyTqwnLlZUTn8z2LA== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvkedrudefkedguddvtdcutefuodetggdotefrod ftvfcurfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfgh necuuegrihhlohhuthemuceftddtnecusecvtfgvtghiphhivghnthhsucdlqddutddtmd enucfjughrpefhvfevufffkffojghfggfgsedtkeertdertddtnecuhfhrohhmpefrhhhi lhhiphcuofgtifhrrghthhcuoehphhhilhhiphesphhhihhlihhpmhgtghhrrghthhdrtg homheqnecuggftrfgrthhtvghrnhepleevkeffuedvgfeihefhgeefjeevueekudfhteff ueffieekudehvdeivefgudejnecuffhomhgrihhnpehkrghtvgigrdhorhhgnecuvehluh hsthgvrhfuihiivgeptdenucfrrghrrghmpehmrghilhhfrhhomhepphhhihhlihhpsehp hhhilhhiphhmtghgrhgrthhhrdgtohhm X-ME-Proxy: Feedback-ID: i2b1146f3:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Thu, 16 Nov 2023 14:16:47 -0500 (EST) From: Philip McGrath Date: Thu, 16 Nov 2023 14:15:54 -0500 Message-ID: X-Mailer: git-send-email 2.41.0 In-Reply-To: References: MIME-Version: 1.0 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")