From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp11.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms5.migadu.com with LMTPS id kLVjEJhtgGMGOQEAbAwnHQ (envelope-from ) for ; Fri, 25 Nov 2022 08:24:08 +0100 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp11.migadu.com with LMTPS id aKVLEJhtgGMJlAAA9RJhRA (envelope-from ) for ; Fri, 25 Nov 2022 08:24:08 +0100 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 06E0111322 for ; Fri, 25 Nov 2022 08:24:08 +0100 (CET) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oyT48-0000N3-5R; Fri, 25 Nov 2022 02:24: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 1oyT47-0000Mu-27 for guix-patches@gnu.org; Fri, 25 Nov 2022 02:24:03 -0500 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oyT46-0005ip-QA for guix-patches@gnu.org; Fri, 25 Nov 2022 02:24:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1oyT46-0003rN-IB for guix-patches@gnu.org; Fri, 25 Nov 2022 02:24:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#49946] [PATCH v7 30/32] gnu: Add emacs-tree-sitter-core. Resent-From: "(" Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 25 Nov 2022 07:24:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 49946 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: "Pierre Langlois" , <49946@debbugs.gnu.org> Received: via spool by 49946-submit@debbugs.gnu.org id=B49946.166936098514768 (code B ref 49946); Fri, 25 Nov 2022 07:24:02 +0000 Received: (at 49946) by debbugs.gnu.org; 25 Nov 2022 07:23:05 +0000 Received: from localhost ([127.0.0.1]:33291 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oyT3A-0003q8-NK for submit@debbugs.gnu.org; Fri, 25 Nov 2022 02:23:05 -0500 Received: from knopi.disroot.org ([178.21.23.139]:40092) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oyT33-0003pR-N1 for 49946@debbugs.gnu.org; Fri, 25 Nov 2022 02:23:03 -0500 Received: from localhost (localhost [127.0.0.1]) by disroot.org (Postfix) with ESMTP id 0D45041523; Fri, 25 Nov 2022 08:22:57 +0100 (CET) X-Virus-Scanned: SPAM Filter at disroot.org Received: from knopi.disroot.org ([127.0.0.1]) by localhost (disroot.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id qCzQDhh5DpEi; Fri, 25 Nov 2022 08:22:55 +0100 (CET) Mime-Version: 1.0 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=disroot.org; s=mail; t=1669360975; bh=sGT4kMGJ5YyV4RJm5XfqGkL84AVR7+ak77fuy0aP+es=; h=Date:Subject:From:To:References:In-Reply-To:From; b=XuJLt6V/ub8BCRUMWVbcxnAG1ml+Jx7WgXQ5jmsQW37cRgL4Fx2vsbCdpePj6vHN4 lcL9XO45Yzgk0/LGP8eJPjv9TitkmRFvksr8XzA5lSfYbXnM0C3LrIFWiLM3BwSI8e mDc5Wvz/sEOkmyTdVTb5vt39gVhkeBw/S1uYsz8OQn/r+q+vcYqXYoI2gmgUkRxOl0 UIoqiRievFwYnTCAFqpewbnOOUpF4ES8LSVJEnI/zWjZY8wvwyvMVqlMT9jCdt0tGP 1MvAmDRgjxPngDAQOyiQdMfsyFge8bNhto3ln+UYf/fL94ucuIiRH8oXVcAPv+Q0Yj GJf3szrGWYTYA== Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset=UTF-8 Date: Fri, 25 Nov 2022 07:22:54 +0000 Message-Id: References: <87mtfi63ut.fsf@gmx.com> <20221125012142.22579-1-pierre.langlois@gmx.com> <20221125012142.22579-31-pierre.langlois@gmx.com> In-Reply-To: <20221125012142.22579-31-pierre.langlois@gmx.com> 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: , Reply-to: "\(" X-ACL-Warn: , "\( via Guix-patches" From: "\( via Guix-patches" via Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: guix-patches-bounces+larch=yhetil.org@gnu.org X-Migadu-Flow: FLOW_IN X-Migadu-Country: US ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1669361048; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding:resent-cc: resent-from:resent-sender:resent-message-id:in-reply-to:in-reply-to: references:references:list-id:list-help:list-unsubscribe: list-subscribe:list-post:dkim-signature; bh=1QE+HGgguxIKW4/Ol0HWdEJ4UNuSq4BOWv0jwqAq1Xg=; b=FtF0dO8faqzR3tYCxhqyLXvYRFpdZTGZBePLk1duEJK6nvt25aXIizIo7wZ8UifN7Wc5N7 tZ5nZ0zdU6WOzZMhdO3hGXZjLjFPmVI6DlAShW/Q1WpD11WNoACRMyFsACloEYQL6SACRI DH7w0lAgffLpHMHK6MyAHDh9o5UhxnRxHvYcascqCMqRU7uPvyBZoDLH77Tp4iipKOtwGe 2yW/ujCeF/wxH6Cb1hcmcCKDEJ0nCm55mfqVTbhKDH2ltynweT34dNFsh6sxU0wPi5S94t 9MNsWQF+TiiWBreYVjSD2sFcIakae2SlOC9SzVfR791vSHXS3q6pawRodsvDpQ== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1669361048; a=rsa-sha256; cv=none; b=XocuLenXPZaEMGmeco/YAc92bRROF3lKr7ptB8NjoiO0d487G/lvI+NQs6ddtVAGThonUn UxYmxfEO0J73hSO18xEq6rQFWYj2zy9/ISHR1ixyTRC9nawoJ2NLfV7Kq9Paa9H5osQc5S 5l+t5b/FW+anzRTNvj6kq4pA/Iuj7T/rK92Rh2s7x7x+gvvEtmzCttuus8qSzOlj10X+tz i3LfW4tQ0dAu/QlgR7IdNBaZbhDjobcFhaCCo9gMjHSdNIzjPFeObBO2hI45jL1guK3Dcf 6GTfnwxIDlLg9XaeTzGIoDwRfnuBcsavKVGkvsz8K10zj27YIVFw6bVR3aLGlA== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=disroot.org header.s=mail header.b="XuJLt6V/"; dmarc=pass (policy=none) header.from=gnu.org; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" X-Migadu-Spam-Score: -3.28 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=disroot.org header.s=mail header.b="XuJLt6V/"; dmarc=pass (policy=none) header.from=gnu.org; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" X-Migadu-Queue-Id: 06E0111322 X-Spam-Score: -3.28 X-Migadu-Scanner: scn0.migadu.com X-TUID: NnmTSNvm/q76 On Fri Nov 25, 2022 at 1:21 AM GMT, Pierre Langlois wrote: > * gnu/packages/tree-sitter.scm (tree-sitter-emacs-module): New local vari= able. > (emacs-tree-sitter-core): New variable. Please split these two into separate patches. > --- a/gnu/packages/tree-sitter.scm > +++ b/gnu/packages/tree-sitter.scm > @@ -738,3 +739,86 @@ (define-public tree-sitter-typescript > + (arguments > + `(#:cargo-inputs (list #:cargo-inputs ...) > + #:phases > + (modify-phases %standard-phases > + (add-after 'unpack 'chdir > + (lambda _ (chdir "core"))) > + (add-after 'chdir 'delete-cargo.lock > + (lambda _ (delete-file "Cargo.lock"))) > + (add-after 'delete-cargo.lock 'do-not-fetch-from-github > + (lambda _ > + (substitute* "Cargo.toml" > + (("\\[patch.*") "") > + (("git =3D .*") "")))) > + (replace 'install > + (lambda* (#:key outputs #:allow-other-keys) > + (let ((lib (string-append (assoc-ref outputs "out") "/lib")= )) > + (mkdir-p lib) > + (copy-file "target/release/libtsc_dyn.so" > + (string-append lib "/tsc-dyn.so")))))))) Please use gexps and #$output here: (replace 'install (lambda _ (let ((lib (string-append #$output "/lib"))) (mkdir-p lib) (copy-file "target/release/libtsc_dyn.so" (string-append lib "/tsc-dyn.so"))))) > + (name "emacs-tree-sitter-core") > + (version (package-version tree-sitter-emacs-module)) > + (source (package-source tree-sitter-emacs-module)) This ``version'' and ``source'' are unnecessary. > + (arguments > + `(#:phases LIST, please. > + (modify-phases %standard-phases Gexp this, please. > + (let ((elpa (elpa-directory (assoc-ref outputs "out"))) Please use #$output. > + (module (search-input-file inputs "/lib/tsc-dyn.so"))= ) The leading / is redundant; this will do: (search-input-file inputs "lib/tsc-dyn.so") -- (