unofficial mirror of guix-patches@gnu.org 
 help / color / mirror / Atom feed
* [bug#45616] [PATCH 0/?] New year, new look
@ 2021-01-02 23:47 Leo Prikler
  2021-01-02 23:51 ` [bug#45616] [PATCH 1/9] gnu: delft-icon-theme: Update to 1.14 Leo Prikler
  2021-01-07 10:43 ` [bug#45616] [PATCH 0/?] New year, new look Ludovic Courtès
  0 siblings, 2 replies; 14+ messages in thread
From: Leo Prikler @ 2021-01-02 23:47 UTC (permalink / raw)
  To: 45616

Hello Guix,

it's been more than a year since I initially added gnome-xyz.scm.  As
intended, it's been used to add GTK themes, icon themes, shell
extensions and even vala-language-server.

In this patch series, I do three things.
1. I update some of the packages found there to their new versions.
2. I move packages over from gnome.scm, that have little to do with
gnome itself and should (in my opinion) already have been put there.
3. I reorganize the module for a little more consistency.

I'll probably be testing some of the themes in a VM before pushing
them, but please note, that I can't do exhaustive tests on look and
feel. 😉
Do not hesitate to point out things that I've been missing.  Also if
someone would like to hop onto the train and contribute some themes or
extensions, now would be a good opportunity.

Regards,
Leo





^ permalink raw reply	[flat|nested] 14+ messages in thread

* [bug#45616] [PATCH 1/9] gnu: delft-icon-theme: Update to 1.14.
  2021-01-02 23:47 [bug#45616] [PATCH 0/?] New year, new look Leo Prikler
@ 2021-01-02 23:51 ` Leo Prikler
  2021-01-02 23:51   ` [bug#45616] [PATCH 2/9] gnu: matcha-theme: Update to 2021-01-01 Leo Prikler
                     ` (7 more replies)
  2021-01-07 10:43 ` [bug#45616] [PATCH 0/?] New year, new look Ludovic Courtès
  1 sibling, 8 replies; 14+ messages in thread
From: Leo Prikler @ 2021-01-02 23:51 UTC (permalink / raw)
  To: 45616

* gnu/packages/gnome-xyz.scm (delft-icon-theme): Update to 1.14.
---
 gnu/packages/gnome-xyz.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/gnome-xyz.scm b/gnu/packages/gnome-xyz.scm
index 2eb08da50f..b6c8a0f87e 100644
--- a/gnu/packages/gnome-xyz.scm
+++ b/gnu/packages/gnome-xyz.scm
@@ -95,7 +95,7 @@ like Gnome, Unity, Budgie, Pantheon, XFCE, Mate and others.")
 (define-public delft-icon-theme
   (package
     (name "delft-icon-theme")
-    (version "1.12")
+    (version "1.14")
     (source
      (origin
        (method git-fetch)
@@ -104,7 +104,7 @@ like Gnome, Unity, Budgie, Pantheon, XFCE, Mate and others.")
              (commit (string-append "v" version))))
        (sha256
         (base32
-         "1r6b6jf793jxz15ljniwbqy3vcvsl2712qiigfrfrm46fdxlshjd"))
+         "1iw85cxx9lv7irs28qi3815dk9f9vldv2j7jf1x5l1dqzwaxgwpb"))
        (file-name (git-file-name name version))))
     (build-system copy-build-system)
     (arguments
-- 
2.29.2





^ permalink raw reply	[flat|nested] 14+ messages in thread

* [bug#45616] [PATCH 2/9] gnu: matcha-theme: Update to 2021-01-01.
  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   ` Leo Prikler
  2021-01-02 23:51   ` [bug#45616] [PATCH 3/9] gnu: greybird-gtk-theme: Update to 3.22.13 Leo Prikler
                     ` (6 subsequent siblings)
  7 siblings, 0 replies; 14+ messages in thread
From: Leo Prikler @ 2021-01-02 23:51 UTC (permalink / raw)
  To: 45616

* gnu/packages/gnome-xyz.scm (matcha-theme): Update to 2021-01-01.
---
 gnu/packages/gnome-xyz.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/gnome-xyz.scm b/gnu/packages/gnome-xyz.scm
index b6c8a0f87e..f658d7b1b9 100644
--- a/gnu/packages/gnome-xyz.scm
+++ b/gnu/packages/gnome-xyz.scm
@@ -49,7 +49,7 @@
 (define-public matcha-theme
   (package
     (name "matcha-theme")
-    (version "2020-05-09")
+    (version "2021-01-01")
     (source
       (origin
         (method git-fetch)
@@ -60,7 +60,7 @@
         (file-name (git-file-name name version))
         (sha256
           (base32
-            "0fp3ijynyvncy2byjjyba573p81x2pl2hdzv17mg40r8d5mjlkww"))))
+            "1pa6ra87wlq0gwz4n03l6xv0pxiamr5dygycvppms8v6xyc2aa0r"))))
     (build-system trivial-build-system)
     (arguments
      '(#:modules ((guix build utils))
-- 
2.29.2





^ permalink raw reply	[flat|nested] 14+ messages in thread

* [bug#45616] [PATCH 3/9] gnu: greybird-gtk-theme: Update to 3.22.13.
  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   ` Leo Prikler
  2021-01-02 23:51   ` [bug#45616] [PATCH 4/9] gnu: papirus-icon-theme: Update to 20210101 Leo Prikler
                     ` (5 subsequent siblings)
  7 siblings, 0 replies; 14+ messages in thread
From: Leo Prikler @ 2021-01-02 23:51 UTC (permalink / raw)
  To: 45616

* gnu/packages/gnome-xyz.scm (greybird-gtk-theme): Update to 3.22.13.
---
 gnu/packages/gnome-xyz.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/gnome-xyz.scm b/gnu/packages/gnome-xyz.scm
index f658d7b1b9..26fdaed4c6 100644
--- a/gnu/packages/gnome-xyz.scm
+++ b/gnu/packages/gnome-xyz.scm
@@ -520,7 +520,7 @@ notebooks and tiling window managers.")
 (define-public greybird-gtk-theme
   (package
     (name "greybird-gtk-theme")
-    (version "3.22.12")
+    (version "3.22.13")
     (source (origin
               (method git-fetch)
               (uri
@@ -530,7 +530,7 @@ notebooks and tiling window managers.")
               (file-name (git-file-name name version))
               (sha256
                (base32
-                "1j66ddvl3pmwh2v8ajm8r5g5nbsr7r262ff1qn2nf3i0gy8b3lq8"))))
+                "154qawiga792iimkpk3a6q8f4gm4r158wmsagkbqqbhj33kxgxhg"))))
     (build-system meson-build-system)
     (native-inputs
      `(("gtk+" ,gtk+)
-- 
2.29.2





^ permalink raw reply	[flat|nested] 14+ messages in thread

* [bug#45616] [PATCH 4/9] gnu: papirus-icon-theme: Update to 20210101.
  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   ` Leo Prikler
  2021-01-02 23:51   ` [bug#45616] [PATCH 5/9] gnu: arc-theme: Move to gnome-xyz Leo Prikler
                     ` (4 subsequent siblings)
  7 siblings, 0 replies; 14+ messages in thread
From: Leo Prikler @ 2021-01-02 23:51 UTC (permalink / raw)
  To: 45616

* gnu/packages/gnome-xyz.scm (papirus-icon-theme): Update to 20210101.
Also use upstream versioning.
---
 gnu/packages/gnome-xyz.scm | 43 ++++++++++++++++++--------------------
 1 file changed, 20 insertions(+), 23 deletions(-)

diff --git a/gnu/packages/gnome-xyz.scm b/gnu/packages/gnome-xyz.scm
index 26fdaed4c6..ebabfc06cd 100644
--- a/gnu/packages/gnome-xyz.scm
+++ b/gnu/packages/gnome-xyz.scm
@@ -584,23 +584,20 @@ dark elements.  It supports GNOME, Unity, Xfce, and Openbox.")
   (deprecated-package "numix-theme" numix-gtk-theme))
 
 (define-public papirus-icon-theme
-  (let ((version "0.0.0") ;; The package does not use semver
-        (revision "2")
-        (tag "20200602"))
-    (package
-      (name "papirus-icon-theme")
-      (version (git-version version revision tag))
-      (source
-       (origin
-         (method git-fetch)
-         (uri (git-reference
-               (url "https://github.com/PapirusDevelopmentTeam/papirus-icon-theme")
-               (commit tag)))
-         (sha256
-          (base32
-           "0yv19kl8jr2jmh9018b1qmnq68alw84vrmb35jm462qd3qzzdgah"))
-         (file-name (git-file-name name version))))
-      (build-system gnu-build-system)
+  (package
+    (name "papirus-icon-theme")
+    (version "20210101")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/PapirusDevelopmentTeam/papirus-icon-theme")
+             (commit version)))
+       (sha256
+        (base32
+         "0w6qg3zjhfvjg1gg5inranf8ianb4mrp0jm9qgi6hg87ig1rashs"))
+       (file-name (git-file-name name version))))
+    (build-system gnu-build-system)
     (arguments
      '(#:tests? #f
        #:make-flags (list (string-append "PREFIX=" (assoc-ref %outputs "out")))
@@ -609,13 +606,13 @@ dark elements.  It supports GNOME, Unity, Xfce, and Openbox.")
          (delete 'bootstrap)
          (delete 'configure)
          (delete 'build))))
-      (native-inputs
-       `(("gtk+:bin" ,gtk+ "bin")))
-      (home-page "https://git.io/papirus-icon-theme")
-      (synopsis "Fork of Paper icon theme with a lot of new icons and a few extras")
-      (description "Papirus is a fork of the icon theme Paper with a lot of new icons
+    (native-inputs
+     `(("gtk+:bin" ,gtk+ "bin")))
+    (home-page "https://git.io/papirus-icon-theme")
+    (synopsis "Fork of Paper icon theme with a lot of new icons and a few extras")
+    (description "Papirus is a fork of the icon theme Paper with a lot of new icons
 and a few extra features.")
-      (license license:gpl3))))
+    (license license:gpl3)))
 
 (define-public vala-language-server
   (package
-- 
2.29.2





^ permalink raw reply	[flat|nested] 14+ messages in thread

* [bug#45616] [PATCH 5/9] gnu: arc-theme: Move to gnome-xyz.
  2021-01-02 23:51 ` [bug#45616] [PATCH 1/9] gnu: delft-icon-theme: Update to 1.14 Leo Prikler
                     ` (2 preceding siblings ...)
  2021-01-02 23:51   ` [bug#45616] [PATCH 4/9] gnu: papirus-icon-theme: Update to 20210101 Leo Prikler
@ 2021-01-02 23:51   ` Leo Prikler
  2021-01-02 23:51   ` [bug#45616] [PATCH 6/9] gnu: arc-icon-theme: " Leo Prikler
                     ` (3 subsequent siblings)
  7 siblings, 0 replies; 14+ messages in thread
From: Leo Prikler @ 2021-01-02 23:51 UTC (permalink / raw)
  To: 45616

* gnu/packages/gnome.scm (arc-theme): Move from here...
* gnu/packages/gnome-xyz.scm (arc-theme): ... to here.
---
 gnu/packages/gnome-xyz.scm | 47 ++++++++++++++++++++++++++++++++++++++
 gnu/packages/gnome.scm     | 44 -----------------------------------
 2 files changed, 47 insertions(+), 44 deletions(-)

diff --git a/gnu/packages/gnome-xyz.scm b/gnu/packages/gnome-xyz.scm
index ebabfc06cd..7870952334 100644
--- a/gnu/packages/gnome-xyz.scm
+++ b/gnu/packages/gnome-xyz.scm
@@ -32,12 +32,15 @@
   #:use-module (guix git-download)
   #:use-module (guix packages)
   #:use-module ((guix licenses) #:prefix license:)
+  #:use-module (gnu packages autotools)
   #:use-module (gnu packages base)
   #:use-module (gnu packages bash)
   #:use-module (gnu packages gettext)
   #:use-module (gnu packages glib)
   #:use-module (gnu packages gnome)
   #:use-module (gnu packages gtk)
+  #:use-module (gnu packages inkscape)
+  #:use-module (gnu packages image)
   #:use-module (gnu packages pkg-config)
   #:use-module (gnu packages python-xyz)
   #:use-module (gnu packages ssh)
@@ -517,6 +520,50 @@ scrollable tiling of windows and per monitor workspaces.  It's inspired by paper
 notebooks and tiling window managers.")
     (license license:gpl3)))
 
+(define-public arc-theme
+  (package
+    (name "arc-theme")
+    (version "20201013")
+    (source (origin
+              (method git-fetch)
+              (uri (git-reference
+                    (url "https://github.com/jnsh/arc-theme")
+                    (commit version)))
+              (file-name (git-file-name name version))
+              (sha256
+               (base32
+                "1x2l1mwjx68dwf3jb1i90c1q8nqsl1wf2zggcn8im6590k5yv39s"))))
+    (build-system gnu-build-system)
+    (arguments
+     '(#:configure-flags
+       (list "--disable-cinnamon")
+       #:phases
+       (modify-phases %standard-phases
+         ;; autogen.sh calls configure at the end of the script.
+         (replace 'bootstrap
+           (lambda _ (invoke "autoreconf" "-vfi")))
+         (add-before 'build 'set-home   ;placate Inkscape
+           (lambda _
+             (setenv "HOME" (getcwd))
+             #t)))))
+    (native-inputs
+     `(("autoconf" ,autoconf)
+       ("automake" ,automake)
+       ("glib" ,glib "bin")             ; for glib-compile-resources
+       ("gnome-shell" ,gnome-shell)
+       ("gtk+" ,gtk+)
+       ("inkscape" ,inkscape)
+       ("optipng" ,optipng)
+       ("pkg-config" ,pkg-config)
+       ("sassc" ,sassc/libsass-3.5)))
+    (synopsis "A flat GTK+ theme with transparent elements")
+    (description "Arc is a flat theme with transparent elements for GTK 3, GTK
+2, and GNOME Shell which supports GTK 3 and GTK 2 based desktop environments
+like GNOME, Unity, Budgie, Pantheon, XFCE, Mate, etc.")
+    (home-page "https://github.com/horst3180/arc-theme")
+    ;; No "or later" language found.
+    (license license:gpl3+)))
+
 (define-public greybird-gtk-theme
   (package
     (name "greybird-gtk-theme")
diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index 55189d096f..d28641a0fd 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -9570,50 +9570,6 @@ functionality and behavior.")
     (home-page "https://extensions.gnome.org/")
     (license license:gpl3+)))
 
-(define-public arc-theme
-  (package
-    (name "arc-theme")
-    (version "20201013")
-    (source (origin
-              (method git-fetch)
-              (uri (git-reference
-                    (url "https://github.com/jnsh/arc-theme")
-                    (commit version)))
-              (file-name (git-file-name name version))
-              (sha256
-               (base32
-                "1x2l1mwjx68dwf3jb1i90c1q8nqsl1wf2zggcn8im6590k5yv39s"))))
-    (build-system gnu-build-system)
-    (arguments
-     '(#:configure-flags
-       (list "--disable-cinnamon")
-       #:phases
-       (modify-phases %standard-phases
-         ;; autogen.sh calls configure at the end of the script.
-         (replace 'bootstrap
-           (lambda _ (invoke "autoreconf" "-vfi")))
-         (add-before 'build 'set-home   ;placate Inkscape
-           (lambda _
-             (setenv "HOME" (getcwd))
-             #t)))))
-    (native-inputs
-     `(("autoconf" ,autoconf)
-       ("automake" ,automake)
-       ("glib" ,glib "bin")             ; for glib-compile-resources
-       ("gnome-shell" ,gnome-shell)
-       ("gtk+" ,gtk+)
-       ("inkscape" ,inkscape)
-       ("optipng" ,optipng)
-       ("pkg-config" ,pkg-config)
-       ("sassc" ,sassc/libsass-3.5)))
-    (synopsis "A flat GTK+ theme with transparent elements")
-    (description "Arc is a flat theme with transparent elements for GTK 3, GTK
-2, and GNOME Shell which supports GTK 3 and GTK 2 based desktop environments
-like GNOME, Unity, Budgie, Pantheon, XFCE, Mate, etc.")
-    (home-page "https://github.com/horst3180/arc-theme")
-    ;; No "or later" language found.
-    (license license:gpl3+)))
-
 (define-public faba-icon-theme
   (package
     (name "faba-icon-theme")
-- 
2.29.2





^ permalink raw reply	[flat|nested] 14+ messages in thread

* [bug#45616] [PATCH 6/9] gnu: arc-icon-theme: Move to gnome-xyz.
  2021-01-02 23:51 ` [bug#45616] [PATCH 1/9] gnu: delft-icon-theme: Update to 1.14 Leo Prikler
                     ` (3 preceding siblings ...)
  2021-01-02 23:51   ` [bug#45616] [PATCH 5/9] gnu: arc-theme: Move to gnome-xyz Leo Prikler
@ 2021-01-02 23:51   ` Leo Prikler
  2021-01-02 23:51   ` [bug#45616] [PATCH 7/9] gnu: Move faba-icon-theme and moka-icon-theme to gnome-xyz.scm Leo Prikler
                     ` (2 subsequent siblings)
  7 siblings, 0 replies; 14+ messages in thread
From: Leo Prikler @ 2021-01-02 23:51 UTC (permalink / raw)
  To: 45616

* gnu/packages/gnome.scm (arc-icon-theme): Move from here...
* gnu/packages/gnome-xyz.scm (arc-icon-theme): ... to here.
---
 gnu/packages/gnome-xyz.scm | 35 +++++++++++++++++++++++++++++++++++
 gnu/packages/gnome.scm     | 35 -----------------------------------
 2 files changed, 35 insertions(+), 35 deletions(-)

diff --git a/gnu/packages/gnome-xyz.scm b/gnu/packages/gnome-xyz.scm
index 7870952334..9dcaa69af7 100644
--- a/gnu/packages/gnome-xyz.scm
+++ b/gnu/packages/gnome-xyz.scm
@@ -95,6 +95,41 @@ like Gnome, Unity, Budgie, Pantheon, XFCE, Mate and others.")
     (home-page "https://github.com/vinceliuice/matcha")
     (license license:gpl3+)))
 
+(define-public arc-icon-theme
+  (package
+    (name "arc-icon-theme")
+    (version "20161122")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/horst3180/arc-icon-theme")
+             (commit version)))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "1ch3hp08qri93510hypzz6m2x4xgg2h15wvnhjwh1x1s1b7jvxjd"))))
+    (build-system gnu-build-system)
+    (arguments
+     `(#:phases
+       (modify-phases %standard-phases
+         (add-after 'unpack 'disable-configure-during-bootstrap
+           (lambda _
+             (substitute* "autogen.sh"
+               (("^\"\\$srcdir/configure\".*") ""))
+             #t)))))
+    (native-inputs
+     `(("autoconf" ,autoconf)
+       ("automake" ,automake)))
+    ;; When Arc is missing an icon, it looks in the Moka icon theme for it.
+    (propagated-inputs
+     `(("moka-icon-theme" ,moka-icon-theme)))
+    (synopsis "Arc icon theme")
+    (description "The Arc icon theme provides a set of icons matching the
+style of the Arc GTK theme.  Icons missing from the Arc theme are provided by
+the Moka icon theme.")
+    (home-page "https://github.com/horst3180/arc-icon-theme")
+    (license license:gpl3+)))
+
 (define-public delft-icon-theme
   (package
     (name "delft-icon-theme")
diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index d28641a0fd..9c36ba0519 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -9626,41 +9626,6 @@ simple and consistent.")
     (license (list license:gpl3+
                    license:cc-by-sa4.0))))
 
-(define-public arc-icon-theme
-  (package
-    (name "arc-icon-theme")
-    (version "20161122")
-    (source
-     (origin
-       (method git-fetch)
-       (uri (git-reference
-             (url "https://github.com/horst3180/arc-icon-theme")
-             (commit version)))
-       (file-name (git-file-name name version))
-       (sha256
-        (base32 "1ch3hp08qri93510hypzz6m2x4xgg2h15wvnhjwh1x1s1b7jvxjd"))))
-    (build-system gnu-build-system)
-    (arguments
-     `(#:phases
-       (modify-phases %standard-phases
-         (add-after 'unpack 'disable-configure-during-bootstrap
-           (lambda _
-             (substitute* "autogen.sh"
-               (("^\"\\$srcdir/configure\".*") ""))
-             #t)))))
-    (native-inputs
-     `(("autoconf" ,autoconf)
-       ("automake" ,automake)))
-    ;; When Arc is missing an icon, it looks in the Moka icon theme for it.
-    (propagated-inputs
-     `(("moka-icon-theme" ,moka-icon-theme)))
-    (synopsis "Arc icon theme")
-    (description "The Arc icon theme provides a set of icons matching the
-style of the Arc GTK theme.  Icons missing from the Arc theme are provided by
-the Moka icon theme.")
-    (home-page "https://github.com/horst3180/arc-icon-theme")
-    (license license:gpl3+)))
-
 (define-public folks
   (package
     (name "folks")
-- 
2.29.2





^ permalink raw reply	[flat|nested] 14+ messages in thread

* [bug#45616] [PATCH 7/9] gnu: Move faba-icon-theme and moka-icon-theme to gnome-xyz.scm
  2021-01-02 23:51 ` [bug#45616] [PATCH 1/9] gnu: delft-icon-theme: Update to 1.14 Leo Prikler
                     ` (4 preceding siblings ...)
  2021-01-02 23:51   ` [bug#45616] [PATCH 6/9] gnu: arc-icon-theme: " Leo Prikler
@ 2021-01-02 23:51   ` Leo Prikler
  2021-01-07 10:42     ` Ludovic Courtès
  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
  7 siblings, 1 reply; 14+ messages in thread
From: Leo Prikler @ 2021-01-02 23:51 UTC (permalink / raw)
  To: 45616

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





^ permalink raw reply	[flat|nested] 14+ messages in thread

* [bug#45616] [PATCH 8/9] gnu: gnome-xyz.scm: Reorder packages.
  2021-01-02 23:51 ` [bug#45616] [PATCH 1/9] gnu: delft-icon-theme: Update to 1.14 Leo Prikler
                     ` (5 preceding siblings ...)
  2021-01-02 23:51   ` [bug#45616] [PATCH 7/9] gnu: Move faba-icon-theme and moka-icon-theme to gnome-xyz.scm Leo Prikler
@ 2021-01-02 23:51   ` Leo Prikler
  2021-01-02 23:51   ` [bug#45616] [PATCH 9/9] gnu: Add materia-theme Leo Prikler
  7 siblings, 0 replies; 14+ messages in thread
From: Leo Prikler @ 2021-01-02 23:51 UTC (permalink / raw)
  To: 45616

Make it so that icon themes, shell extensions and GTK themes are grouped in
that order.

* gnu/packages/gnome-xyz.scm (matcha-theme): Move before numix-gtk-theme.
(papirus-icon-theme): Move after moka-icon-theme.
---
 gnu/packages/gnome-xyz.scm | 154 ++++++++++++++++++-------------------
 1 file changed, 77 insertions(+), 77 deletions(-)

diff --git a/gnu/packages/gnome-xyz.scm b/gnu/packages/gnome-xyz.scm
index 4c7ab729bc..c07834f27e 100644
--- a/gnu/packages/gnome-xyz.scm
+++ b/gnu/packages/gnome-xyz.scm
@@ -49,52 +49,6 @@
   #:use-module (gnu packages web)
   #:use-module (gnu packages xml))
 
-(define-public matcha-theme
-  (package
-    (name "matcha-theme")
-    (version "2021-01-01")
-    (source
-      (origin
-        (method git-fetch)
-        (uri
-          (git-reference
-            (url "https://github.com/vinceliuice/Matcha-gtk-theme")
-            (commit version)))
-        (file-name (git-file-name name version))
-        (sha256
-          (base32
-            "1pa6ra87wlq0gwz4n03l6xv0pxiamr5dygycvppms8v6xyc2aa0r"))))
-    (build-system trivial-build-system)
-    (arguments
-     '(#:modules ((guix build utils))
-       #:builder
-       (begin
-         (use-modules (guix build utils))
-         (let* ((out (assoc-ref %outputs "out"))
-                (source (assoc-ref %build-inputs "source"))
-                (bash (assoc-ref %build-inputs "bash"))
-                (coreutils (assoc-ref %build-inputs  "coreutils"))
-                (themesdir (string-append out "/share/themes")))
-           (setenv "PATH"
-                   (string-append coreutils "/bin:"
-                                  (string-append bash "/bin:")))
-           (copy-recursively source (getcwd))
-           (patch-shebang "install.sh")
-           (mkdir-p themesdir)
-           (invoke "./install.sh" "-d" themesdir)
-           #t))))
-    (inputs
-     `(("gtk-engines" ,gtk-engines)))
-    (native-inputs
-     `(("bash" ,bash)
-       ("coreutils" ,coreutils)))
-    (synopsis "Flat design theme for GTK 3, GTK 2 and GNOME-Shell")
-    (description "Matcha is a flat Design theme for GTK 3, GTK 2 and
-Gnome-Shell which supports GTK 3 and GTK 2 based desktop environments
-like Gnome, Unity, Budgie, Pantheon, XFCE, Mate and others.")
-    (home-page "https://github.com/vinceliuice/matcha")
-    (license license:gpl3+)))
-
 (define-public arc-icon-theme
   (package
     (name "arc-icon-theme")
@@ -219,6 +173,37 @@ simple and consistent.")
     (license (list license:gpl3+
                    license:cc-by-sa4.0))))
 
+(define-public papirus-icon-theme
+  (package
+    (name "papirus-icon-theme")
+    (version "20210101")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/PapirusDevelopmentTeam/papirus-icon-theme")
+             (commit version)))
+       (sha256
+        (base32
+         "0w6qg3zjhfvjg1gg5inranf8ianb4mrp0jm9qgi6hg87ig1rashs"))
+       (file-name (git-file-name name version))))
+    (build-system gnu-build-system)
+    (arguments
+     '(#:tests? #f
+       #:make-flags (list (string-append "PREFIX=" (assoc-ref %outputs "out")))
+       #:phases
+       (modify-phases %standard-phases
+         (delete 'bootstrap)
+         (delete 'configure)
+         (delete 'build))))
+    (native-inputs
+     `(("gtk+:bin" ,gtk+ "bin")))
+    (home-page "https://git.io/papirus-icon-theme")
+    (synopsis "Fork of Paper icon theme with a lot of new icons and a few extras")
+    (description "Papirus is a fork of the icon theme Paper with a lot of new icons
+and a few extra features.")
+    (license license:gpl3)))
+
 (define-public gnome-shell-extension-appindicator
   (package
     (name "gnome-shell-extension-appindicator")
@@ -683,6 +668,52 @@ like GNOME, Unity, Budgie, Pantheon, XFCE, Mate, etc.")
 Shimmer Project.  It supports GNOME, Unity, and Xfce.")
     (license (list license:gpl2+ license:cc-by-sa3.0))))
 
+(define-public matcha-theme
+  (package
+    (name "matcha-theme")
+    (version "2021-01-01")
+    (source
+      (origin
+        (method git-fetch)
+        (uri
+          (git-reference
+            (url "https://github.com/vinceliuice/Matcha-gtk-theme")
+            (commit version)))
+        (file-name (git-file-name name version))
+        (sha256
+          (base32
+            "1pa6ra87wlq0gwz4n03l6xv0pxiamr5dygycvppms8v6xyc2aa0r"))))
+    (build-system trivial-build-system)
+    (arguments
+     '(#:modules ((guix build utils))
+       #:builder
+       (begin
+         (use-modules (guix build utils))
+         (let* ((out (assoc-ref %outputs "out"))
+                (source (assoc-ref %build-inputs "source"))
+                (bash (assoc-ref %build-inputs "bash"))
+                (coreutils (assoc-ref %build-inputs  "coreutils"))
+                (themesdir (string-append out "/share/themes")))
+           (setenv "PATH"
+                   (string-append coreutils "/bin:"
+                                  (string-append bash "/bin:")))
+           (copy-recursively source (getcwd))
+           (patch-shebang "install.sh")
+           (mkdir-p themesdir)
+           (invoke "./install.sh" "-d" themesdir)
+           #t))))
+    (inputs
+     `(("gtk-engines" ,gtk-engines)))
+    (native-inputs
+     `(("bash" ,bash)
+       ("coreutils" ,coreutils)))
+    (synopsis "Flat design theme for GTK 3, GTK 2 and GNOME-Shell")
+    (description "Matcha is a flat Design theme for GTK 3, GTK 2 and
+Gnome-Shell which supports GTK 3 and GTK 2 based desktop environments
+like Gnome, Unity, Budgie, Pantheon, XFCE, Mate and others.")
+    (home-page "https://github.com/vinceliuice/matcha")
+    (license license:gpl3+)))
+
 (define-public numix-gtk-theme
   (package
     (name "numix-gtk-theme")
@@ -721,37 +752,6 @@ dark elements.  It supports GNOME, Unity, Xfce, and Openbox.")
 (define-public numix-theme
   (deprecated-package "numix-theme" numix-gtk-theme))
 
-(define-public papirus-icon-theme
-  (package
-    (name "papirus-icon-theme")
-    (version "20210101")
-    (source
-     (origin
-       (method git-fetch)
-       (uri (git-reference
-             (url "https://github.com/PapirusDevelopmentTeam/papirus-icon-theme")
-             (commit version)))
-       (sha256
-        (base32
-         "0w6qg3zjhfvjg1gg5inranf8ianb4mrp0jm9qgi6hg87ig1rashs"))
-       (file-name (git-file-name name version))))
-    (build-system gnu-build-system)
-    (arguments
-     '(#:tests? #f
-       #:make-flags (list (string-append "PREFIX=" (assoc-ref %outputs "out")))
-       #:phases
-       (modify-phases %standard-phases
-         (delete 'bootstrap)
-         (delete 'configure)
-         (delete 'build))))
-    (native-inputs
-     `(("gtk+:bin" ,gtk+ "bin")))
-    (home-page "https://git.io/papirus-icon-theme")
-    (synopsis "Fork of Paper icon theme with a lot of new icons and a few extras")
-    (description "Papirus is a fork of the icon theme Paper with a lot of new icons
-and a few extra features.")
-    (license license:gpl3)))
-
 (define-public vala-language-server
   (package
     (name "vala-language-server")
-- 
2.29.2





^ permalink raw reply	[flat|nested] 14+ messages in thread

* [bug#45616] [PATCH 9/9] gnu: Add materia-theme.
  2021-01-02 23:51 ` [bug#45616] [PATCH 1/9] gnu: delft-icon-theme: Update to 1.14 Leo Prikler
                     ` (6 preceding siblings ...)
  2021-01-02 23:51   ` [bug#45616] [PATCH 8/9] gnu: gnome-xyz.scm: Reorder packages Leo Prikler
@ 2021-01-02 23:51   ` Leo Prikler
  7 siblings, 0 replies; 14+ messages in thread
From: Leo Prikler @ 2021-01-02 23:51 UTC (permalink / raw)
  To: 45616

* gnu/packages/gnome-xyz.scm (materia-theme): New variable.
---
 gnu/packages/gnome-xyz.scm | 26 ++++++++++++++++++++++++++
 1 file changed, 26 insertions(+)

diff --git a/gnu/packages/gnome-xyz.scm b/gnu/packages/gnome-xyz.scm
index c07834f27e..8cdfabc727 100644
--- a/gnu/packages/gnome-xyz.scm
+++ b/gnu/packages/gnome-xyz.scm
@@ -714,6 +714,32 @@ like Gnome, Unity, Budgie, Pantheon, XFCE, Mate and others.")
     (home-page "https://github.com/vinceliuice/matcha")
     (license license:gpl3+)))
 
+(define-public materia-theme
+  (package
+    (name "materia-theme")
+    (version "20200916")
+    (source
+      (origin
+        (method git-fetch)
+        (uri
+          (git-reference
+            (url "https://github.com/nana-4/materia-theme")
+            (commit (string-append "v" version))))
+        (file-name (git-file-name name version))
+        (sha256
+          (base32
+            "0qaxxafsn5zd2ysgr0jyv5j73360mfdmxyd55askswlsfphssn74"))))
+    (build-system meson-build-system)
+    (native-inputs
+     `(("gtk+" ,gtk+)
+       ("sassc" ,sassc)))
+    (home-page "https://github.com/nana-4/materia-theme")
+    (synopsis "Material Design theme for a wide range of environments")
+    (description "Materia is a Material Design theme for GNOME/GTK based
+desktop environments.  It supports GTK 2, GTK 3, GNOME Shell, Budgie,
+Cinnamon, MATE, Unity, Xfce, LightDM, GDM, Chrome theme, etc.")
+    (license license:gpl2+)))
+
 (define-public numix-gtk-theme
   (package
     (name "numix-gtk-theme")
-- 
2.29.2





^ permalink raw reply	[flat|nested] 14+ messages in thread

* [bug#45616] [PATCH 7/9] gnu: Move faba-icon-theme and moka-icon-theme to gnome-xyz.scm
  2021-01-02 23:51   ` [bug#45616] [PATCH 7/9] gnu: Move faba-icon-theme and moka-icon-theme to gnome-xyz.scm Leo Prikler
@ 2021-01-07 10:42     ` Ludovic Courtès
  2021-01-07 11:05       ` Leo Prikler
  0 siblings, 1 reply; 14+ messages in thread
From: Ludovic Courtès @ 2021-01-07 10:42 UTC (permalink / raw)
  To: Leo Prikler; +Cc: 45616

Hi!

Leo Prikler <leo.prikler@student.tugraz.at> skribis:

> They seem to need to be moved together, as the latter inherits the former.

Yes.  In general, as a rule of thumb, never inherit across modules.

Ludo’.




^ permalink raw reply	[flat|nested] 14+ messages in thread

* [bug#45616] [PATCH 0/?] New year, new look
  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-07 10:43 ` Ludovic Courtès
  2021-01-07 18:46   ` bug#45616: " Leo Prikler
  1 sibling, 1 reply; 14+ messages in thread
From: Ludovic Courtès @ 2021-01-07 10:43 UTC (permalink / raw)
  To: Leo Prikler; +Cc: 45616

Hi!

Leo Prikler <leo.prikler@student.tugraz.at> skribis:

> it's been more than a year since I initially added gnome-xyz.scm.  As
> intended, it's been used to add GTK themes, icon themes, shell
> extensions and even vala-language-server.
>
> In this patch series, I do three things.
> 1. I update some of the packages found there to their new versions.
> 2. I move packages over from gnome.scm, that have little to do with
> gnome itself and should (in my opinion) already have been put there.
> 3. I reorganize the module for a little more consistency.

I didn’t try out the themes (I don’t use GNOME), but from a quick look
the series looks good to me!

Thanks,
Ludo’.




^ permalink raw reply	[flat|nested] 14+ messages in thread

* [bug#45616] [PATCH 7/9] gnu: Move faba-icon-theme and moka-icon-theme to gnome-xyz.scm
  2021-01-07 10:42     ` Ludovic Courtès
@ 2021-01-07 11:05       ` Leo Prikler
  0 siblings, 0 replies; 14+ messages in thread
From: Leo Prikler @ 2021-01-07 11:05 UTC (permalink / raw)
  To: Ludovic Courtès; +Cc: 45616

Hi!
Am Donnerstag, den 07.01.2021, 11:42 +0100 schrieb Ludovic Courtès:
> Hi!
> 
> Leo Prikler <leo.prikler@student.tugraz.at> skribis:
> 
> > They seem to need to be moved together, as the latter inherits the
> > former.
> 
> Yes.  In general, as a rule of thumb, never inherit across modules.
Interesting.  This does not seem to be the case when inheriting stuff
from outside, e.g. when writing a guix.scm for a package.  Is there a
rationale as to why that is the case?

Leo.





^ permalink raw reply	[flat|nested] 14+ messages in thread

* bug#45616: [PATCH 0/?] New year, new look
  2021-01-07 10:43 ` [bug#45616] [PATCH 0/?] New year, new look Ludovic Courtès
@ 2021-01-07 18:46   ` Leo Prikler
  0 siblings, 0 replies; 14+ messages in thread
From: Leo Prikler @ 2021-01-07 18:46 UTC (permalink / raw)
  To: Ludovic Courtès; +Cc: 45616-done

Hi!
Am Donnerstag, den 07.01.2021, 11:43 +0100 schrieb Ludovic Courtès:
> Hi!
> 
> Leo Prikler <leo.prikler@student.tugraz.at> skribis:
> 
> > it's been more than a year since I initially added gnome-
> > xyz.scm.  As
> > intended, it's been used to add GTK themes, icon themes, shell
> > extensions and even vala-language-server.
> > 
> > In this patch series, I do three things.
> > 1. I update some of the packages found there to their new versions.
> > 2. I move packages over from gnome.scm, that have little to do with
> > gnome itself and should (in my opinion) already have been put
> > there.
> > 3. I reorganize the module for a little more consistency.
> 
> I didn’t try out the themes (I don’t use GNOME), but from a quick
> look
> the series looks good to me!
I tried them out "quickly" in a VM (just building a profile with all of
them takes ages on my machine, sadly.) and they seem fine visually, so
I've pushed them.





^ permalink raw reply	[flat|nested] 14+ messages in thread

end of thread, other threads:[~2021-01-07 18:47 UTC | newest]

Thread overview: 14+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
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   ` [bug#45616] [PATCH 7/9] gnu: Move faba-icon-theme and moka-icon-theme to gnome-xyz.scm Leo Prikler
2021-01-07 10:42     ` 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

unofficial mirror of guix-patches@gnu.org 

This inbox may be cloned and mirrored by anyone:

	git clone --mirror https://yhetil.org/guix-patches/1 guix-patches/git/1.git

	# If you have public-inbox 1.1+ installed, you may
	# initialize and index your mirror using the following commands:
	public-inbox-init -V2 guix-patches guix-patches/ https://yhetil.org/guix-patches \
		guix-patches@gnu.org
	public-inbox-index guix-patches

Example config snippet for mirrors.
Newsgroup available over NNTP:
	nntp://news.yhetil.org/yhetil.gnu.guix.patches


AGPL code for this site: git clone http://ou63pmih66umazou.onion/public-inbox.git