guix_mirror_bot pushed a commit to branch master
in repository guix.
commit f3d48e6024e328351cbf39db68f91d201dd09de8
Author: Wallysson Oliveira <[email protected]>
AuthorDate: Wed Aug 27 21:54:43 2025 -0300
gnu: emacs-all-the-icons: Update to 5.0.0-0.4778632.
* gnu/packages/emacs-xyz.scm (emacs-all-the-icons): Update to
5.0.0-0.4778632.
[source]: Remove patch.
* gnu/packages/patches/emacs-all-the-icons-remove-duplicate-rs.patch:
Remove file.
* gnu/local.mk (dist_patch_DATA): Remove it.
Merges guix/guix!5173
Change-Id: Ic1aaa4324a18436cd2c0e1ed201e01ba8f8fbf3b
Signed-off-by: Cayetano Santos <[email protected]>
---
gnu/local.mk | 1 -
gnu/packages/emacs-xyz.scm | 109 +++++++++++----------
.../emacs-all-the-icons-remove-duplicate-rs.patch | 21 ----
3 files changed, 55 insertions(+), 76 deletions(-)
diff --git a/gnu/local.mk b/gnu/local.mk
index c260c2d771..a7194a1f33 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -1214,7 +1214,6 @@ dist_patch_DATA =
\
%D%/packages/patches/python-treelib-remove-python2-compat.patch \
%D%/packages/patches/elm-offline-package-registry.patch \
%D%/packages/patches/elm-reactor-static-files.patch \
- %D%/packages/patches/emacs-all-the-icons-remove-duplicate-rs.patch \
%D%/packages/patches/emacs-deferred-fix-number-of-arguments.patch \
%D%/packages/patches/emacs-disable-jit-compilation.patch
\
%D%/packages/patches/emacs-doc-toc-shell-commands.patch \
diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm
index c51986f407..ca34fdca71 100644
--- a/gnu/packages/emacs-xyz.scm
+++ b/gnu/packages/emacs-xyz.scm
@@ -34679,63 +34679,64 @@ GUI and terminal, and requires a nerd font installed
on your system.")
(license license:gpl3+))))
(define-public emacs-all-the-icons
- (package
- (name "emacs-all-the-icons")
- (version "5.0.0")
- (source
- (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/domtronn/all-the-icons.el";)
- (commit version)))
- (file-name (git-file-name name version))
- (patches
- (search-patches "emacs-all-the-icons-remove-duplicate-rs.patch"))
- (sha256
- (base32 "0lwgvgnqf7vihglm0c5bwsxbl4x7f641289cji5s7jwy2dbsqk7g"))))
- (build-system emacs-build-system)
- (arguments
- (list
- #:include '(list "\\.el$" "^data/")
- #:exclude '(list "^test/")
- #:tests? #f ; XXX: duplicate tests
- #:phases
- #~(modify-phases %standard-phases
- (add-after 'install 'install-fonts
- (lambda _
- (let ((fonts (string-append #$output "/share/fonts")))
- (mkdir-p fonts)
- (with-directory-excursion "fonts"
- (install-file "all-the-icons.ttf" fonts)
- ;; TODO: Unbundle.
- (install-file "file-icons.ttf" fonts)
- (install-file "octicons.ttf" fonts)
- (install-file "weathericons.ttf" fonts)))))
- (replace 'check
- (lambda* (#:key tests? #:allow-other-keys)
- (if tests?
- (apply invoke "ert-runner" "-l"
- (append (find-files "data" "\\.el")
- '("all-the-icons-faces.el")))
- (format #t "test suite not run~%")))))))
- (native-inputs
- (list emacs-f emacs-ert-runner))
- (propagated-inputs
- (list emacs-f emacs-memoize font-awesome
font-google-material-design-icons))
- (home-page "https://github.com/domtronn/all-the-icons.el";)
- (synopsis "Collect icon fonts and propertize them within Emacs")
- (description
- "All-the-icons is a utility package to collect various icon fonts and
+ ;; The latest release was on 3 June 2021.
+ (let ((commit "4778632b29c8c8d2b7cd9ce69535d0be01d846f9")
+ (revision "0"))
+ (package
+ (name "emacs-all-the-icons")
+ (version (git-version "5.0.0" revision commit))
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/domtronn/all-the-icons.el";)
+ (commit commit)))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "1917pig6zqxl1c57q2rj9jn5w61ks2xnvy4jpkjq009ks7wlrs6w"))))
+ (build-system emacs-build-system)
+ (arguments
+ (list
+ #:include '(list "\\.el$" "^data/")
+ #:exclude '(list "^test/")
+ #:tests? #f ; XXX: duplicate tests
+ #:phases
+ #~(modify-phases %standard-phases
+ (add-after 'install 'install-fonts
+ (lambda _
+ (let ((fonts (string-append #$output "/share/fonts")))
+ (mkdir-p fonts)
+ (with-directory-excursion "fonts"
+ (install-file "all-the-icons.ttf" fonts)
+ ;; TODO: Unbundle.
+ (install-file "file-icons.ttf" fonts)
+ (install-file "octicons.ttf" fonts)
+ (install-file "weathericons.ttf" fonts)))))
+ (replace 'check
+ (lambda* (#:key tests? #:allow-other-keys)
+ (if tests?
+ (apply invoke "ert-runner" "-l"
+ (append (find-files "data" "\\.el")
+ '("all-the-icons-faces.el")))
+ (format #t "test suite not run~%")))))))
+ (native-inputs
+ (list emacs-f emacs-ert-runner))
+ (propagated-inputs
+ (list emacs-f emacs-memoize font-awesome
font-google-material-design-icons))
+ (home-page "https://github.com/domtronn/all-the-icons.el";)
+ (synopsis "Collect icon fonts and propertize them within Emacs")
+ (description
+ "All-the-icons is a utility package to collect various icon fonts and
propertize them within Emacs. Icon fonts allow you to propertize and format
icons the same way you would normal text. This enables things such as better
scaling of and anti aliasing of the icons.")
- ;; Package is released under Expat license. Elisp files are licensed
- ;; under GPL3+. Fonts come with various licenses: Expat for
- ;; "all-the-icons.ttf" and "file-icons.ttf", Apache License 2.0 for
- ;; "material-design-icons.ttf", and SIL OFL 1.1 for "fontawesome.ttf",
- ;; "ocitcons.ttf" and "weathericons.ttf".
- (license
- (list license:expat license:gpl3+ license:silofl1.1 license:asl2.0))))
+ ;; Package is released under Expat license. Elisp files are licensed
+ ;; under GPL3+. Fonts come with various licenses: Expat for
+ ;; "all-the-icons.ttf" and "file-icons.ttf", Apache License 2.0 for
+ ;; "material-design-icons.ttf", and SIL OFL 1.1 for "fontawesome.ttf",
+ ;; "ocitcons.ttf" and "weathericons.ttf".
+ (license
+ (list license:expat license:gpl3+ license:silofl1.1 license:asl2.0)))))
(define-public emacs-all-the-icons-completion
(package
diff --git a/gnu/packages/patches/emacs-all-the-icons-remove-duplicate-rs.patch
b/gnu/packages/patches/emacs-all-the-icons-remove-duplicate-rs.patch
deleted file mode 100644
index 2c6b14e0aa..0000000000
--- a/gnu/packages/patches/emacs-all-the-icons-remove-duplicate-rs.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-From 24b8d5b63e347bd4cdcf79bf897fc0097fa20fc7 Mon Sep 17 00:00:00 2001
-From: Michael Wernthaler <[email protected]>
-Date: Thu, 22 Jul 2021 11:27:31 +0200
-Subject: [PATCH] Fixed icon for .rs-files
-
----
- all-the-icons.el | 1 -
- 1 file changed, 1 deletion(-)
-
-diff --git a/all-the-icons.el b/all-the-icons.el
-index e1f4cb7695..3399906cfb 100644
---- a/all-the-icons.el
-+++ b/all-the-icons.el
-@@ -194,7 +194,6 @@
- ("r" all-the-icons-fileicon "R" :face
all-the-icons-lblue)
- ("rd" all-the-icons-fileicon "R" :face
all-the-icons-lblue)
- ("rdx" all-the-icons-fileicon "R" :face
all-the-icons-lblue)
-- ("rs" all-the-icons-fileicon "R" :face
all-the-icons-lblue)
- ("rsx" all-the-icons-fileicon "R" :face
all-the-icons-lblue)
- ;; There seems to be a a bug with this font icon which does not
- ;; let you propertise it without it reverting to being a lower
