From: Leo Prikler <leo.prikler@student.tugraz.at>
To: 45616@debbugs.gnu.org
Subject: [bug#45616] [PATCH 7/9] gnu: Move faba-icon-theme and moka-icon-theme to gnome-xyz.scm
Date: Sun, 3 Jan 2021 00:51:56 +0100 [thread overview]
Message-ID: <20210102235157.9726-7-leo.prikler@student.tugraz.at> (raw)
In-Reply-To: <20210102235157.9726-1-leo.prikler@student.tugraz.at>
They seem to need to be moved together, as the latter inherits the former.
* gnu/packages/gnome.scm (faba-icon-theme, moka-icon-theme): Move from here...
* gnu/packages/gnome-xyz.scm (faba-icon-theme, moka-icon-theme): to here.
---
gnu/packages/gnome-xyz.scm | 56 ++++++++++++++++++++++++++++++++++++++
gnu/packages/gnome.scm | 56 --------------------------------------
2 files changed, 56 insertions(+), 56 deletions(-)
diff --git a/gnu/packages/gnome-xyz.scm b/gnu/packages/gnome-xyz.scm
index 9dcaa69af7..4c7ab729bc 100644
--- a/gnu/packages/gnome-xyz.scm
+++ b/gnu/packages/gnome-xyz.scm
@@ -163,6 +163,62 @@ which haven't been updated for some years. The new app icons are ported from
the Obsidian icon theme.")
(license license:gpl3)))
+(define-public faba-icon-theme
+ (package
+ (name "faba-icon-theme")
+ (version "4.3")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/snwh/faba-icon-theme")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "0xh6ppr73p76z60ym49b4d0liwdc96w41cc5p07d48hxjsa6qd6n"))))
+ (build-system meson-build-system)
+ (arguments
+ `(#:phases
+ (modify-phases %standard-phases
+ (add-before 'configure 'disable-post-install
+ (lambda _
+ (substitute* "meson.build"
+ (("meson.add_install_script.*") "")))))))
+ (native-inputs
+ `(("autoconf" ,autoconf)
+ ("automake" ,automake)))
+ (synopsis "Faba icon theme")
+ (description
+ "Faba is a minimal icon set used as a basis for other themes such as
+Moka")
+ (home-page "https://snwh.org/moka")
+ (license (list license:lgpl3+
+ license:cc-by-sa4.0))))
+
+(define-public moka-icon-theme
+ (package
+ (inherit faba-icon-theme)
+ (name "moka-icon-theme")
+ (version "5.4.0")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/snwh/moka-icon-theme")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "015l02im4mha5z91dbchxf6xkp66d346bg3xskwg0rh3lglhjsrd"))))
+ (propagated-inputs
+ ;; Moka is based on Faba by using it as a fallback icon set instead of
+ ;; bundling it, so we need to add it as a propagated input.
+ `(("faba-icon-theme" ,faba-icon-theme)))
+ (synopsis "Moka icon theme")
+ (description "Moka is a stylized desktop icon set, designed to be clear,
+simple and consistent.")
+ (license (list license:gpl3+
+ license:cc-by-sa4.0))))
+
(define-public gnome-shell-extension-appindicator
(package
(name "gnome-shell-extension-appindicator")
diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index 9c36ba0519..d278fa6753 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -9570,62 +9570,6 @@ functionality and behavior.")
(home-page "https://extensions.gnome.org/")
(license license:gpl3+)))
-(define-public faba-icon-theme
- (package
- (name "faba-icon-theme")
- (version "4.3")
- (source
- (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/snwh/faba-icon-theme")
- (commit (string-append "v" version))))
- (file-name (git-file-name name version))
- (sha256
- (base32 "0xh6ppr73p76z60ym49b4d0liwdc96w41cc5p07d48hxjsa6qd6n"))))
- (build-system meson-build-system)
- (arguments
- `(#:phases
- (modify-phases %standard-phases
- (add-before 'configure 'disable-post-install
- (lambda _
- (substitute* "meson.build"
- (("meson.add_install_script.*") "")))))))
- (native-inputs
- `(("autoconf" ,autoconf)
- ("automake" ,automake)))
- (synopsis "Faba icon theme")
- (description
- "Faba is a minimal icon set used as a basis for other themes such as
-Moka")
- (home-page "https://snwh.org/moka")
- (license (list license:lgpl3+
- license:cc-by-sa4.0))))
-
-(define-public moka-icon-theme
- (package
- (inherit faba-icon-theme)
- (name "moka-icon-theme")
- (version "5.4.0")
- (source
- (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/snwh/moka-icon-theme")
- (commit (string-append "v" version))))
- (file-name (git-file-name name version))
- (sha256
- (base32 "015l02im4mha5z91dbchxf6xkp66d346bg3xskwg0rh3lglhjsrd"))))
- (propagated-inputs
- ;; Moka is based on Faba by using it as a fallback icon set instead of
- ;; bundling it, so we need to add it as a propagated input.
- `(("faba-icon-theme" ,faba-icon-theme)))
- (synopsis "Moka icon theme")
- (description "Moka is a stylized desktop icon set, designed to be clear,
-simple and consistent.")
- (license (list license:gpl3+
- license:cc-by-sa4.0))))
-
(define-public folks
(package
(name "folks")
--
2.29.2
next prev parent reply other threads:[~2021-01-02 23:53 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-01-02 23:47 [bug#45616] [PATCH 0/?] New year, new look Leo Prikler
2021-01-02 23:51 ` [bug#45616] [PATCH 1/9] gnu: delft-icon-theme: Update to 1.14 Leo Prikler
2021-01-02 23:51 ` [bug#45616] [PATCH 2/9] gnu: matcha-theme: Update to 2021-01-01 Leo Prikler
2021-01-02 23:51 ` [bug#45616] [PATCH 3/9] gnu: greybird-gtk-theme: Update to 3.22.13 Leo Prikler
2021-01-02 23:51 ` [bug#45616] [PATCH 4/9] gnu: papirus-icon-theme: Update to 20210101 Leo Prikler
2021-01-02 23:51 ` [bug#45616] [PATCH 5/9] gnu: arc-theme: Move to gnome-xyz Leo Prikler
2021-01-02 23:51 ` [bug#45616] [PATCH 6/9] gnu: arc-icon-theme: " Leo Prikler
2021-01-02 23:51 ` Leo Prikler [this message]
2021-01-07 10:42 ` [bug#45616] [PATCH 7/9] gnu: Move faba-icon-theme and moka-icon-theme to gnome-xyz.scm Ludovic Courtès
2021-01-07 11:05 ` Leo Prikler
2021-01-02 23:51 ` [bug#45616] [PATCH 8/9] gnu: gnome-xyz.scm: Reorder packages Leo Prikler
2021-01-02 23:51 ` [bug#45616] [PATCH 9/9] gnu: Add materia-theme Leo Prikler
2021-01-07 10:43 ` [bug#45616] [PATCH 0/?] New year, new look Ludovic Courtès
2021-01-07 18:46 ` bug#45616: " Leo Prikler
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://guix.gnu.org/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210102235157.9726-7-leo.prikler@student.tugraz.at \
--to=leo.prikler@student.tugraz.at \
--cc=45616@debbugs.gnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/guix.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).