From patchwork Mon Feb 20 11:38:33 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jelle Licht X-Patchwork-Id: 47134 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 6721F1665F; Mon, 20 Feb 2023 11:39:23 +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=-3.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,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 6511716600 for ; Mon, 20 Feb 2023 11:39:20 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pU4Ve-0007XB-OT; Mon, 20 Feb 2023 06:39: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 1pU4Vb-0007Wr-Ew for guix-patches@gnu.org; Mon, 20 Feb 2023 06:39: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 1pU4Va-00031N-TH for guix-patches@gnu.org; Mon, 20 Feb 2023 06:39:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pU4Va-0005l2-OP for guix-patches@gnu.org; Mon, 20 Feb 2023 06:39:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#61649] [PATCH] gnu: emacs-lsp-treemacs: Install vscode icons. Resent-From: jlicht@fsfe.org Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 20 Feb 2023 11:39:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 61649 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 61649@debbugs.gnu.org Cc: Jelle Licht X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.167689312122095 (code B ref -1); Mon, 20 Feb 2023 11:39:02 +0000 Received: (at submit) by debbugs.gnu.org; 20 Feb 2023 11:38:41 +0000 Received: from localhost ([127.0.0.1]:50693 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pU4VE-0005kJ-Mr for submit@debbugs.gnu.org; Mon, 20 Feb 2023 06:38:40 -0500 Received: from lists.gnu.org ([209.51.188.17]:60068) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pU4VD-0005kC-UY for submit@debbugs.gnu.org; Mon, 20 Feb 2023 06:38:40 -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 1pU4VD-0007UV-OY for guix-patches@gnu.org; Mon, 20 Feb 2023 06:38:39 -0500 Received: from mail1.fsfe.org ([2001:aa8:ffed:f5f3::151]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pU4VB-0002vi-S4 for guix-patches@gnu.org; Mon, 20 Feb 2023 06:38:39 -0500 From: jlicht@fsfe.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fsfe.org; s=2021100501; t=1676893114; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=MDnhuIzcwwYng2Em8d+QqDVH7Qi574vnKl4qKDRuI2M=; b=qEJJW8XB9G4eT71blX0Bwve2oI1MMYPjHjKIbmCk1XiG1HJ9r955Yp2aVTsRVnJEf+lkJ1 bhCkbpoKBGw6P/nfhY9MO/wXZVubHNKx1G7GWH+UfnPYQ29ZmIRPgk7O+Zg1zfKwlt6IuC XzXwtgS2kyVApZgsVoH02v8vTb1R6lA= Date: Mon, 20 Feb 2023 12:38:33 +0100 Message-Id: <10d28978f5f51d2906b2460973872e2550a4e8e2.1676893054.git.jlicht@fsfe.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2001:aa8:ffed:f5f3::151; envelope-from=jlicht@fsfe.org; helo=mail1.fsfe.org X-Spam_score_int: -70 X-Spam_score: -7.1 X-Spam_bar: ------- X-Spam_report: (-7.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_HI=-5, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action 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 From: Jelle Licht emacs-lsp-treemacs bundles icons with from both the vscode-icons/vscode-icons and microsoft/vscode-icons projects. * gnu/packages/emacs-xyz.scm (emacs-lsp-treemacs)[arguments]<#:include>: Install vscode icons. [license]: Update accordingly. --- gnu/packages/emacs-xyz.scm | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) base-commit: e8fcf1e42438113d7e4be82dc5a06de45eaceb76 diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 97e7a1b844..a28041bbae 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -27971,6 +27971,8 @@ (define-public emacs-lsp-treemacs "--hard-dereference" dir)))))))) (build-system emacs-build-system) + (arguments + (list #:include #~(cons "^icons\\/" %default-include))) (propagated-inputs (list emacs-lsp-mode emacs-treemacs)) (home-page "https://github.com/emacs-lsp/lsp-treemacs") @@ -27978,7 +27980,9 @@ (define-public emacs-lsp-treemacs (description "This package provides integration between LSP mode and treemacs, and implementation of treeview controls using treemacs as a tree renderer.") - (license license:gpl3+))) + (license (list license:gpl3+ + license:cc-by4.0 ; microsoft/vscode-icons + license:expat)))) ; vscode-icons/vscode-icons (define-public emacs-dap-mode (package