From patchwork Sat May 17 06:41:03 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Dan Khodabakhsh X-Patchwork-Id: 42646 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 4E89927BC4B; Sat, 17 May 2025 07:42:20 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=0.0 required=5.0 tests=none autolearn=unavailable version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 033D027BC49 for ; Sat, 17 May 2025 07:42:20 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uGBFF-00027g-De; Sat, 17 May 2025 02:42:05 -0400 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 1uGBFC-00024m-VM for guix-patches@gnu.org; Sat, 17 May 2025 02:42:03 -0400 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 1uGBFC-0006IM-MN for guix-patches@gnu.org; Sat, 17 May 2025 02:42:02 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=Date:Mime-Version:From:To:In-Reply-To:References:Subject; bh=D53elOL7wGhXkyKAQPhVVRJ+LFg9XIlLS+3r50WQsUw=; b=OJUVgAcmaLFPSjDhfZRwIuWNGMKGuSI1tc3MGCMLewLwig15yCE6Z5SR+8AwhvWGYeK1s045fiTjrSRWcZO6F24VupXbOd3BbjVFygTX3VI7VLzcUzTwd4m79zZxnWT1aD/FGKCp7XnJVplLSieaYjbNnm6MSVWRE4owasSXx9KEODZfTFWLiRWeG1PQHw6CyI5M/QXTHl437QD2OavB2l0b0cezYiwR81QzkZnCNp8vej9kQIIK7BVuZsbFYhcgpzVEvn4at+fjWY7axvcvx43AuBeMIArEVPrXYNC3F/9Mx4j/hH5ZAJSfwmp89uR38qgu3rGVa0IgrnT7PvP+SA==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1uGBFC-0003Yn-FQ for guix-patches@gnu.org; Sat, 17 May 2025 02:42:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#78183] [PATCH 1/1] gnu: node-esbuild: Replace esbuild-node with node-esbuild References: In-Reply-To: Resent-From: "Dan Khodabakhsh" Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 17 May 2025 06:42:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 78183 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: "78183" <78183@debbugs.gnu.org> Received: via spool by 78183-submit@debbugs.gnu.org id=B78183.174746408613581 (code B ref 78183); Sat, 17 May 2025 06:42:02 +0000 Received: (at 78183) by debbugs.gnu.org; 17 May 2025 06:41:26 +0000 Received: from localhost ([127.0.0.1]:44611 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1uGBEX-0003Wq-2Z for submit@debbugs.gnu.org; Sat, 17 May 2025 02:41:26 -0400 Received: from out203-205-221-191.mail.qq.com ([203.205.221.191]:36532) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1uGBES-0003WR-KE for 78183@debbugs.gnu.org; Sat, 17 May 2025 02:41:18 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=niel.khodabakh.sh; s=xmailafb52b5a; t=1747464065; bh=D53elOL7wGhXkyKAQPhVVRJ+LFg9XIlLS+3r50WQsUw=; h=From:To:Subject:Date; b=N1CK7Ds7JyojN9h2r0mGvnn7KNWWt0UBaBT4bdFm4BM/01F7NIEUL78jjVcY0Er8I vmjvBqLXUhg0uAO/pf/5EDhCbs2GRLh0/19fVuPMYFXyMhl/qvz2Vl5Rba/JoTNmSf yfVJudOiZMwwWBXOSTVDeOEdoyaIqVtZ+o6KsgLY= X-QQ-XMRINFO: NS+P29fieYNw95Bth2bWPxk= X-QQ-XMAILINFO: NYUgBOsgKXNqcGKN0iRXDatuukXINsh0L5+QvAyVplf57hfIJsICIggh9khij6 juvFtyB4hysUf6AqFcQiurR3SzImpTQHKbB+1mAszjyVl+954/SUWCcnLqEIuaLn1od2/35YXV15F rrwdl1KDHl6HEpIEM7KzxGe5UcmpPSCAPerbBezCZfUSfaGLshqHQtvNn1YIWm/H9sx4l0ujY2Xcn JezMxmaIrrNwD4/nq9Wdfs9Zg0K4ht7XIpx1n7Q4LDf+sVnSJHxKDZmPSBP9bkNag+upevKgRt/CW IQOEtcPYVYnT7xyANQ1UvlH2xry0HwJhJJo8QxL8wLafN8H+iRSqhznsXkkXjvmuKd33okZrTtEJZ 2DfhziG3QJp0daRE85vL5sDuXqZfjGQf/Byk64j/rCy0YnHPjLi7FPwyq/rx+HN20ReQ4YjX6DNFU kyeUpyDeC6d4oI148KvJD5frSkg9bk1iMpgmtdntCMPZAAMCCCGWpHqoyUJT5JSyb4L8igWXB14hp eYEoeoi+MOuMo6+vkhDEmtrhm6UozELuUoMvyd5Z12PZXGkDLHg37T/EnV8t73D58PDnDu9wzK6cJ hm5mOz4zsgPjFLY3aBFQsQL0YSqKrrG1iPe4AHTVf6e22Rzo2gJgZB49CSpMkJhXJuXU+vGN0yhOY v/xv3NebcW4ytB6cA5Q+BmoY5DfDk9hCZPA5vlym1ix3VX1bTiiAFAMK8IODqIV8QWcpSA1PPZm5v GtZDslDOKSKpGQ3ukFkexJ5CYC2V1xGT7RutSaSywrSAETFdqPkjpHCfHVpF0Svm0z41qeK7vqBg1 tsNYOyTvtiFf4ARipwwAKUs4QfrMKGNzZxPguB29C40VfEnyma/g8z5/OlLWIOMZc0lY4DJjS3NMu SjAScX6y6mNI/vKaIXpry/xTP+W+ZM/n7N033ZJF4xuIVQa/nIQCizRQAV6fP5/pKzP/ulni7wDiu cFoYwhd7aHDnUR25Ji8qhB5NzjT+O3UN1Yy5/UztdB4wOccork From: "Dan Khodabakhsh" Mime-Version: 1.0 Date: Sat, 17 May 2025 06:41:03 +0000 X-Priority: 3 Message-ID: X-QQ-MIME: TCMime 1.0 by Tencent X-Mailer: QQMail 2.x X-QQ-Mailer: QQMail 2.x X-QQ-mid: xmsezc29-1t1747464063t3ylhj6qf 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 One more change, removed the unnecessary deletion of the package-lock.json file, this is done automatically as part of the existing phases. Here is the updated patch: From 616f2714d90d2dce310130c19cfcb506299cc21b Mon Sep 17 00:00:00 2001 Message-ID: <616f2714d90d2dce310130c19cfcb506299cc21b.1747463653.git.d@niel.khodabakh.sh> From: Daniel Khodabakhsh Date: Wed, 30 Apr 2025 23:45:45 -0700 Subject: gnu: node-esbuild: Replace esbuild-node with node-esbuild. This change replaces the esbuild-node package with one named node-esbuild: - node-esbuild conforms to the name of node packages. - Uses (guix build-system node) instead of (guix build-system go) which is more appropriate because this is a node package. - Uses esbuild as an input to use its binary so that it isn't rebuilt. - Does not include the go-lang source by default. - Does not include the lib/node_modules/esbuild/bin/esbuild shim javascript file, but instead uses the actual binary. The shim file is supposed to be replaced as part of the node module build process. Here is the structure of node-esbuild: ├── bin │   └── esbuild -> ../lib/node_modules/esbuild/bin/esbuild ├── etc │   └── ld.so.cache ├── lib │   └── node_modules │   └── esbuild │   ├── bin │   │   └── esbuild <- Actual binary │   ├── lib │   │   ├── main.d.ts │   │   └── main.js │   ├── LICENSE.md │   ├── package.json │   └── README.md └── share └── doc └── node-esbuild-0.24.0 └── LICENSE.md Structure of esbuild-node ├── bin │   └── esbuild <- Actual binary ├── etc │   └── ld.so.cache ├── lib │   └── node_modules │   └── esbuild │   ├── bin │   │   └── esbuild <- Javascript file which tries to run /bin/esbuild │   ├── install.js │   ├── lib │   │   ├── main.d.ts │   │   └── main.js │   ├── package.json │   └── README.md ├── share │   └── doc │   └── esbuild-node-0.14.0 │   └── LICENSE.md └── src └── github.com └── evanw └── esbuild └── cmd └── esbuild ├── main.go ├── main_other.go ├── main_wasm.go ├── service.go ├── stdio_protocol.go └── version.go Structure of the NPM package: ├── bin │   └── esbuild <- Actual binary ├── install.js ├── lib │   ├── main.d.ts │   └── main.js ├── LICENSE.md ├── package.json └── README.md Change-Id: I344cffe77f7065813284ccc434a3508650ba941d Signed-off-by: Daniel Khodabakhsh --- gnu/packages/cran.scm | 3 +- gnu/packages/web.scm | 87 ++++++++++++++++++------------------------- 2 files changed, 38 insertions(+), 52 deletions(-) base-commit: a6b40f7a2f2db3107319d1a5e099b269a462a723 diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 194133777e..d980035fa3 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -40,6 +40,7 @@ ;;; Copyright © 2024 Marco Baggio ;;; Copyright © 2024, 2025 Spencer King ;;; Copyright © 2024 Tor-björn Claesson +;;; Copyright © 2025 Daniel Khodabakhsh ;;; ;;; This file is part of GNU Guix. ;;; @@ -6368,7 +6369,7 @@ (define-public r-waiter "inst/assets/garcon/garcon.min.js")))))) (propagated-inputs (list r-htmltools r-r6 r-shiny)) (native-inputs - (list esbuild-node node-lts r-knitr + (list node-esbuild node-lts r-knitr (origin (method git-fetch) (uri (git-reference diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index b3f998aca9..4eef020c18 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -70,6 +70,7 @@ ;;; Copyright © 2024 Zheng Junjie <873216071@qq.com> ;;; Copyright © 2024, 2025 Artyom V. Poptsov ;;; Copyright © 2025 Raven Hallsby +;;; Copyright © 2025 Daniel Khodabakhsh ;;; ;;; This file is part of GNU Guix. ;;; @@ -104,6 +105,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) @@ -2187,57 +2189,40 @@ (define-public websockify directions.") (license license:lgpl3))) -;; This is a variant of esbuild that builds and installs the nodejs API. -;; Eventually, this should probably be merged with the esbuild package. -(define-public esbuild-node - (package - (inherit esbuild) - (name "esbuild-node") - (version "0.14.0") - (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/evanw/esbuild") - (commit (string-append "v" version)))) - (file-name (git-file-name name version)) - (sha256 - (base32 "09r1xy0kk6c9cpz6q0mxr4why373pwxbm439z2ihq3k1d5kk7x4w")) - (modules '((guix build utils))) - (snippet - ;; Remove prebuilt binaries - '(delete-file-recursively "lib/npm/exit0")))) - (arguments - (list - #:import-path "github.com/evanw/esbuild/cmd/esbuild" - #:unpack-path "github.com/evanw/esbuild" - #:phases - #~(modify-phases %standard-phases - (add-after 'build 'build-platform - (lambda* (#:key unpack-path #:allow-other-keys) - (with-directory-excursion (string-append "src/" unpack-path) - ;; Must be writable. - (for-each make-file-writable (find-files "." ".")) - (invoke "node" "scripts/esbuild.js" - (string-append #$output "/bin/esbuild")) - (let ((modules (string-append #$output "/lib/node_modules/esbuild"))) - (mkdir-p modules) - (copy-recursively "npm/esbuild" modules))))) - (replace 'check - (lambda* (#:key tests? unpack-path #:allow-other-keys) - (when tests? - ;; The "Go Race Detector" is only supported on 64-bit - ;; platforms, this variable disables it. - ;; TODO: Causes too many rebuilds, rewrite to limit to x86_64, - ;; aarch64 and ppc64le. - #$(if (target-riscv64?) - `(setenv "ESBUILD_RACE" "") - #~(unless #$(target-64bit?) - (setenv "ESBUILD_RACE" ""))) - (with-directory-excursion (string-append "src/" unpack-path) - (invoke "make" "test-go")))))))) - (native-inputs - (list go-github-com-kylelemons-godebug node-lts)))) +(define-public node-esbuild + (package + (name "node-esbuild") + (version (package-version esbuild)) + (source + (origin + (inherit (package-source esbuild)) + (file-name (git-file-name name version)) + (snippet #f) + (modules '()))) + (build-system node-build-system) + (inputs (list esbuild)) + (arguments (list + #:tests? #f + #:phases #~(modify-phases %standard-phases + (add-after 'unpack 'chdir (lambda _ + (chdir "npm/esbuild"))) + (replace 'build (lambda* (#:key inputs #:allow-other-keys) + (let + ((esbuild-bin + (string-append (assoc-ref inputs "esbuild") "/bin/esbuild"))) + (invoke + "node" + "../../scripts/esbuild.js" + esbuild-bin + "--neutral") + (modify-json + (delete-fields '("optionalDependencies" "scripts"))) + (delete-file "install.js") + (copy-file esbuild-bin "bin/esbuild"))))))) + (home-page (package-home-page esbuild)) + (synopsis "Node module of ESBuild") + (description (package-description esbuild)) + (license (package-license esbuild)))) (define-public wwwoffle (package