From patchwork Tue Feb 18 10:50:14 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jelle Licht X-Patchwork-Id: 38822 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 25ADF27BBE2; Tue, 18 Feb 2025 10:51:42 +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=-7.6 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_BLOCKED, RCVD_IN_VALIDITY_CERTIFIED,RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE, 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 DA94627BBE9 for ; Tue, 18 Feb 2025 10:51:41 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tkLBx-0007qf-Fl; Tue, 18 Feb 2025 05:51: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 1tkLBv-0007qL-PZ for guix-patches@gnu.org; Tue, 18 Feb 2025 05:51: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 1tkLBv-0002U2-F4 for guix-patches@gnu.org; Tue, 18 Feb 2025 05:51:03 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:Date:References:In-Reply-To:From:To:Subject; bh=nFNt7Cr3oxYQQhCi2sytUA+ebUx/xB+NROsWllpUtH4=; b=ENyOHLYRv4WBCDzconVX+OL/bCdI2L6fybWpT8MsTjsyY9UwPdWU3MGuSbzgz9xR5zx0f4OLMFZLg5fLKScLhJ9LHevnhZu8sjy9ilOAG2aU8jJhkAH/5NQXe72YLNfD2JeRojQ39E2Y3FLllw9/TufHxs6VS2Cjg8r8UwIqqQNxWn1WEUzmnIxw7o4E/O+jruKyUO8SJEctYSqYp0udDrgyXfVrFVg0nt4/15VjyDHk5Efooogiwm8NaS5rkcnjjTdmBoiiEGS40tdeaBkypUd4bPJ1iaGvlPF4gUy7ZnO0BcSrWkOl6qvnRodVe2vqJrpg5TkX6qlFFaqzCnd5RQ==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tkLBu-00014E-IG for guix-patches@gnu.org; Tue, 18 Feb 2025 05:51:02 -0500 Subject: bug#74900: [PATCH v2 0/6] build-system/node: Replace (guix build json) by (json). Resent-From: Jelle Licht Original-Sender: "Debbugs-submit" Resent-To: guix-patches@gnu.org Resent-Date: Tue, 18 Feb 2025 10:51:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: cc-closed 74900 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Nicolas Graves , 74900-done@debbugs.gnu.org Cc: d.khodabakhsh@gmail.com Mail-Followup-To: 74900@debbugs.gnu.org, jlicht@fsfe.org, d.khodabakhsh@gmail.com Received: via spool by 74900-done@debbugs.gnu.org id=D74900.17398758273905 (code D ref 74900); Tue, 18 Feb 2025 10:51:02 +0000 Received: (at 74900-done) by debbugs.gnu.org; 18 Feb 2025 10:50:27 +0000 Received: from localhost ([127.0.0.1]:55230 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tkLBK-00010r-ET for submit@debbugs.gnu.org; Tue, 18 Feb 2025 05:50:26 -0500 Received: from mail2.fsfe.org ([213.95.165.55]:45024) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1tkLBF-0000zq-At for 74900-done@debbugs.gnu.org; Tue, 18 Feb 2025 05:50:25 -0500 From: Jelle Licht DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fsfe.org; s=2021081301; t=1739875817; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=nFNt7Cr3oxYQQhCi2sytUA+ebUx/xB+NROsWllpUtH4=; b=JnXpNuvRzjG0GGAkvHH/n87WubFPw4/VojdSgqTi9HZ6AlQLHYg6bCmSj5OcHQVpZcHs0F eAs4EnAlIzicqfb25UuPsRbSCgDVMVKzvYTkEWvTCjhmqT2wixnybyg/tpFmNTZvna5oSK jxZrwfsLXFdcxJ9lFaYjTyinyYaS1lM= In-Reply-To: <20250217234823.10533-1-ngraves@ngraves.fr> References: <20250217234823.10533-1-ngraves@ngraves.fr> Date: Tue, 18 Feb 2025 11:50:14 +0100 Message-ID: <87eczvil21.fsf@fsfe.org> 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 Hey folks, Nicolas Graves writes: > This is a rework of Daniel's patch series. > > I have reworded commit messages to respect (info) Standards ; did some > reindenting ; added the guile-json extension as suggested by Ludo ; > added a patch to use the test-target argument ; and did the same for > tree-sitter modules (which was necessary). > > Daniel Khodabakhsh (2): > build-system/node: Switch to (json). > build-system/node: New API for modifying json. > > Nicolas Graves (4): > build-system/node: Add guile-json extension. > build-system/node: Use test-target argument. > build-system/tree-sitter: Switch to (json). > build-system/tree-sitter: Add guile-json extension. Applied + pushed to a new javascript-team branch with the following small changes to get it to compile cleanly: diff --git a/guix/build-system/node.scm b/guix/build-system/node.scm index 240336ea35..cde0ccb60e 100644 --- a/guix/build-system/node.scm +++ b/guix/build-system/node.scm @@ -96,6 +96,7 @@ (define* (node-build name inputs (outputs '("out")) (search-paths '()) (system (%current-system)) + (guile #f) (guile-json (default-guile-json)) (imported-modules %node-build-system-modules) (modules '((guix build node-build-system) diff --git a/guix/build/node-build-system.scm b/guix/build/node-build-system.scm index 9967069458..05940bc997 100644 --- a/guix/build/node-build-system.scm +++ b/guix/build/node-build-system.scm @@ -221,7 +221,7 @@ (define* (replace-fields fields #:key (strict? #t)) #:strict? strict?)) (define (delete-dev-dependencies) - (delete-fields (list "devDependencies") #:strict #f)) + (delete-fields (list "devDependencies") #:strict? #f)) ;;; ;;; Phases. diff --git a/guix/build-system/tree-sitter.scm b/guix/build-system/tree-sitter.scm index f59a255307..90d9704cb8 100644 --- a/guix/build-system/tree-sitter.scm +++ b/guix/build-system/tree-sitter.scm @@ -104,6 +104,7 @@ (define* (tree-sitter-build name inputs (outputs '("out" "js")) (search-paths '()) (system (%current-system)) + (guile #f) (guile-json (default-guile-json)) (imported-modules %tree-sitter-build-system-modules) (modules '((guix build utils)