bug#61649: closed ([PATCH] gnu: emacs-lsp-treemacs: Install vscode icons.)

[GNU bug Tracking System]

Your message dated Mon, 06 Mar 2023 15:13:28 +0100
with message-id <87o7p60xyv.fsf@fsfe.org>
and subject line [PATCH] gnu: emacs-lsp-treemacs: Install vscode icons.
has caused the debbugs.gnu.org bug report #61649,
regarding [PATCH] gnu: emacs-lsp-treemacs: Install vscode icons.
to be marked as done.

(If you believe you have received this mail in error, please contact
help-debbugs@gnu.org.)


-- 
61649: https://debbugs.gnu.org/cgi/bugreport.cgi?bug=61649
GNU Bug Tracking System
Contact help-debbugs@gnu.org with problems
> --- Begin Message ---
>
>
>
> Subject: 
>
> [PATCH] gnu: emacs-lsp-treemacs: Install vscode icons.
>
>
>
>
> Date: 
>
> Mon, 20 Feb 2023 12:38:33 +0100
>
>
>
>
> From: Jelle Licht <jlicht@fsfe.org>
>
> 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(-)
>
> 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
>
> base-commit: e8fcf1e42438113d7e4be82dc5a06de45eaceb76
> -- 
> 2.39.1
>
>
>
>
> --- End Message ---
> --- Begin Message ---
>
>
>
> Subject: 
>
> [PATCH] gnu: emacs-lsp-treemacs: Install vscode icons.
>
>
>
>
> Date: 
>
> Mon, 06 Mar 2023 15:13:28 +0100
>
>
>
>
> Pushed to master.
> - Jelle
>
>
> --- End Message ---